diff --git a/Dockerfile b/Dockerfile
index a7c1640d0ba..64ba3e4337b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 # This image will be published as dspace/dspace-angular
 # See https://github.com/DSpace/dspace-angular/tree/main/docker for usage details
 
-FROM node:14-alpine
+FROM docker.io/node:14-alpine
 WORKDIR /app
 ADD . /app/
 EXPOSE 4000
diff --git a/docker/cli.yml b/docker/cli.yml
index 54b83d45036..fdd5380c4be 100644
--- a/docker/cli.yml
+++ b/docker/cli.yml
@@ -16,7 +16,7 @@ version: "3.7"
 
 services:
   dspace-cli:
-    image: "${DOCKER_OWNER:-dspace}/dspace-cli:${DSPACE_VER:-dspace-7_x}"
+    image: docker.io/"${DOCKER_OWNER:-dspace}/dspace-cli:${DSPACE_VER:-dspace-7_x}"
     container_name: dspace-cli
     environment:
       # Below syntax may look odd, but it is how to override dspace.cfg settings via env variables.
diff --git a/docker/db.entities.yml b/docker/db.entities.yml
index d1dfdf4a26c..1c7253d5c47 100644
--- a/docker/db.entities.yml
+++ b/docker/db.entities.yml
@@ -16,7 +16,7 @@ version: "3.7"
 
 services:
   dspacedb:
-    image: dspace/dspace-postgres-pgcrypto:loadsql
+    image: docker.io/dspace/dspace-postgres-pgcrypto:loadsql
     environment:
       # This LOADSQL should be kept in sync with the URL in DSpace/DSpace
       # This SQL is available from https://github.com/DSpace-Labs/AIP-Files/releases/tag/demo-entities-data
diff --git a/docker/docker-compose-ci.yml b/docker/docker-compose-ci.yml
index 3bd8f526303..802ed3ffdd3 100644
--- a/docker/docker-compose-ci.yml
+++ b/docker/docker-compose-ci.yml
@@ -32,7 +32,7 @@ services:
       solr__P__server: http://dspacesolr:8983/solr
     depends_on:
     - dspacedb
-    image: dspace/dspace:dspace-7_x-test
+    image: docker.io/dspace/dspace:dspace-7_x-test
     networks:
       dspacenet:
     ports:
@@ -65,7 +65,7 @@ services:
       # This SQL is available from https://github.com/DSpace-Labs/AIP-Files/releases/tag/demo-entities-data
       LOADSQL: https://github.com/DSpace-Labs/AIP-Files/releases/download/demo-entities-data/dspace7-entities-data.sql
       PGDATA: /pgdata
-    image: dspace/dspace-postgres-pgcrypto:loadsql
+    image: docker.io/dspace/dspace-postgres-pgcrypto:loadsql
     networks:
       dspacenet:
     stdin_open: true
@@ -76,7 +76,7 @@ services:
   dspacesolr:
     container_name: dspacesolr
     # Uses official Solr image at https://hub.docker.com/_/solr/
-    image: solr:8.11-slim
+    image: docker.io/solr:8.11-slim
     # Needs main 'dspace' container to start first to guarantee access to solr_configs
     depends_on:
     - dspace
diff --git a/docker/docker-compose-rest.yml b/docker/docker-compose-rest.yml
index b73f1b7a390..02e7d68b326 100644
--- a/docker/docker-compose-rest.yml
+++ b/docker/docker-compose-rest.yml
@@ -39,7 +39,7 @@ services:
       # proxies.trusted.ipranges: This setting is required for a REST API running in Docker to trust requests 
       # from the host machine. This IP range MUST correspond to the 'dspacenet' subnet defined above.
       proxies__P__trusted__P__ipranges: '172.23.0'
-    image: dspace/dspace:dspace-7_x-test
+    image: docker.io/dspace/dspace:dspace-7_x-test
     depends_on:
     - dspacedb
     networks:
@@ -69,7 +69,7 @@ services:
     container_name: dspacedb
     environment:
       PGDATA: /pgdata
-    image: dspace/dspace-postgres-pgcrypto
+    image: docker.io/dspace/dspace-postgres-pgcrypto
     networks:
       dspacenet:
     ports:
@@ -83,7 +83,7 @@ services:
   dspacesolr:
     container_name: dspacesolr
     # Uses official Solr image at https://hub.docker.com/_/solr/
-    image: solr:8.11-slim
+    image: docker.io/solr:8.11-slim
     # Needs main 'dspace' container to start first to guarantee access to solr_configs
     depends_on:
     - dspace
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 1387b1de396..24a701b30b9 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -24,7 +24,7 @@ services:
       DSPACE_REST_HOST: localhost
       DSPACE_REST_PORT: 8080
       DSPACE_REST_NAMESPACE: /server
-    image: dspace/dspace-angular:dspace-7_x
+    image: docker.io/dspace/dspace-angular:dspace-7_x
     build:
       context: ..
       dockerfile: Dockerfile