diff --git a/helm-charts/samples/apim-apk-agent/cp/values.yaml b/helm-charts/samples/apim-apk-agent/cp/values.yaml
index e74cbb9eb1..f5286a23f2 100644
--- a/helm-charts/samples/apim-apk-agent/cp/values.yaml
+++ b/helm-charts/samples/apim-apk-agent/cp/values.yaml
@@ -17,11 +17,17 @@
 replicaCount: 1
 image:
   repository: wso2/apim-apk-agent
-  tag: 1.1.0-rc
+  tag: 1.1.0-rc2
   pullPolicy: Always
 service:
   name: apim-apk-agent-service
-resources: {}
+resources:
+  requests:
+    memory: "128Mi"
+    cpu: "100m"
+  limits:
+    memory: "256Mi"
+    cpu: "200m"
 controlPlane:
   enabled: true
   serviceURL: https://apim-wso2am-cp-1-service.apk.svc.cluster.local:9443/
@@ -39,4 +45,9 @@ metrics:
 agent:
   mode: DPtoCP
 certmanager:
-  enabled: true
\ No newline at end of file
+  enabled: false
+serviceAccount:
+  enableServiceAccountCreation: true
+  enableClusterRoleCreation: true
+  serviceAccountName: wso2agent-platform
+  roleName: wso2agent-role
diff --git a/helm-charts/samples/apim-apk-agent/values.yaml b/helm-charts/samples/apim-apk-agent/values.yaml
index afd8f0f4e8..0d95cca34d 100644
--- a/helm-charts/samples/apim-apk-agent/values.yaml
+++ b/helm-charts/samples/apim-apk-agent/values.yaml
@@ -17,11 +17,17 @@
 replicaCount: 1
 image:
   repository: wso2/apim-apk-agent
-  tag: 1.1.0-rc
+  tag: 1.1.0-rc2
   pullPolicy: Always
 service:
   name: apim-apk-agent-service
-resources: {}
+resources:
+  requests:
+    memory: "128Mi"
+    cpu: "100m"
+  limits:
+    memory: "256Mi"
+    cpu: "200m"
 controlPlane:
   enabled: true
   serviceURL: https://apim-wso2am-cp-1-service.apk.svc.cluster.local:9443/
@@ -40,4 +46,9 @@ metrics:
 agent:
   mode: CPtoDP
 certmanager:
-  enabled: true
+  enabled: false
+serviceAccount:
+  enableServiceAccountCreation: true
+  enableClusterRoleCreation: true
+  serviceAccountName: wso2agent-platform
+  roleName: wso2agent-role
diff --git a/helm-charts/samples/apk/cp-enabled-values.yaml b/helm-charts/samples/apk/cp-enabled-values.yaml
index 7fa3368a6e..b93fec74ab 100644
--- a/helm-charts/samples/apk/cp-enabled-values.yaml
+++ b/helm-charts/samples/apk/cp-enabled-values.yaml
@@ -116,7 +116,7 @@ wso2:
           strategy: RollingUpdate
           replicas: 1
           imagePullPolicy: Always
-          image: wso2/apk-adapter:1.1.0-rc
+          image: wso2/apk-adapter:1.1.0-rc2
           security:
             sslHostname: "adapter"
         #     logging:
@@ -149,7 +149,7 @@ wso2:
           strategy: RollingUpdate
           replicas: 1
           imagePullPolicy: Always
-          image: wso2/apk-common-controller:1.1.0-rc
+          image: wso2/apk-common-controller:1.1.0-rc2
           security:
             sslHostname: "commoncontroller"
           # configs:
@@ -176,7 +176,7 @@ wso2:
           strategy: RollingUpdate
           replicas: 1
           imagePullPolicy: Always
-          image: wso2/apk-ratelimiter:1.1.0-rc
+          image: wso2/apk-ratelimiter:1.1.0-rc2
           security:
             sslHostname: "ratelimiter"
           # configs:
@@ -206,7 +206,7 @@ wso2:
               failureThreshold: 5
             strategy: RollingUpdate
             imagePullPolicy: Always
-            image: wso2/apk-router:1.1.0-rc
+            image: wso2/apk-router:1.1.0-rc2
             # configs:
             #   tls:
             #     secretName: "router-cert"
@@ -237,7 +237,7 @@ wso2:
               failureThreshold: 5
             strategy: RollingUpdate
             imagePullPolicy: Always
-            image: wso2/apk-enforcer:1.1.0-rc
+            image: wso2/apk-enforcer:1.1.0-rc2
             security:
               sslHostname: "enforcer"
             #            logging:
@@ -309,7 +309,7 @@ idp:
       strategy: RollingUpdate
       replicas: 1
       imagePullPolicy: Always
-      image: wso2/apk-idp-domain-service:1.1.0-rc
+      image: wso2/apk-idp-domain-service:1.1.0-rc2
   idpui:
     deployment:
       resources:
@@ -330,7 +330,7 @@ idp:
       strategy: RollingUpdate
       replicas: 1
       imagePullPolicy: Always
-      image: wso2/apk-idp-ui:1.1.0-rc
+      image: wso2/apk-idp-ui:1.1.0-rc2
     configs:
       idpLoginUrl: "https://idp.am.wso2.com:9095/commonauth/login"
       idpAuthCallBackUrl: "https://idp.am.wso2.com:9095/oauth2/auth-callback"
diff --git a/helm-charts/samples/apk/values.yaml b/helm-charts/samples/apk/values.yaml
index cb25161e7b..368bded8b0 100644
--- a/helm-charts/samples/apk/values.yaml
+++ b/helm-charts/samples/apk/values.yaml
@@ -91,7 +91,7 @@ wso2:
           strategy: RollingUpdate
           replicas: 1
           imagePullPolicy: Always
-          image: wso2/apk-config-deployer-service:1.1.0-rc
+          image: wso2/apk-config-deployer-service:1.1.0-rc2
           # configs:
           #   tls:
           #     secretName: "my-secret"
@@ -117,7 +117,7 @@ wso2:
           strategy: RollingUpdate
           replicas: 1
           imagePullPolicy: Always
-          image: wso2/apk-adapter:1.1.0-rc
+          image: wso2/apk-adapter:1.1.0-rc2
           security:
             sslHostname: "adapter"
         #     logging:
@@ -150,7 +150,7 @@ wso2:
           strategy: RollingUpdate
           replicas: 1
           imagePullPolicy: Always
-          image: wso2/apk-common-controller:1.1.0-rc
+          image: wso2/apk-common-controller:1.1.0-rc2
           security:
             sslHostname: "commoncontroller"
           # configs:
@@ -177,7 +177,7 @@ wso2:
           strategy: RollingUpdate
           replicas: 1
           imagePullPolicy: Always
-          image: wso2/apk-ratelimiter:1.1.0-rc
+          image: wso2/apk-ratelimiter:1.1.0-rc2
           security:
             sslHostname: "ratelimiter"
           # configs:
@@ -207,7 +207,7 @@ wso2:
               failureThreshold: 5
             strategy: RollingUpdate
             imagePullPolicy: Always
-            image: wso2/apk-router:1.1.0-rc
+            image: wso2/apk-router:1.1.0-rc2
             # configs:
             #   tls:
             #     secretName: "router-cert"
@@ -238,7 +238,7 @@ wso2:
               failureThreshold: 5
             strategy: RollingUpdate
             imagePullPolicy: Always
-            image: wso2/apk-enforcer:1.1.0-rc
+            image: wso2/apk-enforcer:1.1.0-rc2
             security:
               sslHostname: "enforcer"
     #            logging:
@@ -312,7 +312,7 @@ idp:
       strategy: RollingUpdate
       replicas: 1
       imagePullPolicy: Always
-      image: wso2/apk-idp-domain-service:1.1.0-rc
+      image: wso2/apk-idp-domain-service:1.1.0-rc2
   idpui:
     deployment:
       resources:
@@ -333,7 +333,7 @@ idp:
       strategy: RollingUpdate
       replicas: 1
       imagePullPolicy: Always
-      image: wso2/apk-idp-ui:1.1.0-rc
+      image: wso2/apk-idp-ui:1.1.0-rc2
     configs:
       idpLoginUrl: "https://idp.am.wso2.com:9095/commonauth/login"
       idpAuthCallBackUrl: "https://idp.am.wso2.com:9095/oauth2/auth-callback"