diff --git a/docker/docker-compose-rest.yml b/docker/docker-compose-rest.yml
index 87cea6b1d31..17f37f6401d 100644
--- a/docker/docker-compose-rest.yml
+++ b/docker/docker-compose-rest.yml
@@ -94,7 +94,7 @@ services:
       TZ: ${TIMEZONE:-Europe/Bratislava}
       PGDATA: /pgdata
       POSTGRES_PASSWORD: dspace
-    image: dspace/dspace-postgres-pgcrypto
+    image: ${DSPACE_DB_IMAGE:-dataquest/dspace-postgres-pgcrypto:dspace-7_x}
     networks:
       dspacenet:
     ports:
@@ -112,8 +112,7 @@ services:
       TZ: ${TIMEZONE:-Europe/Bratislava}
     restart: unless-stopped
     container_name: dspacesolr${INSTANCE}
-    # Uses official Solr image at https://hub.docker.com/_/solr/
-    image: solr:8.11-slim
+    image: ${DSPACE_SOLR_IMAGE:-dataquest/dspace-solr:dspace-7_x}
     # Needs main 'dspace' container to start first to guarantee access to solr_configs
     depends_on:
     - dspace