diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 6b6c12b6..c96b4d5d 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -25,7 +25,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v3
         with:
-          go-version: '1.20.3'
+          go-version: '1.21.0'
       - uses: actions/checkout@v3
       - name: Run tests
         run: |
@@ -108,6 +108,9 @@ jobs:
           - current
           - next
     steps:
+      - uses: actions/setup-go@v3
+        with:
+          go-version: '1.21.0'
       - uses: actions/checkout@v3
       - name: Login to DockerHub
         uses: docker/login-action@v2
@@ -169,6 +172,9 @@ jobs:
     strategy:
       fail-fast: false
     steps:
+      - uses: actions/setup-go@v3
+        with:
+          go-version: '1.21.0'
       - uses: actions/checkout@v3
       - name: Setup Code Climate test-reporter
         run: |
diff --git a/Makefile b/Makefile
index af0df51a..8fe80948 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ CONTAINER_TAG ?= $(shell git branch --show-current)
 COLLECTOR_PKG = github.com/ecadlabs/signatory/pkg/metrics
 
 PACKAGE_NAME          := github.com/ecadlabs/signatory
-GOLANG_CROSS_VERSION  ?= v1.20.3
+GOLANG_CROSS_VERSION  ?= v1.21.0
 
 all: signatory signatory-cli
 
diff --git a/go.mod b/go.mod
index 1a598e00..8780d076 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/ecadlabs/signatory
 
-go 1.19
+go 1.21
 
 require (
 	cloud.google.com/go/kms v1.15.0