diff --git a/.github/workflows/docker_main.yml b/.github/workflows/docker_main.yml
index 3519542..c6e4555 100644
--- a/.github/workflows/docker_main.yml
+++ b/.github/workflows/docker_main.yml
@@ -25,6 +25,7 @@ jobs:
             --label build_date=$(date -u +"%Y-%m-%dT%H:%M:%SZ") \
             --label tag=${{ steps.build_tag_generator.outputs.BUILD_TAG }} \
             --build-arg BASE_IMAGE=alpine:3.19 \
+            --build-arg BUILD_IMAGE=golang:1.21-alpine3.19 \
             --tag ghcr.io/hyperledger/firefly-fabconnect:${{ steps.build_tag_generator.outputs.BUILD_TAG }} .
 
       - name: Tag release
diff --git a/.github/workflows/docker_release.yml b/.github/workflows/docker_release.yml
index c99c260..21f1a9d 100644
--- a/.github/workflows/docker_release.yml
+++ b/.github/workflows/docker_release.yml
@@ -17,6 +17,7 @@ jobs:
             --label build_date=$(date -u +"%Y-%m-%dT%H:%M:%SZ") \
             --label tag=${GITHUB_REF##*/} \
             --build-arg BASE_IMAGE=alpine:3.19 \
+            --build-arg BUILD_IMAGE=golang:1.21-alpine3.19 \
             --tag ghcr.io/hyperledger/firefly-fabconnect:${GITHUB_REF##*/} \
             --tag ghcr.io/hyperledger/firefly-fabconnect:head \
             .
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index fa79dab..11b0b5e 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -43,4 +43,5 @@ jobs:
             --label build_date=$(date -u +"%Y-%m-%dT%H:%M:%SZ") \
             --label tag=${{ steps.build_tag_generator.outputs.BUILD_TAG }} \
             --build-arg BASE_IMAGE=alpine:3.19 \
+            --build-arg BUILD_IMAGE=golang:1.21-alpine3.19 \
             --tag ghcr.io/hyperledger/firefly-fabconnect:${{ steps.build_tag_generator.outputs.BUILD_TAG }} .
diff --git a/Dockerfile b/Dockerfile
index b71a1ca..b2553fc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,7 @@
 ARG BASE_IMAGE
+ARG BUILD_IMAGE
 
-FROM golang:1.21-alpine3.19 AS fabconnect-builder
+FROM ${BUILD_IMAGE} AS fabconnect-builder
 RUN apk add make
 ADD . /fabconnect
 WORKDIR /fabconnect
diff --git a/Makefile b/Makefile
index 20d5e42..f5f7167 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ firefly-fabconnect: ${GOFILES}
 go-mod-tidy: .ALWAYS
 	go mod tidy
 docker:
-	docker build --build-arg BASE_IMAGE=alpine:3.19 -t hyperledger/firefly-fabconnect .
+	docker build --build-arg BASE_IMAGE=alpine:3.19  --build-arg BUILD_IMAGE=golang:1.21-alpine3.19 -t hyperledger/firefly-fabconnect .
 build: firefly-fabconnect-nocgo firefly-fabconnect
 .ALWAYS: ;
 clean: