diff --git a/tdrs-backend/docker-compose.yml b/tdrs-backend/docker-compose.yml
index 80e746aca..53a70eccb 100644
--- a/tdrs-backend/docker-compose.yml
+++ b/tdrs-backend/docker-compose.yml
@@ -3,7 +3,7 @@ version: "3.4"
 
 services:
   zaproxy:
-    image: owasp/zap2docker-stable:2.13.0
+    image: softwaresecurityproject/zap-stable:2.13.0
     command: sleep 3600
     depends_on:
       - web
diff --git a/tdrs-frontend/docker-compose.yml b/tdrs-frontend/docker-compose.yml
index abfb2ba18..a89830699 100644
--- a/tdrs-frontend/docker-compose.yml
+++ b/tdrs-frontend/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3.4"
 services:
   zaproxy:
-    image: owasp/zap2docker-stable:2.13.0
+    image: softwaresecurityproject/zap-stable:2.13.0
     container_name: zap-scan
     command: sleep 3600
     ports:
@@ -39,7 +39,7 @@ services:
        envsubst '
       $${KIBANA} $${BACK_END} $${NGINX_FRONTEND} $${LOCAL_DEV}
       '< /etc/nginx/default.conf.template
-      > /etc/nginx/nginx.conf && 
+      > /etc/nginx/nginx.conf &&
       nginx -g 'daemon off;'"
 
 networks: