diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4cd26724585c45cfd4c23606b083c2f89d553576..4236781883bbbaaeec8ae147ace1b918b5263c3c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,11 +17,11 @@ stages:
 # See docker-compose/README.md for docker image behavior and explanation
 .base_docker_images:
   stage: images
-  image: docker:20.10.16
+  image: docker:latest
   tags:
     - privileged
   services:
-    - name: docker:20.10.16-dind
+    - name: docker:dind
   variables:
     DOCKER_TLS_CERTDIR: "/certs"
   before_script:
@@ -528,11 +528,12 @@ unit_test:
       - tangostationcontrol/cover/*
 integration_test_docker:
   stage: integration-tests
-  image: docker:20.10.16
+  allow_failure: true
+  image: docker:latest
   tags:
     - privileged
   services:
-    - name: docker:20.10.16-dind
+    - name: docker:dind
   variables:
     DOCKER_TLS_CERTDIR: "/certs"
   artifacts:
@@ -551,9 +552,7 @@ integration_test_docker:
     - apk update
     - apk add --update make bash docker-compose
     - apk add --update bind-tools
-#    - apk add --update postgresql14-client gzip
-    - apk search postgresql
-    - apk add --update postgresql13-client-13.8-r0 gzip
+    - apk add --update postgresql14-client gzip
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
   script:
     - touch /root/.Xauthority