diff --git a/.to_be_deleted/common-test/ci/configmap-values.yaml b/.to_be_deleted/common-test/ci/configmap-values.yaml
deleted file mode 100644
index ac70a8044f..0000000000
--- a/.to_be_deleted/common-test/ci/configmap-values.yaml
+++ /dev/null
@@ -1,59 +0,0 @@
-image:
-  repository: traefik/whoami
-  pullPolicy: IfNotPresent
-  tag: latest
-
-service:
-  main:
-    ports:
-      main:
-        protocol: HTTP
-        port: 8080
-controllers:
-  main:
-    pod:
-      containers:
-        main:
-          args:
-            - --port
-            - "8080"
-
-          probes:
-            liveness:
-              enabled: true
-            readiness:
-              enabled: true
-            startup:
-              enabled: true
-
-k1: value1
-k2: 80
-k3: pair
-k4: value2
-k5: 81
-k6: false
-configmap:
-  envparsetest:
-    enabled: true
-    parseAsEnv: true
-    content:
-      key1: 123
-      key2: value2
-  kvtest:
-    enabled: true
-    content:
-      key: "{{ .Values.k6 }}"
-
-  filetest:
-    enabled: true
-    content:
-      nginx.conf2: |
-        alias {{ .Values.k4 }}
-        listen {{ .Values.k5 }}
-        function {
-          # some json
-          "key": {
-            "key2": "value",
-            "key3": "value2"
-          }
-        }
diff --git a/.to_be_deleted/common-test/ci/secrets-values.yaml b/.to_be_deleted/common-test/ci/secrets-values.yaml
deleted file mode 100644
index cd883e3ae0..0000000000
--- a/.to_be_deleted/common-test/ci/secrets-values.yaml
+++ /dev/null
@@ -1,60 +0,0 @@
-image:
-  repository: traefik/whoami
-  pullPolicy: IfNotPresent
-  tag: latest
-
-service:
-  main:
-    ports:
-      main:
-        protocol: HTTP
-        port: 8080
-
-controllers:
-  main:
-    pod:
-      containers:
-        main:
-          args:
-            - --port
-            - "8080"
-
-          probes:
-            liveness:
-              enabled: true
-            readiness:
-              enabled: true
-            startup:
-              enabled: true
-
-k1: value1
-k2: 80
-k3: pair
-k4: value2
-k5: 81
-k6: false
-secret:
-  envparsetest:
-    enabled: true
-    parseAsEnv: true
-    content:
-      key1: 123
-      key2: value2
-  kvtest:
-    enabled: true
-    content:
-      key: "{{ .Values.k6 }}"
-
-  filetest:
-    enabled: true
-    content:
-      nginx.conf2: |
-        alias {{ .Values.k4 }}
-        listen {{ .Values.k5 }}
-        function {
-          # some json
-          "key": {
-            "key2": "value",
-            "key3": "value2"
-          }
-        }
diff --git a/library/common-test/ci/configmap-values.yaml b/library/common-test/ci/configmap-values.yaml
index a42c709568..645b8017b7 100644
--- a/library/common-test/ci/configmap-values.yaml
+++ b/library/common-test/ci/configmap-values.yaml
@@ -33,6 +33,10 @@ key4: value2
 key5: 81
 key6: false
 
+envFrom:
+  - configMapRef:
+      name: kv-test
+
 configmap:
   kv-test:
     enabled: true
diff --git a/library/common-test/ci/imagePullSecret-values.yaml b/library/common-test/ci/imagePullSecret-values.yaml
index a0e8b8dcf8..ebcd63bc5b 100644
--- a/library/common-test/ci/imagePullSecret-values.yaml
+++ b/library/common-test/ci/imagePullSecret-values.yaml
@@ -41,5 +41,3 @@ imagePullSecret:
       username: "{{ .Values.user }}"
       password: "{{ .Values.pass }}"
       email: "{{ .Values.email }}"
-    # TODO: Add support for targetSelector
-    # targetSelector: all
diff --git a/library/common-test/ci/secret-values.yaml b/library/common-test/ci/secret-values.yaml
index ab4c3db282..5e220a2063 100644
--- a/library/common-test/ci/secret-values.yaml
+++ b/library/common-test/ci/secret-values.yaml
@@ -33,6 +33,10 @@ key4: value2
 key5: 81
 key6: false
 
+envFrom:
+  - secretRef:
+      name: kv-test
+
 secret:
   kv-test:
     enabled: true
diff --git a/library/common/1.0.0/values.yaml b/library/common/1.0.0/values.yaml
index b8677c5a3a..73791fbc3a 100644
--- a/library/common/1.0.0/values.yaml
+++ b/library/common/1.0.0/values.yaml
@@ -173,8 +173,7 @@ workload:
 # TODO:
 portal: {}
 
-
-# -- SCALE GPU (TODO: Only the resources part is left)
+# -- SCALE GPU (TODO: Only the resources/targetSelector part is left)
 scaleGPU:
   - gpu:
       key: value
@@ -186,6 +185,20 @@ scaleGPU:
 
 ##### ⬇ Done ⬇ #####
 
+# -- Timezone used everywhere applicable
+TIMEZONE: UTC
+
+# -- (docs/service/README.md)
+service:
+  main:
+    enabled: true
+    primary: true
+    ports:
+      main:
+        enabled: true
+        primary: true
+        protocol: HTTP
+
 # -- (docs/persistence/README.md)
 persistence:
   shared:
@@ -209,20 +222,6 @@ persistence:
     mountPath: /dev/shm
     targetSelectAll: true
 
-# -- (docs/service/README.md)
-service:
-  main:
-    enabled: true
-    primary: true
-    ports:
-      main:
-        enabled: true
-        primary: true
-        protocol: HTTP
-
-# -- Timezone used everywhere applicable
-TIMEZONE: UTC
-
 # -- Injected from SCALE middleware
 # Only for reference here
 ixExternalInterfacesConfiguration: []