diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index e5ab7f3..76f0f48 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -6,7 +6,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go: [ '1.16', '1.15' ]
+        go: [ '1.17', '1.16' ]
     name: Go ${{ matrix.go }} build
     steps:
       - uses: actions/checkout@v2
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 5139a54..12086b5 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -14,7 +14,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.16
+          go-version: 1.17
       - name: Setup Node.js
         uses: actions/setup-node@v1
         with:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7051454..f158a53 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,9 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+### Changed
+- Bump Go version to 1.17 (#233)
+
 
 ## v3.0.0-rc3 - 2021-08-01
 
diff --git a/Dockerfile b/Dockerfile
index f90fa4c..6d7d418 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 # Docker build file for Inbucket: https://www.inbucket.org/
 
 # Install build-time dependencies
-FROM golang:1.16-alpine3.13 as builder
+FROM golang:1.17-alpine3.14 as builder
 RUN apk add --no-cache --virtual .build-deps g++ git make npm python3
 WORKDIR /build
 COPY . .
@@ -24,7 +24,7 @@ WORKDIR /build/ui
 RUN npm run build
 
 # Run in minimal image
-FROM alpine:3.13
+FROM alpine:3.14
 RUN apk --no-cache add tzdata
 WORKDIR /opt/inbucket
 RUN mkdir bin defaults ui