diff --git a/.github/workflows/common_library_tests.yaml b/.github/workflows/common_library_tests.yaml
index 8db3686514..193ed9e4f4 100644
--- a/.github/workflows/common_library_tests.yaml
+++ b/.github/workflows/common_library_tests.yaml
@@ -105,8 +105,8 @@ jobs:
           - job-values.yaml
           - cronjob-values.yaml
           - statefulset-values.yaml
+          - persistence-values.yaml
           # - extra-containers-values.yaml
-          # - persistence-values.yaml
           # - rbac-values.yaml
 
     steps:
diff --git a/library/common-test/ci/basic-values.yaml b/library/common-test/ci/basic-values.yaml
index da9d445d39..bfcecb7563 100644
--- a/library/common-test/ci/basic-values.yaml
+++ b/library/common-test/ci/basic-values.yaml
@@ -12,6 +12,9 @@ service:
 
 workload:
   main:
+    enabled: true
+    primary: true
+    type: Deployment
     podSpec:
       containers:
         main:
diff --git a/library/common-test/ci/configmap-values.yaml b/library/common-test/ci/configmap-values.yaml
index 9f7ca0ad49..b51dc997a1 100644
--- a/library/common-test/ci/configmap-values.yaml
+++ b/library/common-test/ci/configmap-values.yaml
@@ -12,6 +12,9 @@ service:
 
 workload:
   main:
+    enabled: true
+    primary: true
+    type: Deployment
     podSpec:
       containers:
         main:
diff --git a/library/common-test/ci/cron-values.yaml b/library/common-test/ci/cron-values.yaml
index 5bc91cebc4..4b3c63289e 100644
--- a/library/common-test/ci/cron-values.yaml
+++ b/library/common-test/ci/cron-values.yaml
@@ -13,7 +13,9 @@ service:
 workload:
   main:
     type: CronJob
+    schedule: "*/1 * * * *"
     podSpec:
+      restartPolicy: OnFailure
       containers:
         main:
           args:
diff --git a/library/common-test/ci/daemonset-values.yaml b/library/common-test/ci/daemonset-values.yaml
index 76db296fc1..24f1419882 100644
--- a/library/common-test/ci/daemonset-values.yaml
+++ b/library/common-test/ci/daemonset-values.yaml
@@ -12,6 +12,8 @@ service:
 
 workload:
   main:
+    enabled: true
+    primary: true
     type: DaemonSet
     podSpec:
       containers:
diff --git a/library/common-test/ci/imagePullSecret-values.yaml b/library/common-test/ci/imagePullSecret-values.yaml
index 56532a071c..5f6b444553 100644
--- a/library/common-test/ci/imagePullSecret-values.yaml
+++ b/library/common-test/ci/imagePullSecret-values.yaml
@@ -12,6 +12,9 @@ service:
 
 workload:
   main:
+    enabled: true
+    primary: true
+    type: Deployment
     podSpec:
       containers:
         main:
diff --git a/library/common-test/ci/job-values.yaml b/library/common-test/ci/job-values.yaml
index 344e647425..9e06fd8c0e 100644
--- a/library/common-test/ci/job-values.yaml
+++ b/library/common-test/ci/job-values.yaml
@@ -14,6 +14,7 @@ workload:
   main:
     type: Job
     podSpec:
+      restartPolicy: Never
       containers:
         main:
           args:
diff --git a/.to_be_deleted/common-test/ci/persistence-values.yaml b/library/common-test/ci/persistence-values.yaml
similarity index 72%
rename from .to_be_deleted/common-test/ci/persistence-values.yaml
rename to library/common-test/ci/persistence-values.yaml
index 73f5972456..cfaaf89303 100644
--- a/.to_be_deleted/common-test/ci/persistence-values.yaml
+++ b/library/common-test/ci/persistence-values.yaml
@@ -1,7 +1,7 @@
 image:
-  repository: traefik/whoami
+  repository: tccr.io/truecharts/whoami
   pullPolicy: IfNotPresent
-  tag: latest
+  tag: 1.8.7@sha256:8c61f0ca92fd806fcb4ed1465cb793c05443f37951554b105b0f2dc686a95772
 
 service:
   main:
@@ -9,22 +9,30 @@ service:
       main:
         port: 8080
 
-controllers:
+workload:
   main:
-    pod:
+    enabled: true
+    primary: true
+    type: Deployment
+    podSpec:
       containers:
         main:
           args:
             - --port
-            - '8080'
-
+            - "8080"
           probes:
             liveness:
               enabled: true
+              type: http
+              port: "{{ .Values.service.main.ports.main.port }}"
             readiness:
               enabled: true
+              type: http
+              port: "{{ .Values.service.main.ports.main.port }}"
             startup:
               enabled: true
+              type: http
+              port: "{{ .Values.service.main.ports.main.port }}"
 
 persistence:
   pvc-stock:
@@ -38,12 +46,6 @@ persistence:
     mountPath: /pvcsize
     size: 1Gi
 
-  pvc-forcedname:
-    enabled: true
-    type: pvc
-    forceName: "testname"
-    mountPath: /pvcfn
-
   pvc-readonly:
     enabled: true
     type: pvc
@@ -64,13 +66,6 @@ persistence:
     readOnly: false
     storageClass: ""
 
-  pvc-auto:
-    enabled: true
-    setPermissions: true
-    type: pvc
-    mountPath: /autotest
-    readOnly: false
-
   emptydir:
     enabled: true
     type: emptyDir
@@ -86,14 +81,14 @@ persistence:
     enabled: true
     type: emptyDir
     mountPath: /emptydirsize
-    sizeLimit: 1Gi
+    size: 1Gi
 
   emptydir-memsize:
     enabled: true
     type: emptyDir
     mountPath: /emptydirmemsize
     medium: Memory
-    sizeLimit: 1Gi
+    size: 1Gi
 
   hostpath-stock:
     enabled: true
diff --git a/library/common-test/ci/secret-values.yaml b/library/common-test/ci/secret-values.yaml
index 7eea8ee94b..20f7094a3e 100644
--- a/library/common-test/ci/secret-values.yaml
+++ b/library/common-test/ci/secret-values.yaml
@@ -12,6 +12,9 @@ service:
 
 workload:
   main:
+    enabled: true
+    primary: true
+    type: Deployment
     podSpec:
       containers:
         main:
diff --git a/library/common-test/ci/statefulset-values.yaml b/library/common-test/ci/statefulset-values.yaml
index 76db296fc1..24f1419882 100644
--- a/library/common-test/ci/statefulset-values.yaml
+++ b/library/common-test/ci/statefulset-values.yaml
@@ -12,6 +12,8 @@ service:
 
 workload:
   main:
+    enabled: true
+    primary: true
     type: DaemonSet
     podSpec:
       containers:
diff --git a/library/common/1.0.0/templates/spawner/_workload.tpl b/library/common/1.0.0/templates/spawner/_workload.tpl
index a05c0e0dd7..ef971417b2 100644
--- a/library/common/1.0.0/templates/spawner/_workload.tpl
+++ b/library/common/1.0.0/templates/spawner/_workload.tpl
@@ -33,7 +33,7 @@
 
       {{/* Set the podSpec so it doesn't fail on nil pointer */}}
       {{- if not (hasKey $objectData "podSpec") -}}
-        {{- fail "Workload - Expeced <podSpec> key to exist" -}}
+        {{- fail "Workload - Expected <podSpec> key to exist" -}}
       {{- end -}}
 
       {{/* Call class to create the object */}}