diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 4ab7f7ac..4d863d7b 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -20,10 +20,10 @@ jobs:
     - name: Check out code
       uses: actions/checkout@v2
 
-    - name: Set up Go 1.15
+    - name: Set up Go 1.16
       uses: actions/setup-go@v2
       with:
-        go-version: 1.15.x
+        go-version: 1.16.x
       id: go
 
     - name: Get dependencies
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9c6e3a38..bd635065 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@
 
 ## Changes since v7.0.1
 
+- [#1054](https://github.com/oauth2-proxy/oauth2-proxy/pull/1054) Update to Go 1.16 (@JoelSpeed)
 - [#1052](https://github.com/oauth2-proxy/oauth2-proxy/pull/1052) Update golangci-lint to latest version (v1.36.0) (@JoelSpeed)
 - [#1043](https://github.com/oauth2-proxy/oauth2-proxy/pull/1043) Refactor Sign In Page rendering and capture all page rendering code in pagewriter package (@JoelSpeed)
 - [#1029](https://github.com/oauth2-proxy/oauth2-proxy/pull/1029) Refactor error page rendering and allow debug messages on error (@JoelSpeed)
diff --git a/Dockerfile b/Dockerfile
index 33e4e4b0..ba8b3224 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.15-buster AS builder
+FROM golang:1.16-buster AS builder
 ARG VERSION
 
 # Copy sources
diff --git a/Dockerfile.arm64 b/Dockerfile.arm64
index 771dd8fb..3c60b107 100644
--- a/Dockerfile.arm64
+++ b/Dockerfile.arm64
@@ -1,4 +1,4 @@
-FROM golang:1.15-buster AS builder
+FROM golang:1.16-buster AS builder
 ARG VERSION
 
 # Copy sources
diff --git a/Dockerfile.armv6 b/Dockerfile.armv6
index 51c89a1b..435394e1 100644
--- a/Dockerfile.armv6
+++ b/Dockerfile.armv6
@@ -1,4 +1,4 @@
-FROM golang:1.15-buster AS builder
+FROM golang:1.16-buster AS builder
 ARG VERSION
 
 # Copy sources
diff --git a/go.mod b/go.mod
index d7da714c..3b56cac8 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/oauth2-proxy/oauth2-proxy/v7
 
-go 1.15
+go 1.16
 
 require (
 	github.com/Bose/minisentinel v0.0.0-20200130220412-917c5a9223bb
diff --git a/pkg/cookies/cookies.go b/pkg/cookies/cookies.go
index c590de38..80453ab2 100644
--- a/pkg/cookies/cookies.go
+++ b/pkg/cookies/cookies.go
@@ -76,7 +76,7 @@ func ParseSameSite(v string) http.SameSite {
 	case "none":
 		return http.SameSiteNoneMode
 	case "":
-		return http.SameSiteDefaultMode
+		return 0
 	default:
 		panic(fmt.Sprintf("Invalid value for SameSite: %s", v))
 	}