diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index e66f6b94f..a41c79880 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,6 +1,8 @@
 Changelog
 =========
 
+
+=======
 v34.11.0 (2025-05-02)
 ---------------------
 
diff --git a/Makefile b/Makefile
index 256ad3982..e33b4b0d9 100644
--- a/Makefile
+++ b/Makefile
@@ -63,6 +63,7 @@ envfile:
 	@if test -f ${ENV_FILE}; then echo ".env file exists already"; exit 1; fi
 	@mkdir -p $(shell dirname ${ENV_FILE}) && touch ${ENV_FILE}
 	@echo SECRET_KEY=\"${GET_SECRET_KEY}\" > ${ENV_FILE}
+	@echo COMPOSE_PROJECT_NAME=\"scancodeio\" >> ${ENV_FILE}
 
 doc8:
 	@echo "-> Run doc8 validation"
diff --git a/docker-compose-offline.yml b/docker-compose-offline.yml
index 2bf7c96d3..d64203524 100644
--- a/docker-compose-offline.yml
+++ b/docker-compose-offline.yml
@@ -1,13 +1,14 @@
+name: scancodeio
 services:
   db:
-    image: postgres:13
+    image: docker.io/library/postgres:13
     env_file:
       - docker.env
     volumes:
       - db_data:/var/lib/postgresql/data/
 
   redis:
-    image: redis
+    image: docker.io/library/redis:latest
     # Enable redis data persistence using the "Append Only File" with the
     # default policy of fsync every second. See https://redis.io/topics/persistence
     command: redis-server --appendonly yes
@@ -45,7 +46,7 @@ services:
       - web # Ensure that potential db migrations run first
 
   nginx:
-    image: nginx
+    image: docker.io/library/nginx:latest
     ports:
       - 80:80
       - 443:443
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index 51bf7d4d0..597518a92 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -6,6 +6,7 @@
 # $ docker compose -f docker-compose.yml -f docker-compose.dev.yml run --rm web bash
 # $ SCANCODEIO_TEST_FIXTURES_REGEN=1 ./manage.py test
 
+name: scancodeio
 services:
   web:
     env_file:
diff --git a/docker-compose.purldb-scan-worker.yml b/docker-compose.purldb-scan-worker.yml
index 065eb779f..3636b26a3 100644
--- a/docker-compose.purldb-scan-worker.yml
+++ b/docker-compose.purldb-scan-worker.yml
@@ -1,6 +1,7 @@
 include:
   - docker-compose.yml
 
+name: scancodeio
 services:
   purldb_scan_worker:
     build: .
diff --git a/docker-compose.yml b/docker-compose.yml
index f494dd174..321bc0f30 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,6 +1,7 @@
+name: scancodeio
 services:
   db:
-    image: postgres:13
+    image: docker.io/library/postgres:13
     env_file:
       - docker.env
     volumes:
@@ -9,7 +10,7 @@ services:
     restart: always
 
   redis:
-    image: redis
+    image: docker.io/library/redis:latest
     # Enable redis data persistence using the "Append Only File" with the
     # default policy of fsync every second. See https://redis.io/topics/persistence
     command: redis-server --appendonly yes
@@ -54,7 +55,7 @@ services:
       - web
 
   nginx:
-    image: nginx:alpine
+    image: docker.io/library/nginx:alpine
     ports:
       - "${NGINX_PUBLISHED_HTTP_PORT:-80}:80"
       - "${NGINX_PUBLISHED_HTTPS_PORT:-443}:443"
@@ -67,7 +68,7 @@ services:
     restart: always
 
   clamav:
-    image: clamav/clamav
+    image: docker.io/clamav/clamav:latest
     volumes:
       - clamav_data:/var/lib/clamav
       - workspace:/var/scancodeio/workspace/
diff --git a/setup.cfg b/setup.cfg
index 47daa4bac..afdc5c4a7 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,8 @@
 [metadata]
 name = scancodeio
+
 version = 34.11.0
+
 license = Apache-2.0
 description = Automate software composition analysis pipelines
 long_description = file:README.rst