diff --git a/test-framework/helm/property-settings-svc-v2/templates/configmap.yaml b/test-framework/helm/property-settings-svc-v2/templates/configmap.yaml
index 6e2e709..58c3bae 100644
--- a/test-framework/helm/property-settings-svc-v2/templates/configmap.yaml
+++ b/test-framework/helm/property-settings-svc-v2/templates/configmap.yaml
@@ -24,19 +24,19 @@ data:
     {
         "post_properties":
         {
-            "url": "http://prop-property-settings:8080/propertySettingsSvcV2/properties",
+            "url": "http://property-settings-v2-service:8080/propertySettingsSvcV2/properties",
             "type": "post",
             "response": "com.sokrati.propertySettingsSvcObjectsV2.PostPropertiesResponse"
         },
         "get_all_properties":
         {
-            "url": "http://prop-property-settings:8080/propertySettingsSvcV2/properties",
+            "url": "http://property-settings-v2-service:8080/propertySettingsSvcV2/properties",
             "type": "get",
             "response": "com.sokrati.propertySettingsSvcObjectsV2.GetPropertiesResponse"
         },
         "get_best_properties":
         {
-            "url": "http://prop-property-settings:8080/propertySettingsSvcV2/properties",
+            "url": "http://property-settings-v2-service:8080/propertySettingsSvcV2/properties",
             "type": "get",
             "response": "com.sokrati.propertySettingsSvcObjectsV2.GetPropertiesResponse"
         },
@@ -55,19 +55,19 @@ data:
     {
         "post_properties":
         {
-            "url": "http://prop-property-settings:8080/propertySettingsSvcV2/properties",
+            "url": "http://property-settings-v2-service:8080/propertySettingsSvcV2/properties",
             "type": "post",
             "response": "com.sokrati.propertySettingsSvcObjectsV2.PostPropertiesResponse"
         },
         "get_all_properties":
         {
-            "url": "http://prop-property-settings:8080/propertySettingsSvcV2/properties",
+            "url": "http://property-settings-v2-service:8080/propertySettingsSvcV2/properties",
             "type": "get",
             "response": "com.sokrati.propertySettingsSvcObjectsV2.GetPropertiesResponse"
         },
         "get_best_properties":
         {
-            "url": "http://prop-property-settings:8080/propertySettingsSvcV2/properties",
+            "url": "http://property-settings-v2-service:8080/propertySettingsSvcV2/properties",
             "type": "get",
             "response": "com.sokrati.propertySettingsSvcObjectsV2.GetPropertiesResponse"
         },
@@ -90,7 +90,7 @@ data:
             {{- else }}
             hades_auth_url : "{{ .Values.hades.baseUrl }}/hadesV2/authorize",
             {{- end }}
-            auth_enable : true
+            auth_enable : false
         },
         test: {
             {{- if .Values.traefik.enabled }}
@@ -98,7 +98,7 @@ data:
             {{- else }}
             hades_auth_url : "{{ .Values.hades.baseUrl }}/hadesV2/authorize",
             {{- end }}
-            auth_enable : true
+            auth_enable : false
         }
     }
   statsLogging.cfg: |
diff --git a/test-framework/helm/property-settings-svc-v2/values.yaml b/test-framework/helm/property-settings-svc-v2/values.yaml
index cb44180..1f11d00 100644
--- a/test-framework/helm/property-settings-svc-v2/values.yaml
+++ b/test-framework/helm/property-settings-svc-v2/values.yaml
@@ -4,7 +4,7 @@
 
 # External service dependencies - URLs can be overridden via Helm parameters
 hades:
-  baseUrl: "http://hades.hades.svc.cluster.local:8080"
+  baseUrl: "http://hades-service:8080"
 
 # This will set the replicaset count more information can be found here: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset/
 replicaCount: 1
@@ -12,7 +12,7 @@ replicaCount: 1
 # Common labels to add to all resources
 # These labels enable Backstage discovery and Hades IP registration
 commonLabels:
-  backstage.io/kubernetes-id: "property-settings-service"
+  backstage.io/kubernetes-id: "property-settings-v2-service"
   osmos.ai/track: "true"
 
 # This sets the container image more information can be found here: https://kubernetes.io/docs/concepts/containers/images/
@@ -43,7 +43,8 @@ serviceAccount:
 
 # This is for setting Kubernetes Annotations to a Pod.
 # For more information checkout: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
-podAnnotations: {}
+podAnnotations:
+  osmos.ai/service-name: "psDbService_rw"
 # This is for setting Kubernetes Labels to a Pod.
 # For more information checkout: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
 podLabels: {}
@@ -271,25 +272,25 @@ config:
     {
         "post_properties": 
         {
-            "url": "http://prop-property-settings:8080/propertySettingsSvcV2/properties",
+            "url": "http://property-settings-v2-service:8080/propertySettingsSvcV2/properties",
             "type": "post",
             "response": "com.sokrati.propertySettingsSvcObjectsV2.PostPropertiesResponse"
         },
         "get_all_properties": 
         {
-            "url": "http://prop-property-settings:8080/propertySettingsSvcV2/properties",
+            "url": "http://property-settings-v2-service:8080/propertySettingsSvcV2/properties",
             "type": "get",
             "response": "com.sokrati.propertySettingsSvcObjectsV2.GetPropertiesResponse"
         },
         "get_best_properties": 
         {
-            "url": "http://prop-property-settings:8080/propertySettingsSvcV2/properties",
+            "url": "http://property-settings-v2-service:8080/propertySettingsSvcV2/properties",
             "type": "get",
             "response": "com.sokrati.propertySettingsSvcObjectsV2.GetPropertiesResponse"
         },
         "fetch_context":
         {
-            "url": "http://hades.hades.svc.cluster.local:8080/hadesV2/context",
+            "url": "http://hades-service:8080/hadesV2/context",
             "type": "get",
             "response": "com.sokrati.hadesObjects.ContextResponse"
         }
@@ -300,25 +301,25 @@ config:
     {
         "post_properties": 
         {
-            "url": "http://prop-property-settings:8080/propertySettingsSvcV2/properties",
+            "url": "http://property-settings-v2-service:8080/propertySettingsSvcV2/properties",
             "type": "post",
             "response": "com.sokrati.propertySettingsSvcObjectsV2.PostPropertiesResponse"
         },
         "get_all_properties": 
         {
-            "url": "http://prop-property-settings:8080/propertySettingsSvcV2/properties",
+            "url": "http://property-settings-v2-service:8080/propertySettingsSvcV2/properties",
             "type": "get",
             "response": "com.sokrati.propertySettingsSvcObjectsV2.GetPropertiesResponse"
         },
         "get_best_properties": 
         {
-            "url": "http://prop-property-settings:8080/propertySettingsSvcV2/properties",
+            "url": "http://property-settings-v2-service:8080/propertySettingsSvcV2/properties",
             "type": "get",
             "response": "com.sokrati.propertySettingsSvcObjectsV2.GetPropertiesResponse"
         },
         "fetch_context":
         {
-            "url": "http://hades.hades.svc.cluster.local:8080/hadesV2/context",
+            "url": "http://hades-service:8080/hadesV2/context",
             "type": "get",
             "response": "com.sokrati.hadesObjects.ContextResponse"
         }
@@ -328,12 +329,12 @@ config:
   auth: |
     {
         prod: {
-            hades_auth_url : "http://hades.hades.svc.cluster.local:8080/hadesV2/authorize",
-            auth_enable : true
+            hades_auth_url : "http://hades-service:8080/hadesV2/authorize",
+            auth_enable : false
         },
         test: {
-            hades_auth_url : "http://hades.hades.svc.cluster.local:8080/hadesV2/authorize",
-            auth_enable : true
+            hades_auth_url : "http://hades-service:8080/hadesV2/authorize",
+            auth_enable : false
         }
     }