diff --git a/.github/workflows/merge.yml b/.github/workflows/docker.yml
similarity index 98%
rename from .github/workflows/merge.yml
rename to .github/workflows/docker.yml
index 3b8258a..45735c9 100644
--- a/.github/workflows/merge.yml
+++ b/.github/workflows/docker.yml
@@ -1,4 +1,4 @@
-name: Build and Push Docker Images On Merge
+name: Build and Push Docker Images
 
 on:
   push:
diff --git a/docker/docker-compose.nlu.yml b/docker/docker-compose.nlu.yml
index be46953..9f5383a 100644
--- a/docker/docker-compose.nlu.yml
+++ b/docker/docker-compose.nlu.yml
@@ -10,7 +10,7 @@ services:
 
   nlu-api:
     container_name: nlu-api
-    image: hexabot-nlu:latest
+    image: hexastack/hexabot-nlu:latest
     env_file: .env
     networks:
       - nlp-network
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 6fabf64..80bcdf3 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -3,7 +3,7 @@ version: "3.9"
 services:
   database-init:
     container_name: database-init
-    image: hexabot-api:latest
+    image: hexastack/hexabot-api:latest
     command: sh -c "npm run cache:init && npm run migrate prune && npm run migrate up"
     env_file: .env
     networks:
@@ -14,7 +14,7 @@ services:
 
   api:
     container_name: api
-    image: hexabot-api:latest
+    image: hexastack/hexabot-api:latest
     env_file: .env
     ports:
       - ${API_PORT}:3000
@@ -37,7 +37,7 @@ services:
 
   hexabot-frontend:
     container_name: frontend
-    image: hexabot-ui:latest
+    image: hexastack/hexabot-ui:latest
     env_file: .env
     ports:
       - ${APP_FRONTEND_PORT}:8080
@@ -67,7 +67,7 @@ services:
 
   widget:
     container_name: widget
-    image: hexabot-widget:latest
+    image: hexastack/hexabot-widget:latest
     networks:
       - app-network
     depends_on: