diff --git a/Makefile b/Makefile
index e5aa532..471937a 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@ GOTAGS ?=
 GOMAXPROCS ?= 4
 
 # Get the project metadata
-GOVERSION := 1.8.1
+GOVERSION := 1.20
 PROJECT := $(CURRENT_DIR:$(GOPATH)/src/%=%)
 OWNER := $(notdir $(patsubst %/,%,$(dir $(PROJECT))))
 NAME := $(notdir $(PROJECT))
@@ -30,8 +30,8 @@ GOARCH ?= $(shell go env GOARCH)
 
 # Default os-arch combination to build
 XC_OS ?= darwin freebsd linux netbsd openbsd solaris windows
-XC_ARCH ?= 386 amd64 arm
-XC_EXCLUDE ?= darwin/arm solaris/386 solaris/arm windows/arm
+XC_ARCH ?= 386 amd64 arm arm64
+XC_EXCLUDE ?= darwin/arm solaris/386 solaris/arm solaris/arm64 windows/arm windows/arm64
 
 # GPG Signing key (blank by default, means no GPG signing)
 GPG_KEY ?=
@@ -64,7 +64,7 @@ define make-xc-target
 			--dns="8.8.8.8" \
 			--volume="${CURRENT_DIR}:/go/src/${PROJECT}" \
 			--workdir="/go/src/${PROJECT}" \
-			"golang:1.8" \
+			"golang:1.20" \
 			env \
 				CGO_ENABLED="0" \
 				GOOS="${1}" \
diff --git a/docker/alpine/Dockerfile b/docker/alpine/Dockerfile
index fec9c9e..4a9cb06 100644
--- a/docker/alpine/Dockerfile
+++ b/docker/alpine/Dockerfile
@@ -4,7 +4,7 @@
 #
 # Builder
 #
-FROM golang:1.8 AS builder
+FROM golang:1.20 AS builder
 LABEL maintainer "Seth Vargo <seth@sethvargo.com> (@sethvargo)"
 
 ARG LD_FLAGS
diff --git a/docker/scratch/Dockerfile b/docker/scratch/Dockerfile
index d826ca6..a3e0559 100644
--- a/docker/scratch/Dockerfile
+++ b/docker/scratch/Dockerfile
@@ -4,7 +4,7 @@
 #
 # Builder
 #
-FROM golang:1.8 AS builder
+FROM golang:1.20 AS builder
 LABEL maintainer "Seth Vargo <seth@sethvargo.com> (@sethvargo)"
 
 ARG LD_FLAGS