diff --git a/charts/eric-oss-hello-world-python-app/templates/configmap/envoy-configmap.yaml b/charts/eric-oss-hello-world-python-app/templates/configmap/envoy-configmap.yaml
index ead96c9..422deac 100644
--- a/charts/eric-oss-hello-world-python-app/templates/configmap/envoy-configmap.yaml
+++ b/charts/eric-oss-hello-world-python-app/templates/configmap/envoy-configmap.yaml
@@ -35,6 +35,10 @@ data:
                                 path: "/sample-app/python/hello"
                               route:
                                 cluster: eric-oss-hello-world-python-app-cluster
+                            - match:
+                                path: "/sample-app/python/metrics"
+                              route:
+                                cluster: eric-oss-hello-world-python-app-cluster
                     http_filters:
                       - name: envoy.filters.http.router
                         typed_config:
@@ -74,10 +78,6 @@ data:
                                 path: "/sample-app/python/health"
                               route:
                                 cluster: eric-oss-hello-world-python-app-cluster
-                            - match:
-                                path: "/sample-app/python/metrics"
-                              route:
-                                cluster: eric-oss-hello-world-python-app-cluster
                     http_filters:
                       - name: envoy.filters.http.router
                         typed_config:
diff --git a/charts/eric-oss-hello-world-python-app/templates/deployment/deployment.yaml b/charts/eric-oss-hello-world-python-app/templates/deployment/deployment.yaml
index e4523a8..df10610 100644
--- a/charts/eric-oss-hello-world-python-app/templates/deployment/deployment.yaml
+++ b/charts/eric-oss-hello-world-python-app/templates/deployment/deployment.yaml
@@ -29,17 +29,18 @@ spec:
   template:
     metadata:
       labels:
+        rapp-name: {{ include "eric-oss-hello-world-python-app.name" . }}
         app: {{ include "eric-oss-hello-world-python-app.name" . }}
         app.kubernetes.io/name: {{ include "eric-oss-hello-world-python-app.name" . }}
         app.kubernetes.io/version: {{ include "eric-oss-hello-world-python-app.version" . }}
         helm.sh/chart: {{ template "eric-oss-hello-world-python-app.chart" . }}
         app.kubernetes.io/instance: {{ .Release.Name }}
-        service.cleartext/scraping: "true"
+        rapp.metrics/scraping: "true"
       annotations:
         {{- if not (semverCompare ">=1.30.0" .Capabilities.KubeVersion.GitVersion) }}
         container.apparmor.security.beta.kubernetes.io/eric-oss-hello-world-python-app: {{ include "eric-oss-hello-world-python-app.appArmorProfileAnnotation" . | default "runtime/default" }}
         {{- end }}
-        prometheus.io/port: '{{ index .Values.service "http-port" }}'
+        prometheus.io/port: '{{ index .Values.service "https-port" }}'
         prometheus.io/scrape: "{{ .Values.prometheus.scrape }}"
         prometheus.io/path: "{{ .Values.prometheus.path }}"
 {{- include "eric-oss-hello-world-python-app.product-info" . | indent 8 }}
@@ -111,10 +112,6 @@ spec:
               mountPath: {{ index .Values "clientCredsMountPath" | default .Values.instantiationDefaults.clientCredsMountPath | quote }}
               readOnly: true
           env:
-            - name: IAM_CLIENT_ID
-              value: {{ index .Values "clientId" | quote }}
-            - name: IAM_CLIENT_SECRET
-              value: {{ index .Values "clientSecret" | quote }}
             - name: IAM_BASE_URL
               value: {{ index .Values "iamBaseUrl" | quote }}
             - name: LOG_ENDPOINT
diff --git a/charts/eric-oss-hello-world-python-app/templates/network-policy/network-policy.yaml b/charts/eric-oss-hello-world-python-app/templates/network-policy/network-policy.yaml
index 6b6fa2e..6a38f6a 100644
--- a/charts/eric-oss-hello-world-python-app/templates/network-policy/network-policy.yaml
+++ b/charts/eric-oss-hello-world-python-app/templates/network-policy/network-policy.yaml
@@ -32,4 +32,3 @@ spec:
       port: {{ index .Values.service "http-port" }}
     - protocol: TCP
       port: {{ index .Values.service "https-port" }}
-