diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e03c8c4..7db34d5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -139,15 +139,8 @@ android:
     - go get golang.org/x/mobile/bind
     - gomobile bind -v -target=android $REPRODUCIBLE_FLAGS .
 
-go-1.16:
-  image: golang:1.16-stretch
-  <<: *golang-docker-debian-template
-  <<: *test-template
-  script:
-    - *go-test
-
-go-1.17:
-  image: golang:1.17-stretch
+go-1.15:
+  image: golang:1.15-stretch
   <<: *golang-docker-debian-template
   <<: *test-template
   script:
@@ -160,6 +153,13 @@ go-1.18:
   script:
     - *go-test
 
+go-1.19:
+  image: golang:1.19-buster
+  <<: *golang-docker-debian-template
+  <<: *test-template
+  script:
+    - *go-test
+
 debian-testing:
   image: debian:testing
   <<: *debian-native-template
@@ -169,7 +169,7 @@ debian-testing:
 
 generate_tarball:
   stage: deploy
-  image: golang:1.17-stretch
+  image: golang:1.19-buster
   rules:
     - if: $CI_COMMIT_TAG
   script: