diff --git a/library/common-test/tests/deployment/default_test.yaml b/library/common-test/tests/deployment/default_test.yaml
index 861cf8d154..2793294104 100644
--- a/library/common-test/tests/deployment/default_test.yaml
+++ b/library/common-test/tests/deployment/default_test.yaml
@@ -83,9 +83,9 @@ tests:
             - name: TZ
               value: UTC
             - name: UMASK
-              value: "2"
+              value: "002"
             - name: UMASK_SET
-              value: "2"
+              value: "002"
             - name: NVIDIA_VISIBLE_DEVICES
               value: void
             - name: S6_READ_ONLY_ROOT
diff --git a/library/common/1.0.0/templates/lib/container/env/_fixedEnvs.tpl b/library/common/1.0.0/templates/lib/container/env/_fixedEnvs.tpl
index c6286a9bc6..8986f7ac7f 100644
--- a/library/common/1.0.0/templates/lib/container/env/_fixedEnvs.tpl
+++ b/library/common/1.0.0/templates/lib/container/env/_fixedEnvs.tpl
@@ -77,6 +77,7 @@ will be parsed correctly without causing errors.
     {{- end -}}
   {{- end -}}
 
+  {{/* TODO: Extract this checks into a function, but instead of returning the value, just print it (Test how it works with bools/ints) */}}
   {{- if (hasKey $security "PUID") -}}
     {{- if eq (toString $security.PUID) "<nil>" -}}
       {{- fail (printf "<PUID> key cannot be empty. Set a value or remove the key for the default (%v) to take effect." $PUID) -}}
@@ -89,6 +90,7 @@ will be parsed correctly without causing errors.
 
   {{- $vars := list -}}
   {{/* TODO: container aware NVIDIA Caps*/}}
+  {{/* TODO: Convert this to yaml directly */}}
   {{- $vars = mustAppend $vars (dict "name" "TZ" "value" (tpl (toYaml $root.Values.TZ) $root)) -}}
   {{- $vars = mustAppend $vars (dict "name" "UMASK" "value" $UMASK) -}}
   {{- $vars = mustAppend $vars (dict "name" "UMASK_SET" "value" $UMASK) -}}