diff --git a/charts/physims/charts/dlsim.100rb+tm2/templates/deployment.yaml b/charts/physims/charts/dlsim.100rb+tm2/templates/deployment.yaml
index 1339f4dcc0..88bf277a03 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 9b60e29f30..f3d1aa3d74 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 168b58748a..f74f504727 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 bb63644c2b..e36679ec2b 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 74f78e7a0b..8df3df5c46 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 b3cc476cf8..0ac20e6dd3 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 cfe5c1f615..1016dbef56 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 b7ef28f47a..cb32095f76 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 2337ad98fd..72ae0406d0 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 9829ecf256..4b9db13d7e 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 dc3ebb34d6..847a1e1aee 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 c414d58132..8c1814f19d 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 5d38cf21c0..c79eaf01a2 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 cdc58817d9..5bb48ad15d 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 2c15b20410..40c1a94efe 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 b9c5cfdd79..ed0f8f1570 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 5a3846b2de..5632762245 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 81f23745bd..513443deaa 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 b23186f267..7b44b982de 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 d0eb02d1f8..512e212c07 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 a17d3297d8..9cb5f6ebb5 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 fb1a4ac61e..6bea044b86 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 dba6cc16c0..93789de637 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 2159b3935d..fce72ebc35 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 77fe0963ac..d4c869278b 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 8ca812bf40..d44b2b6463 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 efb011a7f6..b0529c818d 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 801252e0ea..7bf59eed4f 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 ab68afd712..3d44bda9b8 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 c21b151ad1..e8d6ecf7ce 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 6eab0521e1..55bdcd6158 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 0987e041e0..56c25fbbc3 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 e45dc95be5..dcae7a2b66 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 5e48777020..3119950e20 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 e75785772b..0536fb03b6 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 ccb860ee98..20dac8ebf7 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 e0751e8ec4..f7195dd572 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 2fe4a025a6..aafb16e054 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 f933a978fd..f08db5501a 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 c7a10c0448..3185b074b2 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 d25b6fc2a5..3e625f02c6 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 a4581465f1..70923badc5 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