diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index 9be4436..ec72bf6 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -16,7 +16,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
-          go-version: '1.21'
+          go-version: '1.22'
           check-latest: true
 
       - name: Build and Test
@@ -43,5 +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=ubuntu:22.04 \
-            --build-arg BUILD_IMAGE=golang:1.21-bullseye \
+            --build-arg BUILD_IMAGE=golang:1.22-bullseye \
             --tag ghcr.io/hyperledger/firefly-fabconnect:${{ steps.build_tag_generator.outputs.BUILD_TAG }} .
diff --git a/Makefile b/Makefile
index 39f5b07..fdbb973 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ firefly-fabconnect: ${GOFILES}
 go-mod-tidy: .ALWAYS
 	go mod tidy
 docker:
-	docker build --platform linux/amd64 --build-arg BASE_IMAGE=ubuntu:22.04  --build-arg BUILD_IMAGE=golang:1.21-bullseye -t hyperledger/firefly-fabconnect .
+	docker build --platform linux/amd64 --build-arg BASE_IMAGE=ubuntu:22.04  --build-arg BUILD_IMAGE=golang:1.22-bullseye -t hyperledger/firefly-fabconnect .
 build: firefly-fabconnect-nocgo firefly-fabconnect
 .ALWAYS: ;
 clean: