diff --git a/docker/algod/source/Dockerfile b/docker/algod/source/Dockerfile
index 42261678..f178f8b4 100644
--- a/docker/algod/source/Dockerfile
+++ b/docker/algod/source/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.16.11
+FROM golang:1.17
 
 ARG URL=https://github.com/algorand/go-algorand
 ARG BRANCH=master
diff --git a/docker/indexer/Dockerfile b/docker/indexer/Dockerfile
index af1ee7d3..0ebe03ae 100644
--- a/docker/indexer/Dockerfile
+++ b/docker/indexer/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.13.12-alpine
+FROM golang:1.17-alpine
 
 ARG URL=https://github.com/algorand/indexer
 ARG BRANCH=master