diff --git a/README.md b/README.md
index 91780230..97b984e5 100644
--- a/README.md
+++ b/README.md
@@ -426,13 +426,17 @@ docker compose up -d
     docker load -i /tmp/cpmonitor.tar
     docker load -i /tmp/klimaschutzmonitor-dbeaver.tar
     ```
-(Docker should print "Loading layer" for both images.)
-8. Tag the images with the current date in case we want to roll back:
+    (Docker should print "Loading layer" for both images.)
+8. Tag the images with the current date in case we want to roll back, as well as with the environment you're deploying to (to prevent affecting the other environment):
 
     ```sh
     DATESTR=$(date +%Y-%b-%d) && echo ${DATESTR}
+
     docker tag cpmonitor:latest cpmonitor:${DATESTR}
+    docker tag cpmonitor:latest cpmonitor:<testing|production>
+
     docker tag klimaschutzmonitor-dbeaver:latest klimaschutzmonitor-dbeaver:${DATESTR}
+    docker tag klimaschutzmonitor-dbeaver:latest klimaschutzmonitor-dbeaver:<testing|production>
     ```
 9. Stop the server, apply the migrations, start the server:
     ```sh
diff --git a/docker-compose.yml b/docker-compose.yml
index eb85de4f..e902745a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,7 +6,7 @@ services:
     build:
       context: ./
       dockerfile: ./docker/cpmonitor/Dockerfile
-    image: cpmonitor
+    image: cpmonitor:${ENVIRONMENT_NAME}
     user: "1007"
     volumes:
       - ${DB_PATH?:Please set the DB_PATH environment variable.}:/db
@@ -40,7 +40,7 @@ services:
   dbeaver:
     build: ./docker/dbeaver
     container_name: dbeaver-${ENVIRONMENT_NAME}
-    image: klimaschutzmonitor-dbeaver
+    image: klimaschutzmonitor-dbeaver:${ENVIRONMENT_NAME}
     volumes:
       - ${DB_PATH?:Please set the DB_PATH environment variable.}:/db
     networks: