diff --git a/compose.yaml b/compose.yaml
index c8445265..b815d600 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -5,7 +5,7 @@ services:
 
   # Backend API
   backend:
-    image: 192.168.1.60:5000/elearning-backend:latest
+    image: 192.168.1.60/chamomind/elearning-backend:${BACKEND_TAG:-latest}
     container_name: elearning-backend
     restart: unless-stopped
     ports:
@@ -17,7 +17,7 @@ services:
 
   # Frontend Learner
   frontend-learner:
-    image: 192.168.1.60:5000/elearning-frontend-learner:latest
+    image: 192.168.1.60/elearning-frontend-learner:${FRONTEND_LEARNER_TAG:-latest}
     container_name: elearning-frontend-learner
     restart: unless-stopped
     ports:
@@ -31,7 +31,7 @@ services:
 
   # Frontend Management
   frontend-management:
-    image: 192.168.1.60:5000/elearning-frontend-management:latest
+    image: 192.168.1.60/elearning-frontend-management:${FRONTEND_MGMT_TAG:-latest}
     container_name: elearning-frontend-management
     restart: unless-stopped
     ports:
@@ -45,4 +45,4 @@ services:
 
 networks:
   elearning-shared:
-    external: true
\ No newline at end of file
+    external: true