diff --git a/helm-charts/templates/data-plane/gateway-components/gateway-runtime/gateway-runtime-deployment.yaml b/helm-charts/templates/data-plane/gateway-components/gateway-runtime/gateway-runtime-deployment.yaml
index 7d1d0640f..0426ebc38 100644
--- a/helm-charts/templates/data-plane/gateway-components/gateway-runtime/gateway-runtime-deployment.yaml
+++ b/helm-charts/templates/data-plane/gateway-components/gateway-runtime/gateway-runtime-deployment.yaml
@@ -109,8 +109,7 @@ spec:
             - name: enforcer_admin_pwd
               value: admin
             - name: JAVA_OPTS
-              # value: -Dhttpclient.hostnameVerifier=AllowAll -Xms512m -Xmx512m -XX:MaxRAMFraction=2
-              value: -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5006 -Dhttpclient.hostnameVerifier=AllowAll -Xms512m -Xmx512m -XX:MaxRAMFraction=2
+              value: -Dhttpclient.hostnameVerifier=AllowAll -Xms512m -Xmx512m -XX:MaxRAMFraction=2
             {{- if .Values.wso2.apk.dp.gatewayRuntime.deployment.enforcer.redis }}
             - name: REDIS_USERNAME
               value: {{ .Values.wso2.apk.dp.gatewayRuntime.deployment.enforcer.redis.username | default "default" }}
diff --git a/helm-charts/values.yaml b/helm-charts/values.yaml
index 9cb46b7b2..7c52d2566 100644
--- a/helm-charts/values.yaml
+++ b/helm-charts/values.yaml
@@ -212,8 +212,8 @@ wso2:
             failureThreshold: 5
           strategy: RollingUpdate
           replicas: 1
-          imagePullPolicy: IfNotPresent
-          image: apk-adapter:1.0.0-SNAPSHOT
+          imagePullPolicy: Always
+          image: wso2/apk-adapter:latest
           security:
             sslHostname: "adapter"
 #        logging:
@@ -245,8 +245,8 @@ wso2:
             failureThreshold: 5
           strategy: RollingUpdate
           replicas: 1
-          imagePullPolicy: IfNotPresent
-          image: apk-common-controller:1.0.0-SNAPSHOT
+          imagePullPolicy: Always
+          image: wso2/apk-common-controller:latest
           security:
             sslHostname: "commoncontroller"
           # configs:
@@ -333,8 +333,8 @@ wso2:
               periodSeconds: 20
               failureThreshold: 5
             strategy: RollingUpdate
-            imagePullPolicy: IfNotPresent
-            image: apk-enforcer:1.0.0-SNAPSHOT
+            imagePullPolicy: Always
+            image: wso2/apk-enforcer:latest
             security:
               sslHostname: "enforcer"
 #            logging: