diff --git a/services/git-bridge/Dockerfile b/services/git-bridge/Dockerfile
index 58572ae8b9..48579b9494 100644
--- a/services/git-bridge/Dockerfile
+++ b/services/git-bridge/Dockerfile
@@ -1,11 +1,17 @@
-# Dockerfile for git-bridge
+# Build the a8m/envsubst binary, as it supports default values,
+# which the gnu envsubst (from gettext-base) does not.
+FROM golang:1.24.3-alpine AS envsubst_builder
+
+WORKDIR /build
+
+RUN go install github.com/a8m/envsubst/cmd/envsubst@latest
 
 FROM maven:3-amazoncorretto-21-debian AS base
 
 RUN apt-get update && apt-get install -y make git sqlite3 \
  && rm -rf /var/lib/apt/lists
 
-COPY vendor/envsubst /opt/envsubst
+COPY --from=envsubst_builder /go/bin/envsubst /opt/envsubst
 RUN chmod +x /opt/envsubst
 
 RUN useradd --create-home node
@@ -33,7 +39,7 @@ RUN adduser -D node
 
 COPY --from=builder /git-bridge.jar /
 
-COPY vendor/envsubst /opt/envsubst
+COPY --from=envsubst_builder /go/bin/envsubst /opt/envsubst
 RUN chmod +x /opt/envsubst
 
 COPY conf/envsubst_template.json envsubst_template.json
diff --git a/services/git-bridge/vendor/envsubst b/services/git-bridge/vendor/envsubst
deleted file mode 100755
index f7ad8081d0..0000000000
Binary files a/services/git-bridge/vendor/envsubst and /dev/null differ