diff --git a/conf/docker/docker-compose.yaml b/conf/docker/docker-compose.yaml
index e2ba0f3..5ac1155 100644
--- a/conf/docker/docker-compose.yaml
+++ b/conf/docker/docker-compose.yaml
@@ -399,7 +399,7 @@ services:
   mc-cost-optimizer-fe:
     restart: unless-stopped
     container_name: mc-cost-optimizer-fe
-    image: cloudbaristaorg/mc-costopti-ui:edge
+    image: cloudbaristaorg/mc-costopti-ui:0.6.0
     pull_policy: always
     networks:
       - mc-cost-optimizer-network
@@ -417,7 +417,7 @@ services:
   mc-cost-optimizer-be:
     restart: on-failure
     container_name: mc-cost-optimizer-be
-    image: cloudbaristaorg/mc-costopti-api:edge
+    image: cloudbaristaorg/mc-costopti-api:0.6.0
     pull_policy: always
     networks:
       - mc-cost-optimizer-network
@@ -449,7 +449,7 @@ services:
   mc-cost-optimizer-cost-collector:
     restart: on-failure
     container_name: mc-cost-optimizer-cost-collector
-    image: cloudbaristaorg/mc-costopti-costcollector:edge
+    image: cloudbaristaorg/mc-costopti-costcollector:0.6.0
     pull_policy: always
     networks:
       - mc-cost-optimizer-network
@@ -483,7 +483,7 @@ services:
   mc-cost-optimizer-cost-processor:
     restart: on-failure
     container_name: mc-cost-optimizer-cost-processor
-    image: cloudbaristaorg/mc-costopti-costprocessor:edge
+    image: cloudbaristaorg/mc-costopti-costprocessor:0.6.0
     pull_policy: always
     networks:
       - mc-cost-optimizer-network
@@ -510,7 +510,7 @@ services:
   mc-cost-optimizer-cost-selector:
     restart: on-failure
     container_name: mc-cost-optimizer-cost-selector
-    image: cloudbaristaorg/mc-costopti-costselector:edge
+    image: cloudbaristaorg/mc-costopti-costselector:0.6.0
     pull_policy: always
     networks:
       - mc-cost-optimizer-network
@@ -537,7 +537,7 @@ services:
   mc-cost-optimizer-alarm-service:
     restart: on-failure
     container_name: mc-cost-optimizer-alarm-service
-    image: cloudbaristaorg/mc-costopti-alarm:edge
+    image: cloudbaristaorg/mc-costopti-alarm:0.6.0
     pull_policy: always
     networks:
       - mc-cost-optimizer-network
@@ -562,7 +562,7 @@ services:
   mc-cost-optimizer-asset-collector:
     restart: on-failure
     container_name: mc-cost-optimizer-asset-collector
-    image: cloudbaristaorg/mc-costopti-assetcollector:edge
+    image: cloudbaristaorg/mc-costopti-assetcollector:0.6.0
     pull_policy: always
     networks:
       - mc-cost-optimizer-network
@@ -588,7 +588,7 @@ services:
   mc-cost-optimizer-cost-azure-collector:
     restart: on-failure
     container_name: mc-cost-optimizer-cost-azure-collector
-    image: cloudbaristaorg/mc-costopti-azure-collector:edge
+    image: cloudbaristaorg/mc-costopti-azure-collector:0.6.0
     pull_policy: always
     networks:
       - mc-cost-optimizer-network
@@ -629,7 +629,7 @@ services:
   mc-cost-optimizer-gcp-collector:
     restart: on-failure
     container_name: mc-cost-optimizer-gcp-collector
-    image: cloudbaristaorg/mc-costopti-gcpcollector:edge
+    image: cloudbaristaorg/mc-costopti-gcpcollector:0.6.0
     pull_policy: always
     networks:
       - mc-cost-optimizer-network
@@ -670,7 +670,7 @@ services:
   mc-cost-optimizer-cost-ncp-collector:
     restart: on-failure
     container_name: mc-cost-optimizer-cost-ncp-collector
-    image: cloudbaristaorg/mc-costopti-ncp-collector:edge
+    image: cloudbaristaorg/mc-costopti-ncp-collector:0.6.0
     pull_policy: always
     networks:
       - mc-cost-optimizer-network
@@ -712,7 +712,7 @@ services:
   mc-cost-optimizer-azure-vm-rightsizer:
     restart: on-failure
     container_name: mc-cost-optimizer-azure-vm-rightsizer
-    image: cloudbaristaorg/mc-costopti-azure-vm-rightsizer:edge
+    image: cloudbaristaorg/mc-costopti-azure-vm-rightsizer:0.6.0
     pull_policy: always
     networks:
       - mc-cost-optimizer-network
@@ -753,7 +753,7 @@ services:
   mc-cost-optimizer-ncp-vm-rightsizer:
     restart: on-failure
     container_name: mc-cost-optimizer-ncp-vm-rightsizer
-    image: cloudbaristaorg/mc-costopti-ncp-vm-rightsizer:edge
+    image: cloudbaristaorg/mc-costopti-ncp-vm-rightsizer:0.6.0
     pull_policy: always
     networks:
       - mc-cost-optimizer-network
@@ -794,7 +794,7 @@ services:
   mc-cost-optimizer-ml-scorer:
     restart: on-failure
     container_name: mc-cost-optimizer-ml-scorer
-    image: cloudbaristaorg/mc-costopti-ml-scorer:0.5.6
+    image: cloudbaristaorg/mc-costopti-ml-scorer:0.6.0
     pull_policy: always
     networks:
       - mc-cost-optimizer-network