diff --git a/deploy/docker-compose.yml b/deploy/docker-compose.yml
index 86ce07f..34bdd38 100644
--- a/deploy/docker-compose.yml
+++ b/deploy/docker-compose.yml
@@ -80,6 +80,38 @@ services:
     networks:
       - appfactory
 
+  appfactory-worker:
+    image: appfactory-worker:latest
+    container_name: appfactory-worker
+    restart: unless-stopped
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+      - /opt/appfactory:/opt/appfactory
+      - /opt/appfactory/workspace:/opt/appfactory/workspace
+      - /opt/appfactory/workspace/appfactory-tools/scripts:/tools
+      - /usr/bin/docker:/usr/bin/docker:ro
+      - /usr/libexec/docker:/usr/libexec/docker:ro
+    environment:
+      - HOME=/opt/appfactory
+      - DOCKER_CONFIG=/tmp/.docker
+      - APPFACTORY_WORKER_ID=appfactory-worker
+    networks:
+      - appfactory
+
+
+  appfactory-monitor:
+    image: appfactory-monitor:latest
+    container_name: appfactory-monitor
+    restart: unless-stopped
+    volumes:
+      - /opt/appfactory:/opt/appfactory
+    environment:
+      - APPFACTORY_MONITOR_INTERVAL_SECONDS=30
+      - APPFACTORY_MONITOR_TIMEOUT_SECONDS=5
+    networks:
+      - appfactory
+
+
 networks:
   appfactory:
     name: appfactory