diff --git a/charts/physims/charts/dlsim.100rb+tm2/templates/job.yaml b/charts/physims/charts/dlsim.100rb+tm2/templates/job.yaml
index 03a0813d794b1679c9599575da6821a9600a7b68..28d34037e643f2053c573908c7773f098fbf6db8 100644
--- a/charts/physims/charts/dlsim.100rb+tm2/templates/job.yaml
+++ b/charts/physims/charts/dlsim.100rb+tm2/templates/job.yaml
@@ -4,6 +4,9 @@ metadata:
   name: {{ .Chart.Name }}
 spec:
   template:
+    metadata:
+      labels:
+        app: physim
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
diff --git a/charts/physims/charts/dlsim.100rb+tm2/values.yaml b/charts/physims/charts/dlsim.100rb+tm2/values.yaml
index 35614bc844d4f84547d83bb805ec95265eb1db7c..aae621bd84620641b3b86aa26f8c40d4145901eb 100644
--- a/charts/physims/charts/dlsim.100rb+tm2/values.yaml
+++ b/charts/physims/charts/dlsim.100rb+tm2/values.yaml
@@ -28,18 +28,6 @@ podSecurityContext:
 
 securityContext:
   privileged: false
-#  capabilities:
-#    add:
-#      - SYS_CAP_PTRACE
-  #   drop:
-  #   - ALL
-  # readOnlyRootFilesystem: true
-  # runAsNonRoot: true
-  # runAsUser: 1000
-
-service:
-  type: ClusterIP
-  port: 80
 
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious
diff --git a/charts/physims/charts/dlsim.basic/templates/job.yaml b/charts/physims/charts/dlsim.basic/templates/job.yaml
index 4edd9a5f2ff05854a896c97b63e98e3a8e0b68c0..405f20e7ffeed48d15d116fe783acd18629aae02 100644
--- a/charts/physims/charts/dlsim.basic/templates/job.yaml
+++ b/charts/physims/charts/dlsim.basic/templates/job.yaml
@@ -1,9 +1,12 @@
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: {{ .Chart.Name }}
+  name: {{ .Chart.Name }}    
 spec:
   template:
+    metadata:
+      labels:
+         app: physim
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
@@ -15,13 +18,6 @@ spec:
       - name: physim
         image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
-#        resources:
-#          requests:
-#            memory: "4096Mi"
-#            cpu: "4000m"
-#          limits:
-#            memory: "4096Mi"
-#            cpu: "4000m"
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
         env:
@@ -35,5 +31,5 @@ spec:
       dnsPolicy: ClusterFirst
       restartPolicy: Never
       schedulerName: default-scheduler
-      serviceAccountName: oai-physim-sa 
+      serviceAccountName: {{ .Values.global.serviceAccountName }} 
       terminationGracePeriodSeconds: 30
diff --git a/charts/physims/charts/dlsim.basic/values.yaml b/charts/physims/charts/dlsim.basic/values.yaml
index 91b9eed407e15b26e74b43189e633ef0569e148d..2150e27daf39202dd28b812ed04d461340acd54d 100644
--- a/charts/physims/charts/dlsim.basic/values.yaml
+++ b/charts/physims/charts/dlsim.basic/values.yaml
@@ -20,7 +20,7 @@ serviceAccount:
   annotations: {}
   # The name of the service account to use.
   # If not set and create is true, a name is generated using the fullname template
-  name: "oai-physim-sa" #"oai-dlsim-basic"
+  name: "oai-dlsim-basic"
 
 podSecurityContext:
   runAsUser: 0
@@ -28,26 +28,14 @@ podSecurityContext:
 
 securityContext:
   privileged: false
-  #capabilities:
-  #  add:
-  #    - SYS_CAP_PTRACE
-  #   drop:
-  #   - ALL
-  # readOnlyRootFilesystem: true
-  # runAsNonRoot: true
-  # runAsUser: 1000
-
-service:
-  type: ClusterIP
-  port: 80
-
-resources:
-   limits:
-     cpu: 100m
-     memory: 128Mi
-   requests:
-     cpu: 100m
-     memory: 128Mi
+
+resources: {}
+   # limits:
+   #   cpu: 100m
+   #   memory: 128Mi
+   # requests:
+   #   cpu: 100m
+   #   memory: 128Mi
 
 nodeSelector: {}
 
diff --git a/charts/physims/charts/ldpctest/templates/job.yaml b/charts/physims/charts/ldpctest/templates/job.yaml
index 1d1dc2c886b93148c0940c7ecea99bdc143f74d1..0bb60fd2ce648efa841a0b1572b5bdd08f86df0e 100644
--- a/charts/physims/charts/ldpctest/templates/job.yaml
+++ b/charts/physims/charts/ldpctest/templates/job.yaml
@@ -4,6 +4,9 @@ metadata:
   name: {{ .Chart.Name }}
 spec:
   template:
+    metadata:
+      labels:
+        app: physim
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
diff --git a/charts/physims/charts/ldpctest/values.yaml b/charts/physims/charts/ldpctest/values.yaml
index 964878baadff9648015d704bb9a5e8302a918456..0ff1153a2c51e5bcca0583fe9a873340cd71f01b 100644
--- a/charts/physims/charts/ldpctest/values.yaml
+++ b/charts/physims/charts/ldpctest/values.yaml
@@ -28,18 +28,6 @@ podSecurityContext:
 
 securityContext:
   privileged: false
-#  capabilities:
-#    add:
-#      - SYS_CAP_PTRACE
-  #   drop:
-  #   - ALL
-  # readOnlyRootFilesystem: true
-  # runAsNonRoot: true
-  # runAsUser: 1000
-
-service:
-  type: ClusterIP
-  port: 80
 
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious
diff --git a/charts/physims/charts/nr-dlschsim/templates/job.yaml b/charts/physims/charts/nr-dlschsim/templates/job.yaml
index 9141c93644bf5810b66750f4bb1f565e87c1907a..47d152193eeae1edad143e748444cb695c058d20 100644
--- a/charts/physims/charts/nr-dlschsim/templates/job.yaml
+++ b/charts/physims/charts/nr-dlschsim/templates/job.yaml
@@ -4,6 +4,9 @@ metadata:
   name: {{ .Chart.Name }}
 spec:
   template:
+    metadata:
+      labels:
+        app: physim
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
diff --git a/charts/physims/charts/nr-dlschsim/values.yaml b/charts/physims/charts/nr-dlschsim/values.yaml
index 05b775444a8ebac4a96e1820c9f6c90418df14dc..a75437a0d681fc99e965755b0f1fe620a7a5c657 100644
--- a/charts/physims/charts/nr-dlschsim/values.yaml
+++ b/charts/physims/charts/nr-dlschsim/values.yaml
@@ -28,18 +28,6 @@ podSecurityContext:
 
 securityContext:
   privileged: false
-#  capabilities:
-#    add:
-#      - SYS_CAP_PTRACE
-  #   drop:
-  #   - ALL
-  # readOnlyRootFilesystem: true
-  # runAsNonRoot: true
-  # runAsUser: 1000
-
-service:
-  type: ClusterIP
-  port: 80
 
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious
diff --git a/charts/physims/charts/nr-dlsim.basic/templates/job.yaml b/charts/physims/charts/nr-dlsim.basic/templates/job.yaml
index b998f6f184663cd34cff7c7b933282810dfce54c..0688c278641069b8b85eac5090c7d0bee8e00a46 100644
--- a/charts/physims/charts/nr-dlsim.basic/templates/job.yaml
+++ b/charts/physims/charts/nr-dlsim.basic/templates/job.yaml
@@ -4,6 +4,9 @@ metadata:
   name: {{ .Chart.Name }}
 spec:
   template:
+    metadata:
+      labels:
+        app: physim
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
diff --git a/charts/physims/charts/nr-dlsim.basic/values.yaml b/charts/physims/charts/nr-dlsim.basic/values.yaml
index 4bd0f82294597cc60cf0cf8a25dff710ffab2b96..88e5a2caaa7e78aceb39b0c1a55fb97eca4c9484 100644
--- a/charts/physims/charts/nr-dlsim.basic/values.yaml
+++ b/charts/physims/charts/nr-dlsim.basic/values.yaml
@@ -28,18 +28,6 @@ podSecurityContext:
 
 securityContext:
   privileged: false
-#  capabilities:
-#    add:
-#      - SYS_CAP_PTRACE
-  #   drop:
-  #   - ALL
-  # readOnlyRootFilesystem: true
-  # runAsNonRoot: true
-  # runAsUser: 1000
-
-service:
-  type: ClusterIP
-  port: 80
 
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious
diff --git a/charts/physims/charts/nr-dlsim.dmrs+ptrs/templates/job.yaml b/charts/physims/charts/nr-dlsim.dmrs+ptrs/templates/job.yaml
index 4e4948c7c9fc1f9c45ef43ff8e3da221cdd9d4e6..edc248eb243dc2039bdc2d70fbc6816193dde35c 100644
--- a/charts/physims/charts/nr-dlsim.dmrs+ptrs/templates/job.yaml
+++ b/charts/physims/charts/nr-dlsim.dmrs+ptrs/templates/job.yaml
@@ -4,6 +4,9 @@ metadata:
   name: {{ .Chart.Name }}
 spec:
   template:
+    metadata:
+      labels:
+        app: physim
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
diff --git a/charts/physims/charts/nr-dlsim.dmrs+ptrs/values.yaml b/charts/physims/charts/nr-dlsim.dmrs+ptrs/values.yaml
index dffc4433980a7723ae5b0a3f5b30967b2ef9b8f6..357e6c2861730d47643170c67fc2a253be2be7d7 100644
--- a/charts/physims/charts/nr-dlsim.dmrs+ptrs/values.yaml
+++ b/charts/physims/charts/nr-dlsim.dmrs+ptrs/values.yaml
@@ -28,18 +28,6 @@ podSecurityContext:
 
 securityContext:
   privileged: false
-#  capabilities:
-#    add:
-#      - SYS_CAP_PTRACE
-  #   drop:
-  #   - ALL
-  # readOnlyRootFilesystem: true
-  # runAsNonRoot: true
-  # runAsUser: 1000
-
-service:
-  type: ClusterIP
-  port: 80
 
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious
diff --git a/charts/physims/charts/nr-dlsim.mcs+mimo/templates/job.yaml b/charts/physims/charts/nr-dlsim.mcs+mimo/templates/job.yaml
index ff8ec59352adc24870096a3e713fdc6f0f7f90c8..9a70a2d3cebc023a9185346e0e9238c1994ae802 100644
--- a/charts/physims/charts/nr-dlsim.mcs+mimo/templates/job.yaml
+++ b/charts/physims/charts/nr-dlsim.mcs+mimo/templates/job.yaml
@@ -4,6 +4,9 @@ metadata:
   name: {{ .Chart.Name }}
 spec:
   template:
+    metadata:
+      labels:
+        app: physim
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
diff --git a/charts/physims/charts/nr-dlsim.mcs+mimo/values.yaml b/charts/physims/charts/nr-dlsim.mcs+mimo/values.yaml
index 8c56f219b4bb8e0f957bd9ab1dbacc639b9cb232..5ef75a1672a5234c3c0fcf10d03b2afd1d041992 100644
--- a/charts/physims/charts/nr-dlsim.mcs+mimo/values.yaml
+++ b/charts/physims/charts/nr-dlsim.mcs+mimo/values.yaml
@@ -28,18 +28,6 @@ podSecurityContext:
 
 securityContext:
   privileged: false
-#  capabilities:
-#    add:
-#      - SYS_CAP_PTRACE
-  #   drop:
-  #   - ALL
-  # readOnlyRootFilesystem: true
-  # runAsNonRoot: true
-  # runAsUser: 1000
-
-service:
-  type: ClusterIP
-  port: 80
 
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious
diff --git a/charts/physims/charts/nr-dlsim.offset/templates/job.yaml b/charts/physims/charts/nr-dlsim.offset/templates/job.yaml
index 71a5f8854270b4461d98f72c289d42215b95d4d1..e5c0d65703d0ee728d2988bd7c59a088dff1e46c 100644
--- a/charts/physims/charts/nr-dlsim.offset/templates/job.yaml
+++ b/charts/physims/charts/nr-dlsim.offset/templates/job.yaml
@@ -4,6 +4,9 @@ metadata:
   name: {{ .Chart.Name }}
 spec:
   template:
+    metadata:
+      labels:
+        app: physim
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
diff --git a/charts/physims/charts/nr-dlsim.offset/values.yaml b/charts/physims/charts/nr-dlsim.offset/values.yaml
index 8de40ffcaa722c4cdcf9740b0950e25cc537fa2b..efef89ce4aac84cb9ce3d905ec381399a9766ab5 100644
--- a/charts/physims/charts/nr-dlsim.offset/values.yaml
+++ b/charts/physims/charts/nr-dlsim.offset/values.yaml
@@ -28,18 +28,6 @@ podSecurityContext:
 
 securityContext:
   privileged: false
-#  capabilities:
-#    add:
-#      - SYS_CAP_PTRACE
-  #   drop:
-  #   - ALL
-  # readOnlyRootFilesystem: true
-  # runAsNonRoot: true
-  # runAsUser: 1000
-
-service:
-  type: ClusterIP
-  port: 80
 
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious
diff --git a/charts/physims/charts/nr-pbchsim.106rb/templates/job.yaml b/charts/physims/charts/nr-pbchsim.106rb/templates/job.yaml
index 6b560eded2fcc6e8c6202bf3ac952da7182f9f04..9f974cc0f0c53a24244f8ae0689aca93290a5692 100644
--- a/charts/physims/charts/nr-pbchsim.106rb/templates/job.yaml
+++ b/charts/physims/charts/nr-pbchsim.106rb/templates/job.yaml
@@ -6,7 +6,7 @@ spec:
   template:
     metadata:
       labels:
-        {{- include "oai-nr-pbchsim-106rb.selectorLabels" . | nindent 8 }}
+        app: physim
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
diff --git a/charts/physims/charts/nr-pbchsim.106rb/values.yaml b/charts/physims/charts/nr-pbchsim.106rb/values.yaml
index fdeacbc96ec8f1867ec017d61d3e13cda6d90376..8f8104146a1c6adcfa31dd40147960bdc6517d53 100644
--- a/charts/physims/charts/nr-pbchsim.106rb/values.yaml
+++ b/charts/physims/charts/nr-pbchsim.106rb/values.yaml
@@ -28,18 +28,6 @@ podSecurityContext:
 
 securityContext:
   privileged: false
-#  capabilities:
-#    add:
-#      - SYS_CAP_PTRACE
-  #   drop:
-  #   - ALL
-  # readOnlyRootFilesystem: true
-  # runAsNonRoot: true
-  # runAsUser: 1000
-
-service:
-  type: ClusterIP
-  port: 80
 
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious
diff --git a/charts/physims/charts/nr-pbchsim.217rb/templates/job.yaml b/charts/physims/charts/nr-pbchsim.217rb/templates/job.yaml
index 7f6c11dd4365e231ed7c4e18466346fba72f2915..bc3770e70f86fb30fe4b8b0051c6965e598b1783 100644
--- a/charts/physims/charts/nr-pbchsim.217rb/templates/job.yaml
+++ b/charts/physims/charts/nr-pbchsim.217rb/templates/job.yaml
@@ -4,6 +4,9 @@ metadata:
   name: {{ .Chart.Name }}
 spec:
   template:
+    metadata:
+      labels:
+        app: physim
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
diff --git a/charts/physims/charts/nr-pbchsim.217rb/values.yaml b/charts/physims/charts/nr-pbchsim.217rb/values.yaml
index 325703f53da1435f4ce4cb9ed8f11a9996d0faae..96b3f860dff25389416130bfbfe26d4b3ae44829 100644
--- a/charts/physims/charts/nr-pbchsim.217rb/values.yaml
+++ b/charts/physims/charts/nr-pbchsim.217rb/values.yaml
@@ -28,18 +28,6 @@ podSecurityContext:
 
 securityContext:
   privileged: false
-#  capabilities:
-#    add:
-#      - SYS_CAP_PTRACE
-  #   drop:
-  #   - ALL
-  # readOnlyRootFilesystem: true
-  # runAsNonRoot: true
-  # runAsUser: 1000
-
-service:
-  type: ClusterIP
-  port: 80
 
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious
diff --git a/charts/physims/charts/nr-pbchsim.273rb/templates/job.yaml b/charts/physims/charts/nr-pbchsim.273rb/templates/job.yaml
index 5f16b06c1d947c29b6eef03a9e808ac9b4f26d24..e4e8dddcd08a8bc24b7a1a0df28093c32ea16e99 100644
--- a/charts/physims/charts/nr-pbchsim.273rb/templates/job.yaml
+++ b/charts/physims/charts/nr-pbchsim.273rb/templates/job.yaml
@@ -4,6 +4,9 @@ metadata:
   name: {{ .Chart.Name }}
 spec:
   template:
+    metadata:
+      labels:
+        app: physim
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
diff --git a/charts/physims/charts/nr-pbchsim.273rb/values.yaml b/charts/physims/charts/nr-pbchsim.273rb/values.yaml
index 529cedd5dc96fcffad3e5b990f7ad150807498d8..36b62e0146c04c704c353897b97bb3ac24754aed 100644
--- a/charts/physims/charts/nr-pbchsim.273rb/values.yaml
+++ b/charts/physims/charts/nr-pbchsim.273rb/values.yaml
@@ -28,18 +28,6 @@ podSecurityContext:
 
 securityContext:
   privileged: false
-#  capabilities:
-#    add:
-#      - SYS_CAP_PTRACE
-  #   drop:
-  #   - ALL
-  # readOnlyRootFilesystem: true
-  # runAsNonRoot: true
-  # runAsUser: 1000
-
-service:
-  type: ClusterIP
-  port: 80
 
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious
diff --git a/charts/physims/charts/nr-prachsim/templates/job.yaml b/charts/physims/charts/nr-prachsim/templates/job.yaml
index 2b366e365504029336a1bf696117df56204377eb..bfd5024ca67a22c84f92791d28e1f0a226f0f418 100644
--- a/charts/physims/charts/nr-prachsim/templates/job.yaml
+++ b/charts/physims/charts/nr-prachsim/templates/job.yaml
@@ -4,6 +4,9 @@ metadata:
   name: {{ .Chart.Name }}
 spec:
   template:
+    metadata:
+      labels:
+        app: physim
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
diff --git a/charts/physims/charts/nr-prachsim/values.yaml b/charts/physims/charts/nr-prachsim/values.yaml
index 99b4f70f28dba58cb77f708db3b2860a447dca81..8404ea4192b45137360f1bd120c36ac8081774ba 100644
--- a/charts/physims/charts/nr-prachsim/values.yaml
+++ b/charts/physims/charts/nr-prachsim/values.yaml
@@ -28,18 +28,6 @@ podSecurityContext:
 
 securityContext:
   privileged: false
-#  capabilities:
-#    add:
-#      - SYS_CAP_PTRACE
-  #   drop:
-  #   - ALL
-  # readOnlyRootFilesystem: true
-  # runAsNonRoot: true
-  # runAsUser: 1000
-
-service:
-  type: ClusterIP
-  port: 80
 
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious
diff --git a/charts/physims/charts/nr-pucchsim/templates/job.yaml b/charts/physims/charts/nr-pucchsim/templates/job.yaml
index 2b1d7b016b6410f2515e09f0ee03c2c073006db6..849aa1fe464a29cbe8468348db6c466866689170 100644
--- a/charts/physims/charts/nr-pucchsim/templates/job.yaml
+++ b/charts/physims/charts/nr-pucchsim/templates/job.yaml
@@ -4,6 +4,9 @@ metadata:
   name: {{ .Chart.Name }}
 spec:
   template:
+    metadata:
+      labels:
+        app: physim
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
diff --git a/charts/physims/charts/nr-pucchsim/values.yaml b/charts/physims/charts/nr-pucchsim/values.yaml
index 4d7a4b8750ced62868ec528a3b6affcd4ac95574..1c2c822088fdb5a9f69ec674be0826e40453b5d1 100644
--- a/charts/physims/charts/nr-pucchsim/values.yaml
+++ b/charts/physims/charts/nr-pucchsim/values.yaml
@@ -28,14 +28,6 @@ podSecurityContext:
 
 securityContext:
   privileged: false
-#  capabilities:
-#    add:
-#      - SYS_CAP_PTRACE
-  #   drop:
-  #   - ALL
-  # readOnlyRootFilesystem: true
-  # runAsNonRoot: true
-  # runAsUser: 1000
 
 service:
   type: ClusterIP
diff --git a/charts/physims/charts/nr-ulschsim/templates/job.yaml b/charts/physims/charts/nr-ulschsim/templates/job.yaml
index e54f2095a6feb44bb571bbc7fbf9953788daeffb..8096181405e4ca1b4ddc266657103a1f37f5410d 100644
--- a/charts/physims/charts/nr-ulschsim/templates/job.yaml
+++ b/charts/physims/charts/nr-ulschsim/templates/job.yaml
@@ -4,6 +4,9 @@ metadata:
   name: {{ .Chart.Name }}
 spec:
   template:
+    metadata:
+      labels:
+        app: physim
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
diff --git a/charts/physims/charts/nr-ulschsim/values.yaml b/charts/physims/charts/nr-ulschsim/values.yaml
index 083f4b43f16069a05128f10e709276e2aaadbdba..770cb43bb15b664e3cb2ca9cd2b743e2bd3bde42 100644
--- a/charts/physims/charts/nr-ulschsim/values.yaml
+++ b/charts/physims/charts/nr-ulschsim/values.yaml
@@ -28,18 +28,6 @@ podSecurityContext:
 
 securityContext:
   privileged: false
-#  capabilities:
-#    add:
-#      - SYS_CAP_PTRACE
-  #   drop:
-  #   - ALL
-  # readOnlyRootFilesystem: true
-  # runAsNonRoot: true
-  # runAsUser: 1000
-
-service:
-  type: ClusterIP
-  port: 80
 
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious
diff --git a/charts/physims/charts/nr-ulsim.3gpp/templates/job.yaml b/charts/physims/charts/nr-ulsim.3gpp/templates/job.yaml
index 2c92769c4d5cac44859f132835a594c4a2289921..740c5818da4ab727b661cceb1194caa885575b81 100644
--- a/charts/physims/charts/nr-ulsim.3gpp/templates/job.yaml
+++ b/charts/physims/charts/nr-ulsim.3gpp/templates/job.yaml
@@ -4,6 +4,9 @@ metadata:
   name: {{ .Chart.Name }}
 spec:
   template:
+    metadata:
+      labels:
+        app: physim
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
diff --git a/charts/physims/charts/nr-ulsim.3gpp/values.yaml b/charts/physims/charts/nr-ulsim.3gpp/values.yaml
index adbe1241975e045df10ac3840c5622111c83f856..b2aedcba0354b2308edcf20e4e87827b7b13ee1f 100644
--- a/charts/physims/charts/nr-ulsim.3gpp/values.yaml
+++ b/charts/physims/charts/nr-ulsim.3gpp/values.yaml
@@ -28,18 +28,6 @@ podSecurityContext:
 
 securityContext:
   privileged: false
-#  capabilities:
-#    add:
-#      - SYS_CAP_PTRACE
-  #   drop:
-  #   - ALL
-  # readOnlyRootFilesystem: true
-  # runAsNonRoot: true
-  # runAsUser: 1000
-
-service:
-  type: ClusterIP
-  port: 80
 
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious
diff --git a/charts/physims/charts/nr-ulsim.mimo/templates/job.yaml b/charts/physims/charts/nr-ulsim.mimo/templates/job.yaml
index 9d6c284b916ee6061b1eb765765922a568b86996..74200d46148eb853cdd8fe1fa74986ea809fb9fd 100644
--- a/charts/physims/charts/nr-ulsim.mimo/templates/job.yaml
+++ b/charts/physims/charts/nr-ulsim.mimo/templates/job.yaml
@@ -4,6 +4,9 @@ metadata:
   name: {{ .Chart.Name }}
 spec:
   template:
+    metadata:
+      labels:
+        app: physim
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
diff --git a/charts/physims/charts/nr-ulsim.mimo/values.yaml b/charts/physims/charts/nr-ulsim.mimo/values.yaml
index 1b527ee5fac7fefcae16b53eb300f506184d3de7..b2dd42d3bef1f00c9aa23bbea6581381879b6956 100644
--- a/charts/physims/charts/nr-ulsim.mimo/values.yaml
+++ b/charts/physims/charts/nr-ulsim.mimo/values.yaml
@@ -28,18 +28,6 @@ podSecurityContext:
 
 securityContext:
   privileged: false
-#  capabilities:
-#    add:
-#      - SYS_CAP_PTRACE
-  #   drop:
-  #   - ALL
-  # readOnlyRootFilesystem: true
-  # runAsNonRoot: true
-  # runAsUser: 1000
-
-service:
-  type: ClusterIP
-  port: 80
 
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious
diff --git a/charts/physims/charts/nr-ulsim.misc/templates/job.yaml b/charts/physims/charts/nr-ulsim.misc/templates/job.yaml
index 72ca08712b7ebe5df20110a0e805e4733430774d..19c4b7f42bc3b7c401808bf4777e8301db4aa4f3 100644
--- a/charts/physims/charts/nr-ulsim.misc/templates/job.yaml
+++ b/charts/physims/charts/nr-ulsim.misc/templates/job.yaml
@@ -4,6 +4,9 @@ metadata:
   name: {{ .Chart.Name }}
 spec:
   template:
+    metadata:
+      labels:
+        app: physim
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
diff --git a/charts/physims/charts/nr-ulsim.misc/values.yaml b/charts/physims/charts/nr-ulsim.misc/values.yaml
index c3e265bf69c523ba89a2b383dc95a45074b2f3db..8d15fca39e6da7ff4bf650b0a082afcdcc730515 100644
--- a/charts/physims/charts/nr-ulsim.misc/values.yaml
+++ b/charts/physims/charts/nr-ulsim.misc/values.yaml
@@ -28,18 +28,6 @@ podSecurityContext:
 
 securityContext:
   privileged: false
-#  capabilities:
-#    add:
-#      - SYS_CAP_PTRACE
-  #   drop:
-  #   - ALL
-  # readOnlyRootFilesystem: true
-  # runAsNonRoot: true
-  # runAsUser: 1000
-
-service:
-  type: ClusterIP
-  port: 80
 
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious
diff --git a/charts/physims/charts/nr-ulsim.sc-fdma/templates/job.yaml b/charts/physims/charts/nr-ulsim.sc-fdma/templates/job.yaml
index 05dccbf705ffaa0ee03295a2450fea6440b2216d..c487d445984eb65e5f0a1a8ba58a61a7eb7f44ae 100644
--- a/charts/physims/charts/nr-ulsim.sc-fdma/templates/job.yaml
+++ b/charts/physims/charts/nr-ulsim.sc-fdma/templates/job.yaml
@@ -4,6 +4,9 @@ metadata:
   name: {{ .Chart.Name }}
 spec:
   template:
+    metadata:
+      labels:
+        app: physim
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
diff --git a/charts/physims/charts/nr-ulsim.sc-fdma/values.yaml b/charts/physims/charts/nr-ulsim.sc-fdma/values.yaml
index 05a952a1ac8c6343c7e6063c459cb6eb033061af..c617eeafec0eb918d9eef2e42e4ebab422ec6dd7 100644
--- a/charts/physims/charts/nr-ulsim.sc-fdma/values.yaml
+++ b/charts/physims/charts/nr-ulsim.sc-fdma/values.yaml
@@ -28,18 +28,6 @@ podSecurityContext:
 
 securityContext:
   privileged: false
-#  capabilities:
-#    add:
-#      - SYS_CAP_PTRACE
-  #   drop:
-  #   - ALL
-  # readOnlyRootFilesystem: true
-  # runAsNonRoot: true
-  # runAsUser: 1000
-
-service:
-  type: ClusterIP
-  port: 80
 
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious
diff --git a/charts/physims/charts/polartest/templates/job.yaml b/charts/physims/charts/polartest/templates/job.yaml
index 8f0998d9f3b2cb4a55959821c3cbd6ff276fd176..9abb161e2475145bdf31dd5c24acd2d3f9febaef 100644
--- a/charts/physims/charts/polartest/templates/job.yaml
+++ b/charts/physims/charts/polartest/templates/job.yaml
@@ -4,6 +4,9 @@ metadata:
   name: {{ .Chart.Name }}
 spec:
   template:
+    metadata:
+      labels:
+        app: physim
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
diff --git a/charts/physims/charts/polartest/values.yaml b/charts/physims/charts/polartest/values.yaml
index c91ee2bf5b5c823e5b6df7aad35b8fee06e0541b..12386f02bcd029f3aba1d1a14c54e8c284ca69b0 100644
--- a/charts/physims/charts/polartest/values.yaml
+++ b/charts/physims/charts/polartest/values.yaml
@@ -28,18 +28,6 @@ podSecurityContext:
 
 securityContext:
   privileged: false
-#  capabilities:
-#    add:
-#      - SYS_CAP_PTRACE
-  #   drop:
-  #   - ALL
-  # readOnlyRootFilesystem: true
-  # runAsNonRoot: true
-  # runAsUser: 1000
-
-service:
-  type: ClusterIP
-  port: 80
 
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious
diff --git a/charts/physims/charts/smallblocktest/templates/job.yaml b/charts/physims/charts/smallblocktest/templates/job.yaml
index d136a1fcf31621b3a59d9b33dde3d039cad94944..365e1215d974d0ab070e1401c293623b9433167a 100644
--- a/charts/physims/charts/smallblocktest/templates/job.yaml
+++ b/charts/physims/charts/smallblocktest/templates/job.yaml
@@ -4,6 +4,9 @@ metadata:
   name: {{ .Chart.Name }}
 spec:
   template:
+    metadata:
+      labels:
+        app: physim
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
diff --git a/charts/physims/charts/smallblocktest/values.yaml b/charts/physims/charts/smallblocktest/values.yaml
index f4d8a31fd96dc6d5a0144003af4a577c0f4d3a0a..7f116091ac5af9b762f6f7c9793a0d7b4db6fa9f 100644
--- a/charts/physims/charts/smallblocktest/values.yaml
+++ b/charts/physims/charts/smallblocktest/values.yaml
@@ -28,18 +28,6 @@ podSecurityContext:
 
 securityContext:
   privileged: false
-#  capabilities:
-#    add:
-#      - SYS_CAP_PTRACE
-  #   drop:
-  #   - ALL
-  # readOnlyRootFilesystem: true
-  # runAsNonRoot: true
-  # runAsUser: 1000
-
-service:
-  type: ClusterIP
-  port: 80
 
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious
diff --git a/charts/physims/charts/ulsim/templates/job.yaml b/charts/physims/charts/ulsim/templates/job.yaml
index f2e904edb8345f2175b9529e051795d95cd03799..d7a820f0ca28b3034c3d08cf23bca713f51defab 100644
--- a/charts/physims/charts/ulsim/templates/job.yaml
+++ b/charts/physims/charts/ulsim/templates/job.yaml
@@ -4,6 +4,9 @@ metadata:
   name: {{ .Chart.Name }}
 spec:
   template:
+    metadata:
+      labels:
+        app: physim
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
diff --git a/charts/physims/charts/ulsim/values.yaml b/charts/physims/charts/ulsim/values.yaml
index 7ed2c6bed0af38dfa74c5ff4294e6614d9de61fe..94038fa6dfed26813d7358c5315091345086afb1 100644
--- a/charts/physims/charts/ulsim/values.yaml
+++ b/charts/physims/charts/ulsim/values.yaml
@@ -28,18 +28,6 @@ podSecurityContext:
 
 securityContext:
   privileged: false
-#  capabilities:
-#    add:
-#      - SYS_CAP_PTRACE
-  #   drop:
-  #   - ALL
-  # readOnlyRootFilesystem: true
-  # runAsNonRoot: true
-  # runAsUser: 1000
-
-service:
-  type: ClusterIP
-  port: 80
 
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious
diff --git a/charts/physims/values.yaml b/charts/physims/values.yaml
index 53190daff7577b2bccfb73355914b29bcb0250dd..e333ad1fa3639ef1100e28a49a25cd34376557c8 100644
--- a/charts/physims/values.yaml
+++ b/charts/physims/values.yaml
@@ -12,46 +12,3 @@ global:
     # pullPolicy: IfNotPresent or Never or Always
     pullPolicy: Always
 
-## Declaring values specific to coressponding physim to overwrite (At the moment unused)
-
-dlsim.basic:
-
-dlsim.100rb+tm2:
-
-ulsim:
-
-ldpctest:
-
-polartest:
-
-nr-pbchsim.106rb:
-
-nr-pbchsim.217rb:
-
-nr-pbchsim.273rb:
-
-nr-dlsim.basic:
-
-nr-dlsim.dmrs+ptrs:
-
-nr-dlsim.mcs+mimo:
-
-nr-dlsim.offset:
-
-nr-dlschsim:
-
-smallblocktest:
-
-nr-ulschsim:
-
-nr-pucchsim:
-
-nr-ulsim.3gpp:
-
-nr-ulsim.mimo:
-
-nr-ulsim.misc:
-
-nr-ulsim.sc-fdma:
-
-nr-prachsim:
diff --git a/ci-scripts/cls_physim1.py b/ci-scripts/cls_physim1.py
index 1cef2270c3ddd01582bed29cbcbcda61778dcfa8..9be0293cfcab4b81c8eda8e8a808b82b086a6a73 100644
--- a/ci-scripts/cls_physim1.py
+++ b/ci-scripts/cls_physim1.py
@@ -158,9 +158,10 @@ class PhySim:
 			logging.debug('\u001B[1m   Deployed PhySim Successfully using helm chart\u001B[0m')
 		isRunning = False
 		count = 0
+		# Below while sections means there is 2 mins for pods to be in running if not they will be removed
 		while(count < 2 and isRunning == False):
 			time.sleep(60)
-			mySSH.command('oc get pods -o wide -l app.kubernetes.io/instance=physim | tee -a cmake_targets/log/physim_pods_summary.txt', '\$', 30, resync=True)
+			mySSH.command('oc get pods -o wide -l app=physim | tee -a cmake_targets/log/physim_pods_summary.txt', '\$', 30, resync=True)
 			if mySSH.getBefore().count('Running') == 21:
 				logging.debug('\u001B[1m Running the physim test Scenarios\u001B[0m')
 				isRunning = True
@@ -168,14 +169,14 @@ class PhySim:
 			count +=1
 		if isRunning == False:
 			logging.error('\u001B[1m Some PODS Running FAILED \u001B[0m')
-			mySSH.command('oc get pods -l app.kubernetes.io/instance=physim 2>&1 | tee -a cmake_targets/log/physim_pods_summary.txt', '\$', 6)
+			mySSH.command('oc get pods -l app=physim 2>&1 | tee -a cmake_targets/log/physim_pods_summary.txt', '\$', 6)
 			mySSH.command('for pod in $(oc get pods | tail -n +2 | awk \'{print $1}\'); do oc describe pod $pod >> cmake_targets/log/physim_pods_summary.txt; done', '\$', 10)
 			mySSH.command('helm uninstall physim 2>&1 >> cmake_targets/log/physim_helm_summary.txt', '\$', 6)
 			self.AnalyzeLogFile_phySim()
 			isFinished1 = False
 			while(isFinished1 == False):
 				time.sleep(20)
-				mySSH.command('oc get pods -l app.kubernetes.io/instance=physim', '\$', 6, resync=True)
+				mySSH.command('oc get pods -l app=physim', '\$', 6, resync=True)
 				if re.search('No resources found', mySSH.getBefore()):
 					isFinished1 = True
 			mySSH.command('oc logout', '\$', 30)
@@ -188,7 +189,7 @@ class PhySim:
 		isFinished = False
 		# doing a deep copy!
 		tmpPodNames = podNames.copy()
-		while(count < 15 and isFinished == False):
+		while(count < 9 and isFinished == False):
 			time.sleep(60)
 			for podName in tmpPodNames:
 				mySSH.command2(f'oc logs --tail=1 {podName} 2>&1', 6, silent=True)