diff --git a/charts/physims/charts/dlsim.100rb+tm2/templates/deployment.yaml b/charts/physims/charts/dlsim.100rb+tm2/templates/deployment.yaml
index 1339f4dcc0da0e380a4edd76145b29843036a31d..88bf277a0336c64ba8ba04205e0329f0688332f9 100644
--- a/charts/physims/charts/dlsim.100rb+tm2/templates/deployment.yaml
+++ b/charts/physims/charts/dlsim.100rb+tm2/templates/deployment.yaml
@@ -30,7 +30,6 @@ spec:
           {{- toYaml .Values.securityContext | nindent 12 }}
         ports:
         - containerPort: 80
-          name: oai-dlsim-100rb
         env:
         - name: OPENAIR_DIR
           value: /opt/oai-physim
diff --git a/charts/physims/charts/dlsim.100rb+tm2/values.yaml b/charts/physims/charts/dlsim.100rb+tm2/values.yaml
index 9b60e29f3084ffbea7351ef423aaff4d4fd0cb74..f3d1aa3d743a8f00523b3d4e251ce6780314d03d 100644
--- a/charts/physims/charts/dlsim.100rb+tm2/values.yaml
+++ b/charts/physims/charts/dlsim.100rb+tm2/values.yaml
@@ -4,12 +4,7 @@
 
 replicaCount: 1
 
-namespace: "OAICICD_PROJECT"
-
 image:
-  registry: local
-  repository: image-registry.openshift-image-registry.svc:5000/OAICICD_PROJECT/oai-physim
-  version: temp
   # pullPolicy: IfNotPresent or Never or Always
   pullPolicy: Always
 
diff --git a/charts/physims/charts/dlsim.basic/templates/deployment.yaml b/charts/physims/charts/dlsim.basic/templates/deployment.yaml
index 168b58748aa373f2ab285f9edb7debc5a0060cbf..f74f50472753e8eb0e3cb890a0f423221a2bcf65 100644
--- a/charts/physims/charts/dlsim.basic/templates/deployment.yaml
+++ b/charts/physims/charts/dlsim.basic/templates/deployment.yaml
@@ -30,7 +30,6 @@ spec:
           {{- toYaml .Values.securityContext | nindent 12 }}
         ports:
         - containerPort: 80
-          name: oai-dlsim-basic
         env:
         - name: OPENAIR_DIR
           value: /opt/oai-physim
diff --git a/charts/physims/charts/dlsim.basic/values.yaml b/charts/physims/charts/dlsim.basic/values.yaml
index bb63644c2b35b9e65588214f324f69a35b312714..e36679ec2b7c20e42fc5e2a5092c1e6821069252 100644
--- a/charts/physims/charts/dlsim.basic/values.yaml
+++ b/charts/physims/charts/dlsim.basic/values.yaml
@@ -4,12 +4,7 @@
 
 replicaCount: 1
 
-namespace: "OAICICD_PROJECT"
-
 image:
-  registry: local
-  repository: image-registry.openshift-image-registry.svc:5000/OAICICD_PROJECT/oai-physim
-  version: temp
   # pullPolicy: IfNotPresent or Never or Always
   pullPolicy: Always
 
diff --git a/charts/physims/charts/ldpctest/templates/deployment.yaml b/charts/physims/charts/ldpctest/templates/deployment.yaml
index 74f78e7a0b4696697e1c887d4d79bf6486adfd07..8df3df5c462f5e01425be03c3d6f0582b8897e8e 100644
--- a/charts/physims/charts/ldpctest/templates/deployment.yaml
+++ b/charts/physims/charts/ldpctest/templates/deployment.yaml
@@ -30,7 +30,6 @@ spec:
           {{- toYaml .Values.securityContext | nindent 12 }}
         ports:
         - containerPort: 80
-          name: oai-ldpctest
         env:
         - name: OPENAIR_DIR
           value: /opt/oai-physim
diff --git a/charts/physims/charts/ldpctest/values.yaml b/charts/physims/charts/ldpctest/values.yaml
index b3cc476cf86116a1616856d61d53b3a4307ed96f..0ac20e6dd371bb5924c7417052bce0d138ed74f9 100644
--- a/charts/physims/charts/ldpctest/values.yaml
+++ b/charts/physims/charts/ldpctest/values.yaml
@@ -4,12 +4,7 @@
 
 replicaCount: 1
 
-namespace: "OAICICD_PROJECT"
-
 image:
-  registry: local
-  repository: image-registry.openshift-image-registry.svc:5000/OAICICD_PROJECT/oai-physim
-  version: temp
   # pullPolicy: IfNotPresent or Never or Always
   pullPolicy: Always
 
diff --git a/charts/physims/charts/nr-dlschsim/templates/deployment.yaml b/charts/physims/charts/nr-dlschsim/templates/deployment.yaml
index cfe5c1f6153c7787dfc87fd31077ab8b5e229875..1016dbef560121ed40c7f84353e2b4bae07e864e 100644
--- a/charts/physims/charts/nr-dlschsim/templates/deployment.yaml
+++ b/charts/physims/charts/nr-dlschsim/templates/deployment.yaml
@@ -30,7 +30,6 @@ spec:
           {{- toYaml .Values.securityContext | nindent 12 }}
         ports:
         - containerPort: 80
-          name: oai-nr-dlschsim
         env:
         - name: OPENAIR_DIR
           value: /opt/oai-physim
diff --git a/charts/physims/charts/nr-dlschsim/values.yaml b/charts/physims/charts/nr-dlschsim/values.yaml
index b7ef28f47a7b8e7b969a9886cf28b4b5faf6bf1c..cb32095f7641fe1627395ea28f5876a0b1638304 100644
--- a/charts/physims/charts/nr-dlschsim/values.yaml
+++ b/charts/physims/charts/nr-dlschsim/values.yaml
@@ -4,12 +4,7 @@
 
 replicaCount: 1
 
-namespace: "OAICICD_PROJECT"
-
 image:
-  registry: local
-  repository: image-registry.openshift-image-registry.svc:5000/OAICICD_PROJECT/oai-physim
-  version: temp
   # pullPolicy: IfNotPresent or Never or Always
   pullPolicy: Always
 
diff --git a/charts/physims/charts/nr-dlsim.basic/templates/deployment.yaml b/charts/physims/charts/nr-dlsim.basic/templates/deployment.yaml
index 2337ad98fd5b2963d8781045b489bbb4766e102e..72ae0406d0fc47d21774f124429e7effb6c036ab 100644
--- a/charts/physims/charts/nr-dlsim.basic/templates/deployment.yaml
+++ b/charts/physims/charts/nr-dlsim.basic/templates/deployment.yaml
@@ -30,7 +30,6 @@ spec:
           {{- toYaml .Values.securityContext | nindent 12 }}
         ports:
         - containerPort: 80
-          name: oai-nr-dlsim-ba
         env:
         - name: OPENAIR_DIR
           value: /opt/oai-physim
diff --git a/charts/physims/charts/nr-dlsim.basic/values.yaml b/charts/physims/charts/nr-dlsim.basic/values.yaml
index 9829ecf256607de807c75f7d9cae2ba84faf9865..4b9db13d7eeaddc0c56006ae978b56ecb5d79480 100644
--- a/charts/physims/charts/nr-dlsim.basic/values.yaml
+++ b/charts/physims/charts/nr-dlsim.basic/values.yaml
@@ -4,12 +4,7 @@
 
 replicaCount: 1
 
-namespace: "OAICICD_PROJECT"
-
 image:
-  registry: local
-  repository: image-registry.openshift-image-registry.svc:5000/OAICICD_PROJECT/oai-physim
-  version: temp
   # pullPolicy: IfNotPresent or Never or Always
   pullPolicy: Always
 
diff --git a/charts/physims/charts/nr-dlsim.dmrs+ptrs/templates/deployment.yaml b/charts/physims/charts/nr-dlsim.dmrs+ptrs/templates/deployment.yaml
index dc3ebb34d6e20350ae7be8c46882862181418f66..847a1e1aee00d7106d6e87334ebb4f3ec9f35d2f 100644
--- a/charts/physims/charts/nr-dlsim.dmrs+ptrs/templates/deployment.yaml
+++ b/charts/physims/charts/nr-dlsim.dmrs+ptrs/templates/deployment.yaml
@@ -30,7 +30,6 @@ spec:
           {{- toYaml .Values.securityContext | nindent 12 }}
         ports:
         - containerPort: 80
-          name: oai-nr-dlsim-dm
         env:
         - name: OPENAIR_DIR
           value: /opt/oai-physim
diff --git a/charts/physims/charts/nr-dlsim.dmrs+ptrs/values.yaml b/charts/physims/charts/nr-dlsim.dmrs+ptrs/values.yaml
index c414d58132aec389c63d315c9cb4c5f7a8f04388..8c1814f19dc6f625a007c6ec05ecb37799c4d82f 100644
--- a/charts/physims/charts/nr-dlsim.dmrs+ptrs/values.yaml
+++ b/charts/physims/charts/nr-dlsim.dmrs+ptrs/values.yaml
@@ -4,12 +4,7 @@
 
 replicaCount: 1
 
-namespace: "OAICICD_PROJECT"
-
 image:
-  registry: local
-  repository: image-registry.openshift-image-registry.svc:5000/OAICICD_PROJECT/oai-physim
-  version: temp
   # pullPolicy: IfNotPresent or Never or Always
   pullPolicy: Always
 
diff --git a/charts/physims/charts/nr-dlsim.mcs+mimo/templates/deployment.yaml b/charts/physims/charts/nr-dlsim.mcs+mimo/templates/deployment.yaml
index 5d38cf21c0f1a0bb6b608e06b117fdbc77918fa4..c79eaf01a2d19002cb98c8a5e8aa85de4189e017 100644
--- a/charts/physims/charts/nr-dlsim.mcs+mimo/templates/deployment.yaml
+++ b/charts/physims/charts/nr-dlsim.mcs+mimo/templates/deployment.yaml
@@ -30,7 +30,6 @@ spec:
           {{- toYaml .Values.securityContext | nindent 12 }}
         ports:
         - containerPort: 80
-          name: oai-nr-dlsim-mc
         env:
         - name: OPENAIR_DIR
           value: /opt/oai-physim
diff --git a/charts/physims/charts/nr-dlsim.mcs+mimo/values.yaml b/charts/physims/charts/nr-dlsim.mcs+mimo/values.yaml
index cdc58817d907afeb3d9b29f0fb0182304248cdb3..5bb48ad15db5a98e3183e50eccaa3c2912a369ab 100644
--- a/charts/physims/charts/nr-dlsim.mcs+mimo/values.yaml
+++ b/charts/physims/charts/nr-dlsim.mcs+mimo/values.yaml
@@ -4,12 +4,7 @@
 
 replicaCount: 1
 
-namespace: "OAICICD_PROJECT"
-
 image:
-  registry: local
-  repository: image-registry.openshift-image-registry.svc:5000/OAICICD_PROJECT/oai-physim
-  version: temp
   # pullPolicy: IfNotPresent or Never or Always
   pullPolicy: Always
 
diff --git a/charts/physims/charts/nr-dlsim.offset/values.yaml b/charts/physims/charts/nr-dlsim.offset/values.yaml
index 2c15b204102dfbc528a59964b56bc451355cd8f2..40c1a94efe313472c5226b5d5d7f05adea41be0e 100644
--- a/charts/physims/charts/nr-dlsim.offset/values.yaml
+++ b/charts/physims/charts/nr-dlsim.offset/values.yaml
@@ -4,12 +4,7 @@
 
 replicaCount: 1
 
-namespace: "OAICICD_PROJECT"
-
 image:
-  registry: local
-  repository: image-registry.openshift-image-registry.svc:5000/OAICICD_PROJECT/oai-physim
-  version: temp
   # pullPolicy: IfNotPresent or Never or Always
   pullPolicy: Always
 
diff --git a/charts/physims/charts/nr-pbchsim.106rb/templates/deployment.yaml b/charts/physims/charts/nr-pbchsim.106rb/templates/deployment.yaml
index b9c5cfdd7928d47625cc9f2870e2a95dbd1ffba1..ed0f8f157077a63ac117787496e258580d424b6e 100644
--- a/charts/physims/charts/nr-pbchsim.106rb/templates/deployment.yaml
+++ b/charts/physims/charts/nr-pbchsim.106rb/templates/deployment.yaml
@@ -30,7 +30,6 @@ spec:
           {{- toYaml .Values.securityContext | nindent 12 }}
         ports:
         - containerPort: 80
-          name: oai-nr-pbchsim
         env:
         - name: OPENAIR_DIR
           value: /opt/oai-physim
diff --git a/charts/physims/charts/nr-pbchsim.106rb/values.yaml b/charts/physims/charts/nr-pbchsim.106rb/values.yaml
index 5a3846b2deb853b4daa73530e5d236591c374210..5632762245e5a2060dcf29598787f50a5c361c60 100644
--- a/charts/physims/charts/nr-pbchsim.106rb/values.yaml
+++ b/charts/physims/charts/nr-pbchsim.106rb/values.yaml
@@ -4,12 +4,7 @@
 
 replicaCount: 1
 
-namespace: "OAICICD_PROJECT"
-
 image:
-  registry: local
-  repository: image-registry.openshift-image-registry.svc:5000/OAICICD_PROJECT/oai-physim
-  version: temp
   # pullPolicy: IfNotPresent or Never or Always
   pullPolicy: Always
 
diff --git a/charts/physims/charts/nr-pbchsim.217rb/templates/deployment.yaml b/charts/physims/charts/nr-pbchsim.217rb/templates/deployment.yaml
index 81f23745bd4dadd12788df75c80b9a89a52fbaec..513443deaa3fdb08ee71e1ed84c1c1f567fdef8f 100644
--- a/charts/physims/charts/nr-pbchsim.217rb/templates/deployment.yaml
+++ b/charts/physims/charts/nr-pbchsim.217rb/templates/deployment.yaml
@@ -30,7 +30,6 @@ spec:
           {{- toYaml .Values.securityContext | nindent 12 }}
         ports:
         - containerPort: 80
-          name: oai-nr-pbchsim
         env:
         - name: OPENAIR_DIR
           value: /opt/oai-physim
diff --git a/charts/physims/charts/nr-pbchsim.217rb/values.yaml b/charts/physims/charts/nr-pbchsim.217rb/values.yaml
index b23186f267d33a0bda8e1c97680aa7db9f9bafa9..7b44b982de50b89b47ec0cdeadd241594a54ec62 100644
--- a/charts/physims/charts/nr-pbchsim.217rb/values.yaml
+++ b/charts/physims/charts/nr-pbchsim.217rb/values.yaml
@@ -4,12 +4,7 @@
 
 replicaCount: 1
 
-namespace: "OAICICD_PROJECT"
-
 image:
-  registry: local
-  repository: image-registry.openshift-image-registry.svc:5000/OAICICD_PROJECT/oai-physim
-  version: temp
   # pullPolicy: IfNotPresent or Never or Always
   pullPolicy: Always
 
diff --git a/charts/physims/charts/nr-pbchsim.273rb/templates/deployment.yaml b/charts/physims/charts/nr-pbchsim.273rb/templates/deployment.yaml
index d0eb02d1f82484c68425aa40d89f55cecb3c45b2..512e212c07335a30ce5ba743f265bc89abad6255 100644
--- a/charts/physims/charts/nr-pbchsim.273rb/templates/deployment.yaml
+++ b/charts/physims/charts/nr-pbchsim.273rb/templates/deployment.yaml
@@ -30,7 +30,6 @@ spec:
           {{- toYaml .Values.securityContext | nindent 12 }}
         ports:
         - containerPort: 80
-          name: oai-nr-pbchsim
         env:
         - name: OPENAIR_DIR
           value: /opt/oai-physim
diff --git a/charts/physims/charts/nr-pbchsim.273rb/values.yaml b/charts/physims/charts/nr-pbchsim.273rb/values.yaml
index a17d3297d8eca60d72cb05a0a2307c58cb7f3f1a..9cb5f6ebb5f8e29ceb5784667c6c057e86f91bba 100644
--- a/charts/physims/charts/nr-pbchsim.273rb/values.yaml
+++ b/charts/physims/charts/nr-pbchsim.273rb/values.yaml
@@ -4,12 +4,7 @@
 
 replicaCount: 1
 
-namespace: "OAICICD_PROJECT"
-
 image:
-  registry: local
-  repository: image-registry.openshift-image-registry.svc:5000/OAICICD_PROJECT/oai-physim
-  version: temp
   # pullPolicy: IfNotPresent or Never or Always
   pullPolicy: Always
 
diff --git a/charts/physims/charts/nr-prachsim/templates/deployment.yaml b/charts/physims/charts/nr-prachsim/templates/deployment.yaml
index fb1a4ac61e1ebaf7846f615333dd3bae0cf26f48..6bea044b86c9ee5647ec49126b7248e8aa5ec1f2 100644
--- a/charts/physims/charts/nr-prachsim/templates/deployment.yaml
+++ b/charts/physims/charts/nr-prachsim/templates/deployment.yaml
@@ -30,7 +30,6 @@ spec:
           {{- toYaml .Values.securityContext | nindent 12 }}
         ports:
         - containerPort: 80
-          name: oai-nr-prachsim
         env:
         - name: OPENAIR_DIR
           value: /opt/oai-physim
diff --git a/charts/physims/charts/nr-prachsim/values.yaml b/charts/physims/charts/nr-prachsim/values.yaml
index dba6cc16c079ce9f65922e11a2082aa8ffec8baa..93789de637ec7cc48fa676447a3e25e953361c62 100644
--- a/charts/physims/charts/nr-prachsim/values.yaml
+++ b/charts/physims/charts/nr-prachsim/values.yaml
@@ -4,12 +4,7 @@
 
 replicaCount: 1
 
-namespace: "OAICICD_PROJECT"
-
 image:
-  registry: local
-  repository: image-registry.openshift-image-registry.svc:5000/OAICICD_PROJECT/oai-physim
-  version: temp
   # pullPolicy: IfNotPresent or Never or Always
   pullPolicy: Always
 
diff --git a/charts/physims/charts/nr-pucchsim/templates/deployment.yaml b/charts/physims/charts/nr-pucchsim/templates/deployment.yaml
index 2159b3935d63120086291d853a58bbc1bc61fa8e..fce72ebc3520dc33c4c40f56676d02ee6b70d178 100644
--- a/charts/physims/charts/nr-pucchsim/templates/deployment.yaml
+++ b/charts/physims/charts/nr-pucchsim/templates/deployment.yaml
@@ -30,7 +30,6 @@ spec:
           {{- toYaml .Values.securityContext | nindent 12 }}
         ports:
         - containerPort: 80
-          name: oai-nr-pucchsim
         env:
         - name: OPENAIR_DIR
           value: /opt/oai-physim
diff --git a/charts/physims/charts/nr-pucchsim/values.yaml b/charts/physims/charts/nr-pucchsim/values.yaml
index 77fe0963ac2dc5d939a042aceee96c46703f3232..d4c869278b847af407a2c81aa8b202f9699547a3 100644
--- a/charts/physims/charts/nr-pucchsim/values.yaml
+++ b/charts/physims/charts/nr-pucchsim/values.yaml
@@ -4,12 +4,7 @@
 
 replicaCount: 1
 
-namespace: "OAICICD_PROJECT"
-
 image:
-  registry: local
-  repository: image-registry.openshift-image-registry.svc:5000/OAICICD_PROJECT/oai-physim
-  version: temp
   # pullPolicy: IfNotPresent or Never or Always
   pullPolicy: Always
 
diff --git a/charts/physims/charts/nr-ulschsim/templates/deployment.yaml b/charts/physims/charts/nr-ulschsim/templates/deployment.yaml
index 8ca812bf408d6aadad3dec8549a848c671580e3c..d44b2b64635e456ebad9ba73decf18631d0c1624 100644
--- a/charts/physims/charts/nr-ulschsim/templates/deployment.yaml
+++ b/charts/physims/charts/nr-ulschsim/templates/deployment.yaml
@@ -30,7 +30,6 @@ spec:
           {{- toYaml .Values.securityContext | nindent 12 }}
         ports:
         - containerPort: 80
-          name: oai-nr-ulschsim
         env:
         - name: OPENAIR_DIR
           value: /opt/oai-physim
diff --git a/charts/physims/charts/nr-ulschsim/values.yaml b/charts/physims/charts/nr-ulschsim/values.yaml
index efb011a7f6530d59c4713c2c51c3a8c776318e98..b0529c818d9b060affd83c44e8c30c299c464280 100644
--- a/charts/physims/charts/nr-ulschsim/values.yaml
+++ b/charts/physims/charts/nr-ulschsim/values.yaml
@@ -4,12 +4,7 @@
 
 replicaCount: 1
 
-namespace: "OAICICD_PROJECT"
-
 image:
-  registry: local
-  repository: image-registry.openshift-image-registry.svc:5000/OAICICD_PROJECT/oai-physim
-  version: temp
   # pullPolicy: IfNotPresent or Never or Always
   pullPolicy: Always
 
diff --git a/charts/physims/charts/nr-ulsim.3gpp/templates/deployment.yaml b/charts/physims/charts/nr-ulsim.3gpp/templates/deployment.yaml
index 801252e0ea595a6898e9a9b6bc2c1afa7692598b..7bf59eed4f917db9af881b491431ead866b179a8 100644
--- a/charts/physims/charts/nr-ulsim.3gpp/templates/deployment.yaml
+++ b/charts/physims/charts/nr-ulsim.3gpp/templates/deployment.yaml
@@ -30,7 +30,6 @@ spec:
           {{- toYaml .Values.securityContext | nindent 12 }}
         ports:
         - containerPort: 80
-          name: oai-nr-ulsim-3g
         env:
         - name: OPENAIR_DIR
           value: /opt/oai-physim
diff --git a/charts/physims/charts/nr-ulsim.3gpp/values.yaml b/charts/physims/charts/nr-ulsim.3gpp/values.yaml
index ab68afd7123ada763bcb92ea707a7c0e177fe19b..3d44bda9b85aeb87d8933a22d65269b9f33cba80 100644
--- a/charts/physims/charts/nr-ulsim.3gpp/values.yaml
+++ b/charts/physims/charts/nr-ulsim.3gpp/values.yaml
@@ -4,12 +4,7 @@
 
 replicaCount: 1
 
-namespace: "OAICICD_PROJECT"
-
 image:
-  registry: local
-  repository: image-registry.openshift-image-registry.svc:5000/OAICICD_PROJECT/oai-physim
-  version: temp
   # pullPolicy: IfNotPresent or Never or Always
   pullPolicy: Always
 
diff --git a/charts/physims/charts/nr-ulsim.mimo/templates/deployment.yaml b/charts/physims/charts/nr-ulsim.mimo/templates/deployment.yaml
index c21b151ad10d625fe41cc36cac36c9e80b2ef05b..e8d6ecf7ce353a99639535a16a528ad4223ea800 100644
--- a/charts/physims/charts/nr-ulsim.mimo/templates/deployment.yaml
+++ b/charts/physims/charts/nr-ulsim.mimo/templates/deployment.yaml
@@ -30,7 +30,6 @@ spec:
           {{- toYaml .Values.securityContext | nindent 12 }}
         ports:
         - containerPort: 80
-          name: oai-nr-ulsim-mi
         env:
         - name: OPENAIR_DIR
           value: /opt/oai-physim
diff --git a/charts/physims/charts/nr-ulsim.mimo/values.yaml b/charts/physims/charts/nr-ulsim.mimo/values.yaml
index 6eab0521e1041b7c487cb1f04ce8a5734b0ea3c1..55bdcd615878c62656608129f7663cc7b76d5769 100644
--- a/charts/physims/charts/nr-ulsim.mimo/values.yaml
+++ b/charts/physims/charts/nr-ulsim.mimo/values.yaml
@@ -4,12 +4,7 @@
 
 replicaCount: 1
 
-namespace: "OAICICD_PROJECT"
-
 image:
-  registry: local
-  repository: image-registry.openshift-image-registry.svc:5000/OAICICD_PROJECT/oai-physim
-  version: temp
   # pullPolicy: IfNotPresent or Never or Always
   pullPolicy: Always
 
diff --git a/charts/physims/charts/nr-ulsim.misc/templates/deployment.yaml b/charts/physims/charts/nr-ulsim.misc/templates/deployment.yaml
index 0987e041e0b463a87045ce8205f331a07db8eefe..56c25fbbc3666efeecc5cbac07764f7b6a36b014 100644
--- a/charts/physims/charts/nr-ulsim.misc/templates/deployment.yaml
+++ b/charts/physims/charts/nr-ulsim.misc/templates/deployment.yaml
@@ -30,7 +30,6 @@ spec:
           {{- toYaml .Values.securityContext | nindent 12 }}
         ports:
         - containerPort: 80
-          name: oai-nr-ulsim-mi
         env:
         - name: OPENAIR_DIR
           value: /opt/oai-physim
diff --git a/charts/physims/charts/nr-ulsim.misc/values.yaml b/charts/physims/charts/nr-ulsim.misc/values.yaml
index e45dc95be5ffa0ffb1ce706bd6338394a2576b4d..dcae7a2b66cb4b4bf62e9f09041f5faf5c7e0f39 100644
--- a/charts/physims/charts/nr-ulsim.misc/values.yaml
+++ b/charts/physims/charts/nr-ulsim.misc/values.yaml
@@ -4,12 +4,7 @@
 
 replicaCount: 1
 
-namespace: "OAICICD_PROJECT"
-
 image:
-  registry: local
-  repository: image-registry.openshift-image-registry.svc:5000/OAICICD_PROJECT/oai-physim
-  version: temp
   # pullPolicy: IfNotPresent or Never or Always
   pullPolicy: Always
 
diff --git a/charts/physims/charts/nr-ulsim.sc-fdma/templates/deployment.yaml b/charts/physims/charts/nr-ulsim.sc-fdma/templates/deployment.yaml
index 5e48777020361a42de816dfa1080a84bd38dbfa9..3119950e20c7da3494451ffd4bcde9c70ec68f59 100644
--- a/charts/physims/charts/nr-ulsim.sc-fdma/templates/deployment.yaml
+++ b/charts/physims/charts/nr-ulsim.sc-fdma/templates/deployment.yaml
@@ -30,7 +30,6 @@ spec:
           {{- toYaml .Values.securityContext | nindent 12 }}
         ports:
         - containerPort: 80
-          name: oai-nr-ulsim-sc
         env:
         - name: OPENAIR_DIR
           value: /opt/oai-physim
diff --git a/charts/physims/charts/nr-ulsim.sc-fdma/values.yaml b/charts/physims/charts/nr-ulsim.sc-fdma/values.yaml
index e75785772ba7fb5295e6f6ba61abdcfffa8c3a4c..0536fb03b6e46f7bece9e818cdd042b25a996f41 100644
--- a/charts/physims/charts/nr-ulsim.sc-fdma/values.yaml
+++ b/charts/physims/charts/nr-ulsim.sc-fdma/values.yaml
@@ -4,12 +4,7 @@
 
 replicaCount: 1
 
-namespace: "OAICICD_PROJECT"
-
 image:
-  registry: local
-  repository: image-registry.openshift-image-registry.svc:5000/OAICICD_PROJECT/oai-physim
-  version: temp
   # pullPolicy: IfNotPresent or Never or Always
   pullPolicy: Always
 
diff --git a/charts/physims/charts/polartest/templates/deployment.yaml b/charts/physims/charts/polartest/templates/deployment.yaml
index ccb860ee98179197685371fb14bd452ff574b0ab..20dac8ebf7a1e0aedd59da028ddadb5dcb88bd87 100644
--- a/charts/physims/charts/polartest/templates/deployment.yaml
+++ b/charts/physims/charts/polartest/templates/deployment.yaml
@@ -30,7 +30,6 @@ spec:
           {{- toYaml .Values.securityContext | nindent 12 }}
         ports:
         - containerPort: 80
-          name: oai-polartest
         env:
         - name: OPENAIR_DIR
           value: /opt/oai-physim
diff --git a/charts/physims/charts/polartest/values.yaml b/charts/physims/charts/polartest/values.yaml
index e0751e8ec48cc3798097989abb7abea4cb8f5de8..f7195dd57270a49d3e977e7001efe2e26240e209 100644
--- a/charts/physims/charts/polartest/values.yaml
+++ b/charts/physims/charts/polartest/values.yaml
@@ -4,12 +4,7 @@
 
 replicaCount: 1
 
-namespace: "OAICICD_PROJECT"
-
 image:
-  registry: local
-  repository: image-registry.openshift-image-registry.svc:5000/OAICICD_PROJECT/oai-physim
-  version: temp
   # pullPolicy: IfNotPresent or Never or Always
   pullPolicy: Always
 
diff --git a/charts/physims/charts/smallblocktest/templates/deployment.yaml b/charts/physims/charts/smallblocktest/templates/deployment.yaml
index 2fe4a025a64a719555cf2abd89b7f498fb3c8ee4..aafb16e054f78a4eebd8b6b23ed65bf91f1556fd 100644
--- a/charts/physims/charts/smallblocktest/templates/deployment.yaml
+++ b/charts/physims/charts/smallblocktest/templates/deployment.yaml
@@ -30,7 +30,6 @@ spec:
           {{- toYaml .Values.securityContext | nindent 12 }}
         ports:
         - containerPort: 80
-          name: oai-smallblock
         env:
         - name: OPENAIR_DIR
           value: /opt/oai-physim
diff --git a/charts/physims/charts/smallblocktest/values.yaml b/charts/physims/charts/smallblocktest/values.yaml
index f933a978fd20515f5226e4f1232b77cdce3cb7f0..f08db5501a9c822290e42fdb1bbbbefcc710c5d4 100644
--- a/charts/physims/charts/smallblocktest/values.yaml
+++ b/charts/physims/charts/smallblocktest/values.yaml
@@ -4,12 +4,7 @@
 
 replicaCount: 1
 
-namespace: "OAICICD_PROJECT"
-
 image:
-  registry: local
-  repository: image-registry.openshift-image-registry.svc:5000/OAICICD_PROJECT/oai-physim
-  version: temp
   # pullPolicy: IfNotPresent or Never or Always
   pullPolicy: Always
 
diff --git a/charts/physims/charts/ulsim/templates/deployment.yaml b/charts/physims/charts/ulsim/templates/deployment.yaml
index c7a10c0448750857d7a6520b2b6f757faa31ae7f..3185b074b257db4e200e1a2bf7b8bacc3febac7f 100644
--- a/charts/physims/charts/ulsim/templates/deployment.yaml
+++ b/charts/physims/charts/ulsim/templates/deployment.yaml
@@ -30,7 +30,6 @@ spec:
           {{- toYaml .Values.securityContext | nindent 12 }}
         ports:
         - containerPort: 80
-          name: oai-ulsim
         env:
         - name: OPENAIR_DIR
           value: /opt/oai-physim
diff --git a/charts/physims/charts/ulsim/values.yaml b/charts/physims/charts/ulsim/values.yaml
index d25b6fc2a5351e6208124d06532dd4377d0d913b..3e625f02c6ef834b422af78b40b431a00d8cb5e6 100644
--- a/charts/physims/charts/ulsim/values.yaml
+++ b/charts/physims/charts/ulsim/values.yaml
@@ -4,12 +4,7 @@
 
 replicaCount: 1
 
-namespace: "OAICICD_PROJECT"
-
 image:
-  registry: local
-  repository: image-registry.openshift-image-registry.svc:5000/OAICICD_PROJECT/oai-physim
-  version: temp
   # pullPolicy: IfNotPresent or Never or Always
   pullPolicy: Always
 
diff --git a/charts/physims/values.yaml b/charts/physims/values.yaml
index a4581465f130d2ff26b847fec365b6fe31af1e1d..70923badc529e3b0d56705d0ef52b2667fee835f 100644
--- a/charts/physims/values.yaml
+++ b/charts/physims/values.yaml
@@ -4,10 +4,13 @@
 
 global:
   serviceAccountName: oai-physim-sa
-  namespace: "OAICICD_PROJECT"
+  namespace: "oaicicd-ran"
   image:
-    repository: image-registry.openshift-image-registry.svc:5000/OAICICD_PROJECT/oai-physim
-    version: TAG
+    registry: local
+    repository: image-registry.openshift-image-registry.svc:5000/oaicicd-ran/oai-physim
+    version: ci-physim-cleanup
+    # pullPolicy: IfNotPresent or Never or Always
+    pullPolicy: Always
 
 ## Declaring values specific to coressponding physim to overwrite