diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4f4bd6d6..f867ee17 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -426,7 +426,7 @@ jobs:
           llvm: "10"
   test-llvm11-go115:
     docker:
-      - image: circleci/golang:1.15.2-buster
+      - image: circleci/golang:1.15-buster
     steps:
       - test-linux:
           llvm: "11"
diff --git a/Dockerfile b/Dockerfile
index 8be2d4d7..29b9a428 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
-# TinyGo base stage installs Go 1.14, LLVM 10 and the TinyGo compiler itself.
-FROM golang:1.14 AS tinygo-base
+# TinyGo base stage installs the most recent Go 1.15.x, LLVM 10 and the TinyGo compiler itself.
+FROM golang:1.15 AS tinygo-base
 
 RUN wget -O- https://apt.llvm.org/llvm-snapshot.gpg.key| apt-key add - && \
     echo "deb http://apt.llvm.org/buster/ llvm-toolchain-buster-10 main" >> /etc/apt/sources.list && \