diff --git a/gatekeeper/Dockerfile b/gatekeeper/Dockerfile
index ff9e1c10a..85f0060f7 100644
--- a/gatekeeper/Dockerfile
+++ b/gatekeeper/Dockerfile
@@ -1,4 +1,4 @@
-FROM quay.io/pusher/oauth2_proxy
+FROM quay.io/oauth2-proxy/oauth2-proxy
 
 COPY templates /templates
 
diff --git a/passbook/providers/app_gw/templates/app_gw/docker-compose.yml b/passbook/providers/app_gw/templates/app_gw/docker-compose.yml
index 14b7cbd02..6e65148a6 100644
--- a/passbook/providers/app_gw/templates/app_gw/docker-compose.yml
+++ b/passbook/providers/app_gw/templates/app_gw/docker-compose.yml
@@ -2,7 +2,6 @@ version: "3.5"
 
 services:
   passbook_gatekeeper:
-    container_name: gatekeeper
     image: beryju/passbook-gatekeeper:{{ version }}
     ports:
       - 4180:4180