diff --git a/library/common/1.0.0/templates/lib/container/_security.tpl b/library/common/1.0.0/templates/lib/container/_security.tpl
index 0aee3cecc8..5dd32d801f 100644
--- a/library/common/1.0.0/templates/lib/container/_security.tpl
+++ b/library/common/1.0.0/templates/lib/container/_security.tpl
@@ -23,7 +23,7 @@ The reason is not splitted, is that on one of the places needs a combo of all va
 
   {{- if and $secCont.inherit (not $isMainContainer) -}} {{/* if inherit is set, overwrite values from mainContainer */}}
     {{- if (hasKey $root.Values "securityContext") -}}
-      {{- $returnValue = mustMergeOverwrite $returnValue $root.Values.controllers.main.pod.containers.main.securityContext -}}
+      {{- $returnValue = mustMergeOverwrite $returnValue ($root.Values.controllers.main.pod.containers.main.securityContext | default $root.Values.securityContext) -}}
     {{- end -}}
   {{- end -}}
 
diff --git a/library/common/1.0.0/templates/lib/pod/_extraContainers.tpl b/library/common/1.0.0/templates/lib/pod/_extraContainers.tpl
index ed91a78c26..4c28d8146e 100644
--- a/library/common/1.0.0/templates/lib/pod/_extraContainers.tpl
+++ b/library/common/1.0.0/templates/lib/pod/_extraContainers.tpl
@@ -64,7 +64,7 @@
                                                             "envList" $container.envList
                                                             "containerName" $name
                                                             "isMainContainer" false
-                                                            "scaleGPU" $root.Values.scaleGPU
+                                                            "scaleGPU" ($root.Values.scaleGPU | default $container.scaleGPU)
                                                             "nvidiaCaps" $container.nvidiaCaps
                                                             "secCont" $container.securityContext
                                                             "secEnvs" $secEnvs