diff --git a/projects/router-postgres/Makefile b/projects/router-postgres/Makefile
index e54aea81..8be2d6b8 100644
--- a/projects/router-postgres/Makefile
+++ b/projects/router-postgres/Makefile
@@ -1,4 +1,4 @@
 router-postgres: clone-router-postgres
-	$(GOVUK_DOCKER) pull postgres-14
-	$(GOVUK_DOCKER) run --rm -d postgres-14
+	$(GOVUK_DOCKER) up -d postgres-14
 	$(GOVUK_DOCKER) run $@-lite make build
+	
diff --git a/projects/router-postgres/docker-compose.yml b/projects/router-postgres/docker-compose.yml
index e5275722..4314aaa4 100644
--- a/projects/router-postgres/docker-compose.yml
+++ b/projects/router-postgres/docker-compose.yml
@@ -12,7 +12,7 @@ x-router: &router-postgres
   working_dir: /go/src/github.com/alphagov/router-postgres
 
 services:
-  router-postgres-lite:
+  router-postgres-lite: &router-postgres-lite
     <<: *router-postgres
     depends_on:
       - postgres-14
@@ -20,9 +20,8 @@ services:
       GOFLAGS: -buildvcs=false
       BINARY: /go/src/github.com/alphagov/router-postgres/router-postgres
       DEBUG: "true"
-      DATABASE_URL: "postgresql://postgres@postgres-14/router"
-      TEST_DATABASE_URL: "postgresql://postgres@postgres-14/router"
-
+      DATABASE_URL: "postgresql://postgres@postgres-14/router?sslmode=disable"
+      TEST_DATABASE_URL: "postgresql://postgres@postgres-14/router-test?sslmode=disable"
 
   router-postgres-app: &router-postgres-app
     <<: *router-postgres
@@ -33,14 +32,14 @@ services:
       - "8080"
       - "3055"
     environment:
-      VIRTUAL_HOST: router.dev.gov.uk,www.dev.gov.uk,www-origin.dev.gov.uk
+      VIRTUAL_HOST: router-postgres.dev.gov.uk,www.dev.gov.uk,www-origin.dev.gov.uk
       VIRTUAL_PORT: 8080
-      DATABASE_URL: "postgresql://postgres@postgres-14/router"
+      DATABASE_URL: "postgresql://postgres@postgres-14/router?sslmode=disable"
       ROUTER_APIADDR: :3055
       ROUTER_BACKEND_HEADER_TIMEOUT: 60s
     command: ./router-postgres
 
-  router-postgres-app-draft:
+  router-postgres-app-draft: &router-postgres-app-draft
     <<: *router-postgres-app
     environment:
       VIRTUAL_HOST: draft-router.dev.gov.uk,draft-origin.dev.gov.uk