diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index 2583ea77c..9d3e0b8d4 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -1,11 +1,13 @@
 version: "3.4"
 
 services:
+
   ########################################################
   # FRONTEND #############################################
   ########################################################
   frontend:
-    # image: gradido/frontend:development
+    # name the image so that it cannot be found in a DockerHub repository, otherwise it will not be built locally from the 'dockerfile' but pulled from there
+    image: gradido/frontend:local-development
     build:
       target: development
     environment:
@@ -22,7 +24,8 @@ services:
   # ADMIN INTERFACE ######################################
   ########################################################
   admin:
-    # image: gradido/admin:development
+    # name the image so that it cannot be found in a DockerHub repository, otherwise it will not be built locally from the 'dockerfile' but pulled from there
+    image: gradido/admin:local-development
     build:
       target: development
     environment:
@@ -39,7 +42,8 @@ services:
   # BACKEND ##############################################
   ########################################################
   backend:
-    # image: gradido/backend:development
+    # name the image so that it cannot be found in a DockerHub repository, otherwise it will not be built locally from the 'dockerfile' but pulled from there
+    image: gradido/backend:local-development
     build:
       target: development
     networks:
@@ -62,10 +66,11 @@ services:
   ########################################################
   database:
     # we always run on production here since else the service lingers
-    # feel free to change this behaviour if it seems useful
-    # Due to problems with the volume caching the built files
-    # we changed this to test build. This keeps the service running.
-    # image: gradido/database:test_up
+    #  feel free to change this behaviour if it seems useful
+    #  Due to problems with the volume caching the built files
+    #  we changed this to test build. This keeps the service running.
+    # name the image so that it cannot be found in a DockerHub repository, otherwise it will not be built locally from the 'dockerfile' but pulled from there
+    image: gradido/database:local-test_up
     build:
       target: test_up
     environment:
diff --git a/docker-compose.test.yml b/docker-compose.test.yml
index 221ecba20..7db318176 100644
--- a/docker-compose.test.yml
+++ b/docker-compose.test.yml
@@ -6,6 +6,7 @@ services:
   # BACKEND ##############################################
   ########################################################
   backend:
+    # name the image so that it cannot be found in a DockerHub repository, otherwise it will not be built locally from the 'dockerfile' but pulled from there
     image: gradido/backend:test
     build:
       target: test
diff --git a/docker-compose.yml b/docker-compose.yml
index 26a1ecbe2..6c0dffe15 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,11 +6,13 @@
 version: "3.4"
 
 services:
+
   ########################################################
   # FRONTEND #############################################
   ########################################################
   frontend:
-    # image: gradido/frontend:latest
+    # name the image so that it cannot be found in a DockerHub repository, otherwise it will not be built locally from the 'dockerfile' but pulled from there
+    image: gradido/frontend:local-production
     build:
       context: ./frontend
       target: production
@@ -35,7 +37,8 @@ services:
   # ADMIN INTERFACE ######################################
   ########################################################
   admin:
-    # image: gradido/admin:latest
+    # name the image so that it cannot be found in a DockerHub repository, otherwise it will not be built locally from the 'dockerfile' but pulled from there
+    image: gradido/admin:local-production
     build:
       context: ./admin
       target: production
@@ -77,7 +80,8 @@ services:
   # BACKEND ##############################################
   ########################################################
   backend:
-    # image: gradido/backend:latest
+    # name the image so that it cannot be found in a DockerHub repository, otherwise it will not be built locally from the 'dockerfile' but pulled from there
+    image: gradido/backend:local-production
     build:
       # since we have to include the entities from ./database we cannot define the context as ./backend
       # this might blow build image size to the moon ?!
@@ -108,7 +112,8 @@ services:
   # DATABASE #############################################
   ########################################################
   database:
-    #image: gradido/database:production_up
+    # name the image so that it cannot be found in a DockerHub repository, otherwise it will not be built locally from the 'dockerfile' but pulled from there
+    image: gradido/database:local-production_up
     build:
       context: ./database
       target: production_up