diff --git a/.github/workflows/common_library_tests.yaml b/.github/workflows/common_library_tests.yaml
index 193ed9e4f4..074a297b7c 100644
--- a/.github/workflows/common_library_tests.yaml
+++ b/.github/workflows/common_library_tests.yaml
@@ -103,7 +103,7 @@ jobs:
           - imagePullSecret-values.yaml
           - daemonset-values.yaml
           - job-values.yaml
-          - cronjob-values.yaml
+          - cron-values.yaml
           - statefulset-values.yaml
           - persistence-values.yaml
           # - extra-containers-values.yaml
diff --git a/library/common-test/tests/certificate/metadata_test.yaml b/library/common-test/tests/certificate/metadata_test.yaml
index bf95e5107c..c32961e90e 100644
--- a/library/common-test/tests/certificate/metadata_test.yaml
+++ b/library/common-test/tests/certificate/metadata_test.yaml
@@ -49,7 +49,7 @@ tests:
           value:
             app: common-test-1.0.0
             release: RELEASE-NAME
-            helm-revision: 0
+            helm-revision: "0"
             helm.sh/chart: common-test-1.0.0
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/version: *appVer
diff --git a/library/common-test/tests/configmap/metadata_test.yaml b/library/common-test/tests/configmap/metadata_test.yaml
index c171750a22..39959f8226 100644
--- a/library/common-test/tests/configmap/metadata_test.yaml
+++ b/library/common-test/tests/configmap/metadata_test.yaml
@@ -46,7 +46,7 @@ tests:
           value:
             app: common-test-1.0.0
             release: RELEASE-NAME
-            helm-revision: 0
+            helm-revision: "0"
             helm.sh/chart: common-test-1.0.0
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/version: *appVer
diff --git a/library/common-test/tests/cronjob/metadata_test.yaml b/library/common-test/tests/cronjob/metadata_test.yaml
index e033e99640..c58d505a32 100644
--- a/library/common-test/tests/cronjob/metadata_test.yaml
+++ b/library/common-test/tests/cronjob/metadata_test.yaml
@@ -54,7 +54,7 @@ tests:
           value:
             app: common-test-1.0.0
             release: RELEASE-NAME
-            helm-revision: 0
+            helm-revision: "0"
             helm.sh/chart: common-test-1.0.0
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/version: *appVer
@@ -80,7 +80,7 @@ tests:
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: common-test
             app.kubernetes.io/version: v9.9.9
-            helm-revision: 0
+            helm-revision: "0"
             helm.sh/chart: common-test-1.0.0
             g_label1: global_label1
             g_label2: global_label2
diff --git a/library/common-test/tests/daemonset/metadata_test.yaml b/library/common-test/tests/daemonset/metadata_test.yaml
index c58b56bda4..7ed09b791a 100644
--- a/library/common-test/tests/daemonset/metadata_test.yaml
+++ b/library/common-test/tests/daemonset/metadata_test.yaml
@@ -53,7 +53,7 @@ tests:
           value:
             app: common-test-1.0.0
             release: RELEASE-NAME
-            helm-revision: 0
+            helm-revision: "0"
             helm.sh/chart: common-test-1.0.0
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/version: *appVer
@@ -79,7 +79,7 @@ tests:
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: common-test
             app.kubernetes.io/version: v9.9.9
-            helm-revision: 0
+            helm-revision: "0"
             helm.sh/chart: common-test-1.0.0
             g_label1: global_label1
             g_label2: global_label2
diff --git a/library/common-test/tests/deployment/metadata_test.yaml b/library/common-test/tests/deployment/metadata_test.yaml
index 71e00df6b0..50110ded51 100644
--- a/library/common-test/tests/deployment/metadata_test.yaml
+++ b/library/common-test/tests/deployment/metadata_test.yaml
@@ -53,7 +53,7 @@ tests:
           value:
             app: common-test-1.0.0
             release: RELEASE-NAME
-            helm-revision: 0
+            helm-revision: "0"
             helm.sh/chart: common-test-1.0.0
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/version: *appVer
@@ -79,7 +79,7 @@ tests:
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: common-test
             app.kubernetes.io/version: v9.9.9
-            helm-revision: 0
+            helm-revision: "0"
             helm.sh/chart: common-test-1.0.0
             g_label1: global_label1
             g_label2: global_label2
diff --git a/library/common-test/tests/imagePullSecret/metadata_test.yaml b/library/common-test/tests/imagePullSecret/metadata_test.yaml
index a23244265b..21f60282bf 100644
--- a/library/common-test/tests/imagePullSecret/metadata_test.yaml
+++ b/library/common-test/tests/imagePullSecret/metadata_test.yaml
@@ -49,7 +49,7 @@ tests:
           value:
             app: common-test-1.0.0
             release: RELEASE-NAME
-            helm-revision: 0
+            helm-revision: "0"
             helm.sh/chart: common-test-1.0.0
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/version: *appVer
diff --git a/library/common-test/tests/job/metadata_test.yaml b/library/common-test/tests/job/metadata_test.yaml
index a60deaae3a..aa9ca6d6f4 100644
--- a/library/common-test/tests/job/metadata_test.yaml
+++ b/library/common-test/tests/job/metadata_test.yaml
@@ -53,7 +53,7 @@ tests:
           value:
             app: common-test-1.0.0
             release: RELEASE-NAME
-            helm-revision: 0
+            helm-revision: "0"
             helm.sh/chart: common-test-1.0.0
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/version: *appVer
@@ -79,7 +79,7 @@ tests:
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: common-test
             app.kubernetes.io/version: v9.9.9
-            helm-revision: 0
+            helm-revision: "0"
             helm.sh/chart: common-test-1.0.0
             g_label1: global_label1
             g_label2: global_label2
diff --git a/library/common-test/tests/persistence/metadata_test.yaml b/library/common-test/tests/persistence/metadata_test.yaml
index b695de1063..4853e613e3 100644
--- a/library/common-test/tests/persistence/metadata_test.yaml
+++ b/library/common-test/tests/persistence/metadata_test.yaml
@@ -48,7 +48,7 @@ tests:
           value:
             app: common-test-1.0.0
             release: RELEASE-NAME
-            helm-revision: 0
+            helm-revision: "0"
             helm.sh/chart: common-test-1.0.0
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/version: *appVer
@@ -79,7 +79,7 @@ tests:
           value:
             app: common-test-1.0.0
             release: RELEASE-NAME
-            helm-revision: 0
+            helm-revision: "0"
             helm.sh/chart: common-test-1.0.0
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/version: *appVer
diff --git a/library/common-test/tests/rbac/metadata_test.yaml b/library/common-test/tests/rbac/metadata_test.yaml
index 6c8af8c353..04bdd573dd 100644
--- a/library/common-test/tests/rbac/metadata_test.yaml
+++ b/library/common-test/tests/rbac/metadata_test.yaml
@@ -78,7 +78,7 @@ tests:
           value:
             app: common-test-1.0.0
             release: RELEASE-NAME
-            helm-revision: 0
+            helm-revision: "0"
             helm.sh/chart: common-test-1.0.0
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/version: *appVer
@@ -103,7 +103,7 @@ tests:
           value:
             app: common-test-1.0.0
             release: RELEASE-NAME
-            helm-revision: 0
+            helm-revision: "0"
             helm.sh/chart: common-test-1.0.0
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/version: *appVer
@@ -128,7 +128,7 @@ tests:
           value:
             app: common-test-1.0.0
             release: RELEASE-NAME
-            helm-revision: 0
+            helm-revision: "0"
             helm.sh/chart: common-test-1.0.0
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/version: *appVer
@@ -153,7 +153,7 @@ tests:
           value:
             app: common-test-1.0.0
             release: RELEASE-NAME
-            helm-revision: 0
+            helm-revision: "0"
             helm.sh/chart: common-test-1.0.0
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/version: *appVer
diff --git a/library/common-test/tests/secret/metadata_test.yaml b/library/common-test/tests/secret/metadata_test.yaml
index 6ec6099825..9a6e23f18d 100644
--- a/library/common-test/tests/secret/metadata_test.yaml
+++ b/library/common-test/tests/secret/metadata_test.yaml
@@ -46,7 +46,7 @@ tests:
           value:
             app: common-test-1.0.0
             release: RELEASE-NAME
-            helm-revision: 0
+            helm-revision: "0"
             helm.sh/chart: common-test-1.0.0
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/version: *appVer
diff --git a/library/common-test/tests/service/external_ip_test.yaml b/library/common-test/tests/service/external_ip_test.yaml
index 71dee3c157..41a69e001c 100644
--- a/library/common-test/tests/service/external_ip_test.yaml
+++ b/library/common-test/tests/service/external_ip_test.yaml
@@ -117,7 +117,7 @@ tests:
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/version: *appVer
             helm.sh/chart: common-test-1.0.0
-            helm-revision: 0
+            helm-revision: "0"
             app: common-test-1.0.0
             release: RELEASE-NAME
       - documentIndex: *endpointSliceDoc
diff --git a/library/common-test/tests/service/metadata_test.yaml b/library/common-test/tests/service/metadata_test.yaml
index a7a16f2374..e50c556429 100644
--- a/library/common-test/tests/service/metadata_test.yaml
+++ b/library/common-test/tests/service/metadata_test.yaml
@@ -64,7 +64,7 @@ tests:
           value:
             app: common-test-1.0.0
             release: RELEASE-NAME
-            helm-revision: 0
+            helm-revision: "0"
             helm.sh/chart: common-test-1.0.0
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/version: *appVer
@@ -90,7 +90,7 @@ tests:
             app.kubernetes.io/version: *appVer
             g_label1: global_label1
             g_label2: global_label2
-            helm-revision: 0
+            helm-revision: "0"
             helm.sh/chart: common-test-1.0.0
             release: RELEASE-NAME
 
diff --git a/library/common-test/tests/serviceAccount/metadata_test.yaml b/library/common-test/tests/serviceAccount/metadata_test.yaml
index f827c4ff66..deeb8b22bf 100644
--- a/library/common-test/tests/serviceAccount/metadata_test.yaml
+++ b/library/common-test/tests/serviceAccount/metadata_test.yaml
@@ -45,7 +45,7 @@ tests:
           value:
             app: common-test-1.0.0
             release: RELEASE-NAME
-            helm-revision: 0
+            helm-revision: "0"
             helm.sh/chart: common-test-1.0.0
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/version: *appVer
diff --git a/library/common-test/tests/statefulset/metadata_test.yaml b/library/common-test/tests/statefulset/metadata_test.yaml
index f47b9b4d10..f344be03dc 100644
--- a/library/common-test/tests/statefulset/metadata_test.yaml
+++ b/library/common-test/tests/statefulset/metadata_test.yaml
@@ -53,7 +53,7 @@ tests:
           value:
             app: common-test-1.0.0
             release: RELEASE-NAME
-            helm-revision: 0
+            helm-revision: "0"
             helm.sh/chart: common-test-1.0.0
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/version: *appVer
@@ -79,7 +79,7 @@ tests:
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: common-test
             app.kubernetes.io/version: v9.9.9
-            helm-revision: 0
+            helm-revision: "0"
             helm.sh/chart: common-test-1.0.0
             g_label1: global_label1
             g_label2: global_label2
diff --git a/library/common-test/tests/volumeClaimTemplate/metadata_test.yaml b/library/common-test/tests/volumeClaimTemplate/metadata_test.yaml
index ded66d47ec..80d1d0ea89 100644
--- a/library/common-test/tests/volumeClaimTemplate/metadata_test.yaml
+++ b/library/common-test/tests/volumeClaimTemplate/metadata_test.yaml
@@ -53,7 +53,7 @@ tests:
           value:
             app: common-test-1.0.0
             release: RELEASE-NAME
-            helm-revision: 0
+            helm-revision: "0"
             helm.sh/chart: common-test-1.0.0
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/version: *appVer
diff --git a/library/common/1.0.0/templates/lib/metadata/_render.tpl b/library/common/1.0.0/templates/lib/metadata/_render.tpl
index 340396e282..842466f5af 100644
--- a/library/common/1.0.0/templates/lib/metadata/_render.tpl
+++ b/library/common/1.0.0/templates/lib/metadata/_render.tpl
@@ -12,7 +12,7 @@
   {{- with $labels -}}
     {{- range $k, $v := . -}}
       {{- if and $k $v }}
-{{ $k }}: {{ tpl $v $rootCtx }}
+{{ $k }}: {{ tpl $v $rootCtx | quote }}
       {{- end -}}
     {{- end -}}
   {{- end -}}
@@ -20,7 +20,7 @@
   {{- with $annotations -}}
     {{- range $k, $v := . -}}
       {{- if and $k $v }}
-{{ $k }}: {{ tpl $v $rootCtx }}
+{{ $k }}: {{ tpl $v $rootCtx | quote }}
       {{- end -}}
     {{- end -}}
   {{- end -}}