diff --git a/.github/workflows/fider.yml b/.github/workflows/fider.yml
index 74f0c1009..71e65af29 100644
--- a/.github/workflows/fider.yml
+++ b/.github/workflows/fider.yml
@@ -34,7 +34,7 @@ jobs:
           MINIO_ACCESS_KEY: s3user
           MINIO_SECRET_KEY: s3user-s3cr3t
       postgres:
-        image: postgres:9.6.8
+        image: postgres:12
         env:
           POSTGRES_USER: fider_ci
           POSTGRES_PASSWORD: fider_ci_pw
diff --git a/docker-compose.yml b/docker-compose.yml
index 727e24e7f..69cbb16c7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -8,7 +8,7 @@ services:
   pgdev:
     container_name: fider_pgdev
     restart: always
-    image: postgres:9.6.8
+    image: postgres:12
     volumes:
       - ./data/postgres:/var/lib/postgresql/data
     ports:
@@ -19,7 +19,7 @@ services:
   pgtest:
     container_name: fider_pgtest
     restart: always
-    image: postgres:9.6.8
+    image: postgres:12
     ports:
       - "5566:5432"
     environment:
diff --git a/scripts/e2e.sh b/scripts/e2e.sh
index 2eb3a9168..678bdc14a 100755
--- a/scripts/e2e.sh
+++ b/scripts/e2e.sh
@@ -7,7 +7,7 @@ PORT=3000
 start_fider () {
   echo "Starting Fider (HOST_MODE: $1)..."
   docker rm -f $FIDER_CONTAINER $PG_CONTAINER || true
-  docker run -d -e POSTGRES_USER=fider_e2e -e POSTGRES_PASSWORD=fider_e2e_pw --name $PG_CONTAINER postgres:9.6.8
+  docker run -d -e POSTGRES_USER=fider_e2e -e POSTGRES_PASSWORD=fider_e2e_pw --name $PG_CONTAINER postgres:12
   docker run --link $PG_CONTAINER:pg waisbrot/wait
   docker run \
     -d \