diff --git a/library/common-test/tests/deployment/runtimeClass_test.yaml b/library/common-test/tests/deployment/runtimeClass_test.yaml
new file mode 100644
index 0000000000..03bb561563
--- /dev/null
+++ b/library/common-test/tests/deployment/runtimeClass_test.yaml
@@ -0,0 +1,70 @@
+suite: deployment runtimeClassName test
+templates:
+  - common.yaml
+tests:
+  - it: should pass with default values
+    documentIndex: &deploymentDoc 0
+    asserts:
+      - hasDocuments:
+          count: 3
+      - isKind:
+          of: Deployment
+      - isNull:
+          path: spec.template.spec.runtimeClassName
+
+  - it: should pass with addNvidiaRuntimeClass and nvidiaRuntimeClassName set
+    documentIndex: *deploymentDoc
+    set:
+      global:
+        ixChartContext:
+          addNvidiaRuntimeClass: true
+          nvidiaRuntimeClassName: something
+    asserts:
+      - equal:
+          path: spec.template.spec.runtimeClassName
+          value: something
+
+  - it: should pass overriding global and per pod runtime
+    documentIndex: *deploymentDoc
+    set:
+      runtimeClassName: perpod
+      global:
+        defaults:
+          runtimeClassName: global
+        ixChartContext:
+          addNvidiaRuntimeClass: true
+          nvidiaRuntimeClassName: something
+    asserts:
+      - equal:
+          path: spec.template.spec.runtimeClassName
+          value: something
+
+  - it: should pass with nvidiaRuntimeClassName set
+    documentIndex: *deploymentDoc
+    set:
+      global:
+        ixChartContext:
+          nvidiaRuntimeClassName: something
+    asserts:
+      - isNull:
+          path: spec.template.spec.runtimeClassName
+
+  - it: should pass with global runtime set
+    documentIndex: *deploymentDoc
+    set:
+      global:
+        defaults:
+          runtimeClassName: something
+    asserts:
+      - equal:
+          path: spec.template.spec.runtimeClassName
+          value: something
+
+  - it: should pass with pod runtime set
+    documentIndex: *deploymentDoc
+    set:
+      runtimeClassName: something
+    asserts:
+      - equal:
+          path: spec.template.spec.runtimeClassName
+          value: something
diff --git a/library/common-test/tests/deployment/various_options_test.yaml b/library/common-test/tests/deployment/various_options_test.yaml
index ee62bf2313..6806637f41 100644
--- a/library/common-test/tests/deployment/various_options_test.yaml
+++ b/library/common-test/tests/deployment/various_options_test.yaml
@@ -1,4 +1,3 @@
-
 suite: deployment various options test
 templates:
   - common.yaml
@@ -13,48 +12,6 @@ tests:
       - isNull:
           path: spec.template.spec.runtimeClassName
 
-  - it: should pass with addNvidiaRuntimeClass and nvidiaRuntimeClassName set
-    documentIndex: *deploymentDoc
-    set:
-      global:
-        ixChartContext:
-          addNvidiaRuntimeClass: true
-          nvidiaRuntimeClassName: something
-    asserts:
-      - equal:
-          path: spec.template.spec.runtimeClassName
-          value: something
-
-  - it: should pass with nvidiaRuntimeClassName set
-    documentIndex: *deploymentDoc
-    set:
-      global:
-        ixChartContext:
-          nvidiaRuntimeClassName: something
-    asserts:
-      - isNull:
-          path: spec.template.spec.runtimeClassName
-
-  - it: should pass with global runtime set
-    documentIndex: *deploymentDoc
-    set:
-      global:
-        defaults:
-          runtimeClassName: something
-    asserts:
-      - equal:
-          path: spec.template.spec.runtimeClassName
-          value: something
-
-  - it: should pass with pod runtime set
-    documentIndex: *deploymentDoc
-    set:
-      runtimeClassName: something
-    asserts:
-      - equal:
-          path: spec.template.spec.runtimeClassName
-          value: something
-
   - it: should pass with gracePeriodSeconds set
     documentIndex: *deploymentDoc
     set:
diff --git a/library/common/1.0.0/templates/lib/pod/_runtimeClassName.tpl b/library/common/1.0.0/templates/lib/pod/_runtimeClassName.tpl
index 068d67639c..46ce72f9fa 100644
--- a/library/common/1.0.0/templates/lib/pod/_runtimeClassName.tpl
+++ b/library/common/1.0.0/templates/lib/pod/_runtimeClassName.tpl
@@ -10,7 +10,7 @@
 
   {{/* Override previous if a runtime is passed from the pod */}}
   {{- with $runtime -}}
-    {{- $runtimeName := . -}}
+    {{- $runtimeName = . -}}
   {{- end -}}
 
  {{/* Override all previous if running in Scale and it's defined */}}