diff --git a/ci-scripts/cls_physim1.py b/ci-scripts/cls_physim1.py
index 0464681b1d1ffcdd46016a729d47c665b2ebd23f..0f187a463389cac1d49e429806601031e35df475 100644
--- a/ci-scripts/cls_physim1.py
+++ b/ci-scripts/cls_physim1.py
@@ -173,7 +173,7 @@ class PhySim:
 		else:
 			logging.debug('\u001B[1m Podman Login to OC Cluster Registry Successfully\u001B[0m')
 		time.sleep(2)
-		mySSH.command('oc create -f openshift/oai-physim-image-stream.yml || true', '\$', 30)
+		mySSH.command('oc create -f openshift/oai-physim-is.yml || true', '\$', 30)
 		if mySSH.getBefore().count('(AlreadyExists):') == 0 and mySSH.getBefore().count('created') == 0:
 			logging.error(f'\u001B[1m Image Stream "oai-physim" Creation Failed on OC Cluster {ocProjectName}\u001B[0m')
 			mySSH.command('sudo podman logout https://default-route-openshift-image-registry.apps.oai.cs.eurecom.fr/', '\$', 6)
diff --git a/openshift/oai-physim-bc.yaml b/openshift/oai-physim-bc.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..050dd8bca8f4d77b5651cc15849c8757101a5a19
--- /dev/null
+++ b/openshift/oai-physim-bc.yaml
@@ -0,0 +1,41 @@
+#/*
+# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+# * contributor license agreements.  See the NOTICE file distributed with
+# * this work for additional information regarding copyright ownership.
+# * The OpenAirInterface Software Alliance licenses this file to You under
+# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+# * except in compliance with the License.
+# * You may obtain a copy of the License at
+# *
+# *      http://www.openairinterface.org/?page_id=698
+# *
+# * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+# *-------------------------------------------------------------------------------
+# * For more information about the OpenAirInterface (OAI) Software Alliance:
+# *      contact@openairinterface.org
+# */
+#---------------------------------------------------------------------
+
+kind: BuildConfig
+apiVersion: build.openshift.io/v1
+metadata:
+  name: "oai-physim"
+spec:
+    runPolicy: "Serial"
+    source:
+        type: "Binary"
+    strategy:
+        dockerStrategy:
+            dockerfilePath: "docker/Dockerfile.phySim.rhel8.2"
+            from:
+                kind: ImageStreamTag
+                namespace: oaicicd-ran
+                name: oai-ran-base:latest
+    output:
+        to:
+            kind: "ImageStreamTag"
+            name: "oai-physim:latest"
diff --git a/openshift/oai-physim-image-stream.yml b/openshift/oai-physim-is.yaml
similarity index 96%
rename from openshift/oai-physim-image-stream.yml
rename to openshift/oai-physim-is.yaml
index 9ef338f139a347f434badb8fc137e55bb497b4d5..f2c7853540e743a82808819b31faae5ca6ec94eb 100644
--- a/openshift/oai-physim-image-stream.yml
+++ b/openshift/oai-physim-is.yaml
@@ -24,6 +24,9 @@ apiVersion: image.openshift.io/v1
 kind: ImageStream
 metadata:
   name: oai-physim
+  namespace: oaicicd-ran
 spec:
   lookupPolicy:
     local: true
+status:
+  tag: latest