diff --git a/app.json b/app.json
index 679b7f974..794f8de70 100644
--- a/app.json
+++ b/app.json
@@ -37,17 +37,7 @@
     }
   },
   "image": "heroku/ruby",
-  "addons": [
-    {
-      "plan": "heroku-redis"
-    },
-    {
-      "plan": "heroku-postgresql",
-      "options": {
-        "version": "9.5"
-      }
-    }
-  ],
+  "addons": [ "heroku-redis", "heroku-postgresql"],
   "buildpacks": [
     {
       "url": "heroku/ruby"
diff --git a/docker-compose.production.yaml b/docker-compose.production.yaml
index e0530b28e..ababfe265 100644
--- a/docker-compose.production.yaml
+++ b/docker-compose.production.yaml
@@ -39,7 +39,7 @@ services:
     command: ['bundle', 'exec', 'sidekiq', '-C', 'config/sidekiq.yml']
 
   postgres:
-    image: postgres:11.6
+    image: postgres:12
     restart: always
     ports:
       - '5432:5432'
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 97f1ac71d..d6aa758d9 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -82,7 +82,7 @@ services:
     command: bin/webpack-dev-server
 
   postgres:
-    image: postgres:11.6
+    image: postgres:12
     restart: always
     ports:
       - '5432:5432'