diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index b74a31a7..d4b9141b 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -62,6 +62,8 @@ jobs:
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
+          build-args: |
+            GIT_COMMIT=$(git rev-parse --short "$GITHUB_SHA")
           provenance: mode=max
           sbom: true
           platforms: linux/amd64,linux/arm64
diff --git a/Dockerfile b/Dockerfile
index 57653738..0a4316ad 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,6 +19,11 @@ RUN mkdir -p /temp
 COPY . /temp
 # Copy dependencies
 COPY --from=install /temp/node_modules /temp/node_modules
+
+# Set current Git commit hash as an environment variable
+ARG GIT_COMMIT
+ENV GIT_COMMIT=$GIT_COMMIT
+
 # Build the project
 WORKDIR /temp
 RUN bun run build
diff --git a/config/config.schema.json b/config/config.schema.json
index 86e65ba0..b2c8649d 100644
--- a/config/config.schema.json
+++ b/config/config.schema.json
@@ -3900,6 +3900,13 @@
                             "maximum": 1,
                             "default": 1
                         },
+                        "trace_propagation_targets": {
+                            "type": "array",
+                            "items": {
+                                "type": "string"
+                            },
+                            "default": []
+                        },
                         "max_breadcrumbs": {
                             "type": "number",
                             "default": 100
diff --git a/package.json b/package.json
index 57131cca..a5ed1d6d 100644
--- a/package.json
+++ b/package.json
@@ -37,6 +37,7 @@
         "wc": "find server database *.ts docs packages types utils drizzle tests -type f -print0 | wc -m --files0-from=-",
         "cli": "bun run cli/index.ts",
         "prune": "ts-prune | grep -v server/ | grep -v dist/ | grep -v '(used in module)'",
+        "schema:generate": "bun run packages/config-manager/json-schema.ts > config/config.schema.json",
         "check": "bunx tsc -p .",
         "prepare": "bunx husky"
     },
diff --git a/packages/config-manager/config.type.ts b/packages/config-manager/config.type.ts
index 3e156e0c..1c640900 100644
--- a/packages/config-manager/config.type.ts
+++ b/packages/config-manager/config.type.ts
@@ -575,6 +575,7 @@ export const configValidator = z.object({
                     debug: z.boolean().default(false),
                     sample_rate: z.number().min(0).max(1.0).default(1.0),
                     traces_sample_rate: z.number().min(0).max(1.0).default(1.0),
+                    trace_propagation_targets: z.array(z.string()).default([]),
                     max_breadcrumbs: z.number().default(100),
                     environment: z.string().optional(),
                 })
diff --git a/utils/sentry.ts b/utils/sentry.ts
index 33a56af3..7c2c2b65 100644
--- a/utils/sentry.ts
+++ b/utils/sentry.ts
@@ -11,7 +11,8 @@ const sentryInstance =
         maxBreadcrumbs: config.logging.sentry.max_breadcrumbs,
         tracesSampleRate: config.logging.sentry.traces_sample_rate,
         environment: config.logging.sentry.environment,
-        tracePropagationTargets: [config.http.bind],
+        tracePropagationTargets:
+            config.logging.sentry.trace_propagation_targets,
         release: pkg.version,
     });