diff --git a/docker-compose.yaml b/docker-compose.yaml
index 6134e09..5c5ce95 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -1,9 +1,7 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/compose-spec/compose-spec/master/schema/compose-spec.json
 services:
     site:
-        build:
-            context: .
-            dockerfile: ./src/Dockerfile
+        build: src
         networks:
             - am-d-model-network
         expose:
@@ -43,18 +41,16 @@ services:
               awslogs-stream: caddy
               awslogs-create-group: "true"
     invenio-rdm:
-        build:
-          context: .
-          dockerfile: ./invenio/Dockerfile
+        build: invenio
         networks:
             - am-d-model-network
         pull_policy: if_not_present
         volumes:
             - uploaded_data:/opt/invenio/var/instance/data
             - archived_data:/opt/invenio/var/instance/archive
-            - ./invenio/assets:/opt/invenio/var/instance/static/custom_assets # Add static assets for theming
-            - ./invenio/plugin:/opt/invenio/var/instance/plugin # Add plugin for customisations
-            - ./invenio.cfg:/opt/invenio/var/instance/invenio.cfg # Override the config with our custom one
+            - assets:/opt/invenio/var/instance/static/custom_assets # Add static assets for theming
+            - plugin:/opt/invenio/var/instance/plugin # Add plugin for customisations
+            - invenio.cfg:/opt/invenio/var/instance/invenio.cfg # Override the config with our custom one
         environment:
             # Production mode
             - INVENIO_ENV=production
@@ -159,9 +155,7 @@ services:
               awslogs-stream: invenio-rdm
               awslogs-create-group: "true"
     worker:
-        build:
-            context: .
-            dockerfile: ./invenio/Dockerfile
+        build: ghcr.io/front-matter/invenio-rdm-starter:v12.0.13.4
         command: "celery -A invenio_app.celery worker --beat --events --loglevel=WARNING"
         networks:
             - am-d-model-network
diff --git a/invenio.cfg b/invenio/invenio.cfg
similarity index 100%
rename from invenio.cfg
rename to invenio/invenio.cfg