diff --git a/.github/workflows/apigee-agents-release.yml b/.github/workflows/apigee-agents-release.yml
index 14172ab..af2f3ba 100644
--- a/.github/workflows/apigee-agents-release.yml
+++ b/.github/workflows/apigee-agents-release.yml
@@ -20,7 +20,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.19
+          go-version: 1.21
 
       - name: Build discovery agent
         working-directory: discovery
diff --git a/.github/workflows/build-apigee-discovery-agent.yml b/.github/workflows/build-apigee-discovery-agent.yml
index 3d65b8e..2413193 100644
--- a/.github/workflows/build-apigee-discovery-agent.yml
+++ b/.github/workflows/build-apigee-discovery-agent.yml
@@ -39,7 +39,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.19
+          go-version: 1.21
 
       - name: Build discovery agent
         working-directory: discovery
diff --git a/.github/workflows/build-apigee-traceability-agent.yml b/.github/workflows/build-apigee-traceability-agent.yml
index a12161e..2d5738f 100644
--- a/.github/workflows/build-apigee-traceability-agent.yml
+++ b/.github/workflows/build-apigee-traceability-agent.yml
@@ -19,7 +19,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.19
+          go-version: 1.21
 
       - name: Test traceability agent
         working-directory: traceability
diff --git a/discovery/docker/Dockerfile b/discovery/docker/Dockerfile
index a8c1412..488e8e7 100644
--- a/discovery/docker/Dockerfile
+++ b/discovery/docker/Dockerfile
@@ -1,6 +1,6 @@
 # Build image
-# golang:1.20.6-alpine3.18 linux/amd64
-FROM docker.io/golang@sha256:6f592e0689192b7e477313264bb190024d654ef0a08fb1732af4f4b498a2e8ad AS builder
+# golang:1.21.0-alpine3.18 linux/amd64 
+FROM docker.io/golang@sha256:dd8888bb7f1b0b05e1e625aa29483f50f38a9b64073a4db00b04076cec52b71c AS builder
 
 ENV GOFLAGS "-mod=mod"
 ENV GOWORK "off"
diff --git a/traceability/docker/Dockerfile b/traceability/docker/Dockerfile
index 83341a6..781dc43 100644
--- a/traceability/docker/Dockerfile
+++ b/traceability/docker/Dockerfile
@@ -1,6 +1,6 @@
 # Build image
-# golang:1.20.6-alpine3.18 linux/amd64
-FROM docker.io/golang@sha256:6f592e0689192b7e477313264bb190024d654ef0a08fb1732af4f4b498a2e8ad AS builder
+# golang:1.21.0-alpine3.18 linux/amd64 
+FROM docker.io/golang@sha256:dd8888bb7f1b0b05e1e625aa29483f50f38a9b64073a4db00b04076cec52b71c AS builder
 
 ENV GOFLAGS "-mod=mod"
 ENV GOWORK "off"