diff --git a/docker/docker-compose.test.yml b/docker/docker-compose.test.yml
index 86a1712d..29c1f4a9 100644
--- a/docker/docker-compose.test.yml
+++ b/docker/docker-compose.test.yml
@@ -1,7 +1,7 @@
-# FOR TESTS 
-version: '3.7'
+# FOR TESTS
+version: "3.7"
 
-networks: 
+networks:
   test:
 
 services:
@@ -12,31 +12,31 @@ services:
     working_dir: /home/node
     volumes:
       - ../web:/home/node
-    networks: 
+    networks:
       - test
-  
+
   api-test:
     build:
       context: ..
       dockerfile: ./docker/api-test/dockerfile
-    depends_on: 
+    depends_on:
       - db-test
       - redis-test
-    networks: 
+    networks:
       - test
 
   # Postgres Database for API service
   db-test:
-    image: postgres:11.7
-    environment: 
+    image: postgres:12
+    environment:
       POSTGRES_DB: tacticalrmm-test
       POSTGRES_USER: test
       POSTGRES_PASSWORD: testpass
-    networks: 
+    networks:
       - test
 
   # Redis Container for Celery tasks
   redis-test:
     image: redis
-    networks: 
-      - test
\ No newline at end of file
+    networks:
+      - test
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 7b687023..669bdbc5 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -1,7 +1,7 @@
-version: '3.7'
+version: "3.7"
 
 # Userdefined Networks
-networks: 
+networks:
   database:
   redis:
   mesh-mongodb:
@@ -18,17 +18,16 @@ volumes:
   scripts:
 
 services:
-
   # Postgres Database for API service
   db:
-    image: postgres:11.7
-    environment: 
+    image: postgres:12
+    environment:
       POSTGRES_DB: tacticalrmm
       POSTGRES_USER: ${POSTGRES_USER}
       POSTGRES_PASSWORD: ${POSTGRES_PASS}
-    networks: 
+    networks:
       - database
-  
+
   # Redis Container for Celery tasks
   redis:
     image: redis
@@ -37,7 +36,7 @@ services:
 
   # Salt Master and API
   salt:
-    build: 
+    build:
       context: ..
       dockerfile: ./docker/salt/dockerfile
       args:
@@ -51,7 +50,7 @@ services:
       - scripts:/srv
     networks:
       - proxy
-  
+
   # MeshCentral Container
   meshcentral:
     build:
@@ -63,7 +62,7 @@ services:
     networks:
       - proxy
       - mesh-mongodb
-    depends_on: 
+    depends_on:
       - mesh-mongodb
       - nginx-proxy
 
@@ -77,10 +76,9 @@ services:
     networks:
       - mesh-mongodb
 
-
   # Nginx Container Reverse Proxy that handles all http/https traffic
   nginx-proxy:
-    build: 
+    build:
       context: ./nginx-proxy
       args:
         - APP_HOST=${APP_HOST}