diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0a6e74964..cdac2925a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -6,7 +6,7 @@ jobs:
         environment:
           CAMPAIGN_DEMO_ID: "395"
           PG_HOST: localhost
-          PG_USERNAME: ubuntu
+          PG_USERNAME: postgres
           RAILS_ENV: test
           NODE_ENV: test
           RACK_ENV: test
@@ -15,9 +15,10 @@ jobs:
           REDIS_CACHE_URL: redis://127.0.0.1:6379
           REDIS_QUEUE_URL: redis://127.0.0.1:6379
           WORDPRESS_URL: 'https://codefund.io'
-      - image: circleci/postgres:11.2
+      - image: circleci/postgres:12.2
         environment:
-          POSTGRES_USER: ubuntu
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: postgres
           POSTGRES_DB: code_fund_ads_test
       - image: circleci/redis:5.0.4
     working_directory: ~/repo
diff --git a/docker-compose.yml b/docker-compose.yml
index 5e501ff63..15fc51b26 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,7 +7,7 @@ services:
       dockerfile: ./.docker/Dockerfile
       args:
         RUBY_VERSION: '2.6.6'
-        PG_MAJOR: '11'
+        PG_MAJOR: '12'
         NODE_MAJOR: '13'
         YARN_VERSION: '1.22.4'
         BUNDLER_VERSION: '2.1.4'
@@ -62,7 +62,7 @@ services:
     command: ./bin/docker/start_sidekiq
 
   postgres:
-    image: postgres:11.1
+    image: postgres:12.2
     volumes:
       - .psqlrc:/root/.psqlrc:ro
       - postgres:/var/lib/postgresql/data