diff --git a/admin/admin-domain-service/gradle.properties b/admin/admin-domain-service/gradle.properties
index 036627e31e..bd08eeb6d7 100644
--- a/admin/admin-domain-service/gradle.properties
+++ b/admin/admin-domain-service/gradle.properties
@@ -1,5 +1,5 @@
 group=org.wso2.apk
 version=0.0.1-SNAPSHOT
-docker_image_name = admin-domain-service
+docker_image_name = apk-admin-domain-service
 jar_name = admin_service.jar
 dist_name = admin
\ No newline at end of file
diff --git a/backoffice/backoffice-domain-service/gradle.properties b/backoffice/backoffice-domain-service/gradle.properties
index da8d3aebd0..006dd176ba 100644
--- a/backoffice/backoffice-domain-service/gradle.properties
+++ b/backoffice/backoffice-domain-service/gradle.properties
@@ -1,6 +1,6 @@
 group=org.wso2.apk
 version=0.0.1-SNAPSHOT
-docker_image_name = backoffice-domain-service
+docker_image_name = apk-backoffice-domain-service
 jar_name = backoffice_service.jar
 dist_name = backoffice
 
diff --git a/devportal/devportal-domain-service/gradle.properties b/devportal/devportal-domain-service/gradle.properties
index 3b8cf10037..2c8e11a6f3 100644
--- a/devportal/devportal-domain-service/gradle.properties
+++ b/devportal/devportal-domain-service/gradle.properties
@@ -1,5 +1,5 @@
 group=org.wso2.apk
 version=0.0.1-SNAPSHOT
-docker_image_name = devportal-domain-service
+docker_image_name = apk-devportal-domain-service
 jar_name = devportal_service.jar
 dist_name = devportal
\ No newline at end of file
diff --git a/helm-charts/values.yaml b/helm-charts/values.yaml
index ec2699396f..99a2321f13 100644
--- a/helm-charts/values.yaml
+++ b/helm-charts/values.yaml
@@ -77,7 +77,7 @@ wso2:
           strategy: Recreate
           replicas: 1
           imagePullPolicy: Always
-          image: wso2/devportal-domain-service:0.0.1-m11
+          image: wso2/apk-devportal-domain-service:latest
       admin:
         deployment:
           resources:
@@ -98,7 +98,7 @@ wso2:
           strategy: Recreate
           replicas: 1
           imagePullPolicy: Always
-          image: wso2/admin-domain-service:0.0.1-m11
+          image: wso2/apk-admin-domain-service:latest
       backoffice:
         deployment:
           resources:
@@ -119,7 +119,7 @@ wso2:
           strategy: Recreate
           replicas: 1
           imagePullPolicy: Always
-          image: wso2/backoffice-domain-service:0.0.1-m11
+          image: wso2/apk-backoffice-domain-service:latest
       managementServer:
         deployment:
           resources:
@@ -132,7 +132,7 @@ wso2:
           strategy: Recreate
           replicas: 1
           imagePullPolicy: Always
-          image: wso2/management-server:0.0.1-m11
+          image: wso2/apk-management-server:latest
           readinessProbe:
             initialDelaySeconds: 20
             periodSeconds: 20
diff --git a/helm-charts/values.yaml.template b/helm-charts/values.yaml.template
index 5a32b8b685..691baefce3 100644
--- a/helm-charts/values.yaml.template
+++ b/helm-charts/values.yaml.template
@@ -126,7 +126,7 @@ wso2:
           # -- Image pull policy
           imagePullPolicy: Always
           # -- Image
-          image: wso2/devportal-domain-service:latest
+          image: wso2/apk-devportal-domain-service:latest
       admin:
         deployment:
           resources:
@@ -161,7 +161,7 @@ wso2:
           # -- Image pull policy
           imagePullPolicy: Always
           # -- Image
-          image: wso2/admin-domain-service:latest
+          image: wso2/apk-admin-domain-service:latest
       backoffice:
         deployment:
           resources:
@@ -196,7 +196,7 @@ wso2:
           # -- Image pull policy
           imagePullPolicy: Always
           # -- Image
-          image: wso2/backoffice-domain-service:latest
+          image: wso2/apk-backoffice-domain-service:latest
       managementServer:
         deployment:
           resources:
@@ -217,7 +217,7 @@ wso2:
           # -- Image pull policy
           imagePullPolicy: Always
           # -- Image
-          image: wso2/management-server:0.0.1-m8
+          image: wso2/apk-management-server:latest
           readinessProbe:
             # -- Number of seconds after the container has started before liveness probes are initiated.
             initialDelaySeconds: 20
diff --git a/management-server/gradle.properties b/management-server/gradle.properties
index ecfbd3b37c..e0595307df 100644
--- a/management-server/gradle.properties
+++ b/management-server/gradle.properties
@@ -1,4 +1,4 @@
 group=org.wso2.apk
 version=0.0.1-SNAPSHOT
 file=cmd/main.go
-docker_image_name=management-server
+docker_image_name=apk-management-server