diff --git a/.circleci/config.yml b/.circleci/config.yml
index eb08bedfc..f77078cb2 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -4,7 +4,7 @@ parameters:
 defaults: &defaults
   resource_class: large
   docker:
-      - image: bepsays/ci-hugoreleaser:1.21900.20200
+      - image: bepsays/ci-hugoreleaser:1.22000.20000
 environment: &buildenv
       GOMODCACHE: /root/project/gomodcache
 version: 2
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index ca1f5d951..8a8d02487 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -16,11 +16,7 @@ jobs:
   test:
     strategy:
       matrix:
-        # Note: We upgraded to Go 1.18 in Hugo v0.95.0
-        # Go 1.18 had some breaking changes on the source level which means Hugo cannot be built
-        # with older Go versions, but the improvements in Go 1.18 were too good to pass on (e.g. break and continue).
-        # Note that you don't need Go (or Go 1.18) to run a pre-built binary.
-        go-version: [1.18.x,1.19.x]
+        go-version: [1.19.x,1.20.x]
         os: [ubuntu-latest, macos-latest, windows-latest]
     runs-on: ${{ matrix.os }}
     steps: