diff --git a/gbn/docker-compose.yml b/gbn/docker-compose.yml
index 476d355..9018205 100644
--- a/gbn/docker-compose.yml
+++ b/gbn/docker-compose.yml
@@ -4,11 +4,13 @@ volumes:
   gbn-connector-logs:
   gbn-connector-db-data:
   gbn-store-db-data:
+  bridgehead-proxy:
+  blaze-data:
 
 services:
   traefik:
     container_name: bridgehead-traefik
-    image: traefik:2
+    image: traefik:latest
     command:
       - --entrypoints.web.address=:80
       - --entrypoints.websecure.address=:443
@@ -44,7 +46,7 @@ services:
     
   landing:
     container_name: bridgehead-landingpage
-    image: samply/bridgehead-landingpage
+    image: samply/bridgehead-landingpage:master
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.landing.rule=PathPrefix(`/`)"
@@ -57,7 +59,7 @@ services:
 
   blaze:
     image: "samply/blaze:0.17"
-    container_name: bridgehead-gbn-blaze
+    container_name: bridgehead-gbn-blaze-store
     environment:
       BASE_URL: "http://blaze:8080"
       JAVA_TOOL_OPTIONS: "-Xmx4g"
@@ -85,12 +87,15 @@ services:
       - "traefik.enable=true"
       - "traefik.http.routers.gbn_connector.rule=PathPrefix(`/gbn-connector`)"
       - "traefik.http.services.gbn_connector.loadbalancer.server.port=8080"
+      - "traefik.http.routers.gbn_connector.tls=true"
     depends_on:
       - "gbn-connector-db"
     restart: "always"
 
   gbn-connector-db:
-    image: "postgres:10.17"
+    container_name: bridgehead-gbn-connector-db
+    image: "postgres:10"
+    container_name: "bridgehead-gbn-connector-db"
     environment:
       POSTGRES_DB: "samply.connector"
       POSTGRES_USER: "samply"