diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c44d276..c516a69 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -4,7 +4,7 @@ jobs:
     name: CI
     strategy:
       matrix:
-        go-version: [1.18.x]
+        go-version: [1.21.x]
         os: [ubuntu-latest, macos-latest, windows-latest]
     runs-on: ${{ matrix.os }}
     steps:
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 18bb698..38e4e2d 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -13,7 +13,7 @@ jobs:
     - name: Install Go
       uses: actions/setup-go@v4
       with:
-        go-version: 1.18.x
+        go-version: 1.21.x
 
     - name: Checkout
       uses: actions/checkout@v3
diff --git a/Makefile b/Makefile
index da80391..c36d39f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 
 APPVERSION := latest
-GOVERSION := 1.18
+GOVERSION := 1.21
 PROGRAM := pg_tileserv
 CONFIG := config/$(PROGRAM).toml
 CONTAINER := pramsey/$(PROGRAM)
diff --git a/go.mod b/go.mod
index 3cc4aa3..7444847 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/CrunchyData/pg_tileserv
 
-go 1.18
+go 1.21
 
 require (
 	github.com/Masterminds/sprig/v3 v3.1.0