diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 2831aeb63..04ad83e7a 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -17,7 +17,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        go-version: [1.15.x, 1.16.x]
+        go-version: [1.15.x, 1.16.x, 1.17.x]
         rootless: ["rootless", ""]
         race: ["-race", ""]
 
diff --git a/Dockerfile b/Dockerfile
index 2266903ce..31e0109ea 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-ARG GO_VERSION=1.16
+ARG GO_VERSION=1.17
 ARG BATS_VERSION=v1.3.0
 
 FROM golang:${GO_VERSION}-buster