diff --git a/charts/cryostat/tests/cryostat_service_test.yaml b/charts/cryostat/tests/cryostat_service_test.yaml
index 510d32c..95bda5c 100644
--- a/charts/cryostat/tests/cryostat_service_test.yaml
+++ b/charts/cryostat/tests/cryostat_service_test.yaml
@@ -163,7 +163,7 @@ tests:
           value: TCP
       - equal:
           path: spec.ports[0].name
-          value: cryostat-http
+          value: http
       - equal:
           path: spec.ports[1].port
           value: 443
@@ -175,11 +175,12 @@ tests:
           value: TCP
       - equal:
           path: spec.ports[1].name
-          value: cryostat-https
+          value: https
       - equal:
           path: spec.selector
           value:
             app.kubernetes.io/name: cryostat
+            app.kubernetes.io/part-of: cryostat
             app.kubernetes.io/instance: RELEASE-NAME
             app.kubernetes.io/component: cryostat
       - equal:
@@ -188,6 +189,7 @@ tests:
             app.kubernetes.io/instance: RELEASE-NAME
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: cryostat
+            app.kubernetes.io/part-of: cryostat
             app.kubernetes.io/version: "4.0.0-dev"
             helm.sh/chart: cryostat-2.0.0-dev
             app.kubernetes.io/component: cryostat
diff --git a/charts/cryostat/tests/cryostat_tls_secret_test.yaml b/charts/cryostat/tests/cryostat_tls_secret_test.yaml
index 4613e5a..c3b8bda 100644
--- a/charts/cryostat/tests/cryostat_tls_secret_test.yaml
+++ b/charts/cryostat/tests/cryostat_tls_secret_test.yaml
@@ -32,6 +32,7 @@ tests:
             app.kubernetes.io/instance: RELEASE-NAME
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: cryostat
+            app.kubernetes.io/part-of: cryostat
             app.kubernetes.io/version: 4.0.0-dev
             helm.sh/chart: cryostat-2.0.0-dev
 
diff --git a/charts/cryostat/tests/notes_test.yaml b/charts/cryostat/tests/notes_test.yaml
index 5912df4..1e791eb 100644
--- a/charts/cryostat/tests/notes_test.yaml
+++ b/charts/cryostat/tests/notes_test.yaml
@@ -128,7 +128,7 @@ tests:
               kubectl -n NAMESPACE wait --for=condition=available --timeout=60s deploy/RELEASE-NAME-cryostat-v4
 
               export SVC_NAME=$(kubectl get services -n NAMESPACE -l "app.kubernetes.io/name=cryostat,app.kubernetes.io/instance=RELEASE-NAME,app.kubernetes.io/component=cryostat" --sort-by=.metadata.creationTimestamp -o jsonpath="{.items[-1:].metadata.name}")
-              kubectl -n NAMESPACE port-forward svc/$SVC_NAME 8443:cryostat-https
+              kubectl -n NAMESPACE port-forward svc/$SVC_NAME 8443:https
               ```
 
             3. Visit the application at:
@@ -157,7 +157,7 @@ tests:
               kubectl -n NAMESPACE wait --for=condition=available --timeout=60s deploy/RELEASE-NAME-cryostat-v4
 
               export SVC_NAME=$(kubectl get services -n NAMESPACE -l "app.kubernetes.io/name=cryostat,app.kubernetes.io/instance=RELEASE-NAME,app.kubernetes.io/component=cryostat" --sort-by=.metadata.creationTimestamp -o jsonpath="{.items[-1:].metadata.name}")
-              kubectl -n NAMESPACE port-forward svc/$SVC_NAME 8080:cryostat-http
+              kubectl -n NAMESPACE port-forward svc/$SVC_NAME 8080:http
               ```
 
             3. Visit the application at: