diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3d0ecd2c..974393b2 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -88,7 +88,7 @@ jobs:
   # Build the Docker image ready for production
   build-docker:
     docker:
-      - image: circleci/buildpack-deps:stretch
+      - image: cimg/base:current
     working_directory: ~/fun
     steps:
       # Checkout repository sources
@@ -97,7 +97,7 @@ jobs:
       - <<: *generate-version-file
       # Activate docker-in-docker
       - setup_remote_docker:
-          version: 19.03.13
+          version: default
       # Each image is tagged with the current git commit sha1 to avoid collisions in parallel builds.
       - run:
           name: Build production image
@@ -172,7 +172,7 @@ jobs:
           ELASTICSEARCH_PORT: 9200
           DJANGO_AWS_S3_REGION_NAME: eu-west-1
       # services
-      - image: circleci/postgres:12-ram
+      - image: cimg/postgres:13
         environment:
           POSTGRES_DB: test_ashley
           POSTGRES_USER: fun
diff --git a/docker-compose.yml b/docker-compose.yml
index 18cb7cdf..283eaf88 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,8 +1,6 @@
-version: '3.4'
-
 services:
   postgresql:
-    image: postgres:12
+    image: postgres:13
     env_file:
       - env.d/development/postgresql
     ports: