diff --git a/docker/Dockerfile.eNB.rhel7.oc4-4 b/docker/Dockerfile.eNB.rhel7.oc4-4
index 6dbf4f1749..85c2a17ead 100644
--- a/docker/Dockerfile.eNB.rhel7.oc4-4
+++ b/docker/Dockerfile.eNB.rhel7.oc4-4
@@ -25,7 +25,7 @@
 #
 #---------------------------------------------------------------------
 
-FROM image-registry.openshift-image-registry.svc:5000/oaicicd-ran-tmp/oai-ran:ci-ran-tmp AS enb-build 
+FROM image-registry.openshift-image-registry.svc:5000/oai/oai-ran:latest AS enb-build 
 
 
 WORKDIR /oai-enb
diff --git a/docker/Dockerfile.eNB.rhel8.2.oc4-4 b/docker/Dockerfile.eNB.rhel8.2.oc4-4
index d62ed59ad6..b3d9b68af8 100644
--- a/docker/Dockerfile.eNB.rhel8.2.oc4-4
+++ b/docker/Dockerfile.eNB.rhel8.2.oc4-4
@@ -25,7 +25,7 @@
 #
 #---------------------------------------------------------------------
 
-FROM image-registry.openshift-image-registry.svc:5000/oaicicd-ran-tmp/oai-ran:tmp-rhel8-latest AS enb-build 
+FROM image-registry.openshift-image-registry.svc:5000/oai/oai-ran:rhel8-latest AS enb-build 
 
 
 WORKDIR /oai-ran
diff --git a/docker/Dockerfile.gNB.rhel7.oc4-4 b/docker/Dockerfile.gNB.rhel7.oc4-4
index 42d6a8e731..5165dd9715 100644
--- a/docker/Dockerfile.gNB.rhel7.oc4-4
+++ b/docker/Dockerfile.gNB.rhel7.oc4-4
@@ -25,7 +25,7 @@
 #
 #---------------------------------------------------------------------
 
-FROM image-registry.openshift-image-registry.svc:5000/oaicicd-ran-tmp/oai-ran:ci-ran-tmp AS gnb-build 
+FROM image-registry.openshift-image-registry.svc:5000/oai/oai-ran:latest AS gnb-build 
 
 
 WORKDIR /oai-gnb
diff --git a/docker/Dockerfile.gNB.rhel8.2.oc4-4 b/docker/Dockerfile.gNB.rhel8.2.oc4-4
index 1a7af914cb..94d8ca2ea8 100644
--- a/docker/Dockerfile.gNB.rhel8.2.oc4-4
+++ b/docker/Dockerfile.gNB.rhel8.2.oc4-4
@@ -25,7 +25,7 @@
 #
 #---------------------------------------------------------------------
 
-FROM image-registry.openshift-image-registry.svc:5000/oaicicd-ran-tmp/oai-ran:tmp-rhel8-latest AS gnb-build 
+FROM image-registry.openshift-image-registry.svc:5000/oai/oai-ran:rhel8-latest AS gnb-build 
 
 
 WORKDIR /oai-ran
diff --git a/docker/Dockerfile.lteUE.rhel8.2.oc4-4 b/docker/Dockerfile.lteUE.rhel8.2.oc4-4
index 2cb2448ec2..431c8caa7f 100644
--- a/docker/Dockerfile.lteUE.rhel8.2.oc4-4
+++ b/docker/Dockerfile.lteUE.rhel8.2.oc4-4
@@ -25,7 +25,7 @@
 #
 #---------------------------------------------------------------------
 
-FROM image-registry.openshift-image-registry.svc:5000/oaicicd-ran-tmp/oai-ran:tmp-rhel8-latest AS lte-ue-build 
+FROM image-registry.openshift-image-registry.svc:5000/oai/oai-ran:rhel8-latest AS lte-ue-build 
 
 
 WORKDIR /oai-ran
diff --git a/docker/Dockerfile.nrUE.rhel8.2.oc4-4 b/docker/Dockerfile.nrUE.rhel8.2.oc4-4
index df8ee90fed..0787cb481e 100644
--- a/docker/Dockerfile.nrUE.rhel8.2.oc4-4
+++ b/docker/Dockerfile.nrUE.rhel8.2.oc4-4
@@ -25,7 +25,7 @@
 #
 #---------------------------------------------------------------------
 
-FROM image-registry.openshift-image-registry.svc:5000/oaicicd-ran-tmp/oai-ran:tmp-rhel8-latest AS nr-ue-build 
+FROM image-registry.openshift-image-registry.svc:5000/oai/oai-ran:rhel8-latest AS nr-ue-build 
 
 
 WORKDIR /oai-ran
diff --git a/openshift/oai-enb-build-config.yml b/openshift/oai-enb-build-config.yml
index 855710cd87..3f6875c50d 100644
--- a/openshift/oai-enb-build-config.yml
+++ b/openshift/oai-enb-build-config.yml
@@ -30,7 +30,7 @@ spec:
         #still needed for the target image
         git:
             uri: "https://gitlab.eurecom.fr/oai/openairinterface5g.git"
-            ref: "rh_ci_oc"
+            ref: "develop"
             httpProxy: http://proxy.eurecom.fr:8080
             httpsProxy: https://proxy.eurecom.fr:8080
         secrets:
@@ -52,4 +52,4 @@ spec:
     output:
         to:
             kind: "ImageStreamTag"
-            name: "oai-enb:ci-ran-tmp"
+            name: "oai-enb:latest"
diff --git a/openshift/oai-enb-image-stream.yml b/openshift/oai-enb-image-stream.yml
index 7bee038f83..94ee13e50f 100644
--- a/openshift/oai-enb-image-stream.yml
+++ b/openshift/oai-enb-image-stream.yml
@@ -24,7 +24,7 @@ apiVersion: v1
 kind: ImageStream
 metadata:
     name: oai-enb
-    namespace: oaicicd-ran-tmp
+    namespace: oai
 status:
-    tag: ci-ran-tmp
+    tag: latest
 
diff --git a/openshift/oai-enb-rh8-build-config.yml b/openshift/oai-enb-rh8-build-config.yml
index 7c03cce161..e715fc5733 100644
--- a/openshift/oai-enb-rh8-build-config.yml
+++ b/openshift/oai-enb-rh8-build-config.yml
@@ -30,7 +30,7 @@ spec:
         #still needed for the target image
         git:
             uri: "https://gitlab.eurecom.fr/oai/openairinterface5g.git"
-            ref: "rh_ci_oc"
+            ref: "develop"
             httpProxy: http://proxy.eurecom.fr:8080
             httpsProxy: https://proxy.eurecom.fr:8080
     strategy:
@@ -45,4 +45,4 @@ spec:
     output:
         to:
             kind: "ImageStreamTag"
-            name: "oai-enb:tmp-rhel8-latest"
+            name: "oai-enb:rhel8-latest"
diff --git a/openshift/oai-enb-rh8-image-stream.yml b/openshift/oai-enb-rh8-image-stream.yml
index fe8dabe756..9d1cfebd54 100644
--- a/openshift/oai-enb-rh8-image-stream.yml
+++ b/openshift/oai-enb-rh8-image-stream.yml
@@ -24,7 +24,7 @@ apiVersion: v1
 kind: ImageStream
 metadata:
     name: oai-enb
-    namespace: oaicicd-ran-tmp
+    namespace: oai
 status:
-    tag: tmp-rhel8-latest
+    tag: rhel8-latest
 
diff --git a/openshift/oai-gnb-build-config.yml b/openshift/oai-gnb-build-config.yml
index c720261aee..b0c99959d1 100644
--- a/openshift/oai-gnb-build-config.yml
+++ b/openshift/oai-gnb-build-config.yml
@@ -30,7 +30,7 @@ spec:
         #still needed for the target image
         git:
             uri: "https://gitlab.eurecom.fr/oai/openairinterface5g.git"
-            ref: "rh_ci_oc"
+            ref: "develop"
             httpProxy: http://proxy.eurecom.fr:8080
             httpsProxy: https://proxy.eurecom.fr:8080
         secrets:
@@ -52,4 +52,4 @@ spec:
     output:
         to:
             kind: "ImageStreamTag"
-            name: "oai-gnb:ci-ran-tmp"
+            name: "oai-gnb:latest"
diff --git a/openshift/oai-gnb-image-stream.yml b/openshift/oai-gnb-image-stream.yml
index 4be858a10e..22a6c157d2 100644
--- a/openshift/oai-gnb-image-stream.yml
+++ b/openshift/oai-gnb-image-stream.yml
@@ -24,7 +24,7 @@ apiVersion: v1
 kind: ImageStream
 metadata:
     name: oai-gnb
-    namespace: oaicicd-ran-tmp
+    namespace: oai
 status:
-    tag: ci-ran-tmp
+    tag: latest
 
diff --git a/openshift/oai-gnb-rh8-build-config.yml b/openshift/oai-gnb-rh8-build-config.yml
index 4ca9073f0b..aa3553c1e4 100644
--- a/openshift/oai-gnb-rh8-build-config.yml
+++ b/openshift/oai-gnb-rh8-build-config.yml
@@ -30,7 +30,7 @@ spec:
         #still needed for the target image
         git:
             uri: "https://gitlab.eurecom.fr/oai/openairinterface5g.git"
-            ref: "rh_ci_oc"
+            ref: "develop"
             httpProxy: http://proxy.eurecom.fr:8080
             httpsProxy: https://proxy.eurecom.fr:8080
     strategy:
@@ -45,4 +45,4 @@ spec:
     output:
         to:
             kind: "ImageStreamTag"
-            name: "oai-gnb:tmp-rhel8-latest"
+            name: "oai-gnb:rhel8-latest"
diff --git a/openshift/oai-gnb-rh8-image-stream.yml b/openshift/oai-gnb-rh8-image-stream.yml
index 8b98d980ef..2e04e94f5b 100644
--- a/openshift/oai-gnb-rh8-image-stream.yml
+++ b/openshift/oai-gnb-rh8-image-stream.yml
@@ -24,7 +24,7 @@ apiVersion: v1
 kind: ImageStream
 metadata:
     name: oai-gnb
-    namespace: oaicicd-ran-tmp
+    namespace: oai
 status:
-    tag: tmp-rhel8-latest
+    tag: rhel8-latest
 
diff --git a/openshift/oai-lte-ue-rh8-build-config.yml b/openshift/oai-lte-ue-rh8-build-config.yml
index 6469eff0b7..f077e4cb26 100644
--- a/openshift/oai-lte-ue-rh8-build-config.yml
+++ b/openshift/oai-lte-ue-rh8-build-config.yml
@@ -30,7 +30,7 @@ spec:
         #still needed for the target image
         git:
             uri: "https://gitlab.eurecom.fr/oai/openairinterface5g.git"
-            ref: "rh_ci_oc"
+            ref: "develop"
             httpProxy: http://proxy.eurecom.fr:8080
             httpsProxy: https://proxy.eurecom.fr:8080
     strategy:
@@ -45,4 +45,4 @@ spec:
     output:
         to:
             kind: "ImageStreamTag"
-            name: "oai-lte-ue:tmp-rhel8-latest"
+            name: "oai-lte-ue:rhel8-latest"
diff --git a/openshift/oai-lte-ue-rh8-image-stream.yml b/openshift/oai-lte-ue-rh8-image-stream.yml
index da58ad5a0f..09aeb2a766 100644
--- a/openshift/oai-lte-ue-rh8-image-stream.yml
+++ b/openshift/oai-lte-ue-rh8-image-stream.yml
@@ -24,7 +24,7 @@ apiVersion: v1
 kind: ImageStream
 metadata:
     name: oai-lte-ue
-    namespace: oaicicd-ran-tmp
+    namespace: oai
 status:
-    tag: tmp-rhel8-latest
+    tag: rhel8-latest
 
diff --git a/openshift/oai-nr-ue-rh8-build-config.yml b/openshift/oai-nr-ue-rh8-build-config.yml
index 4fc91d9d3b..b3367f6ab6 100644
--- a/openshift/oai-nr-ue-rh8-build-config.yml
+++ b/openshift/oai-nr-ue-rh8-build-config.yml
@@ -30,7 +30,7 @@ spec:
         #still needed for the target image
         git:
             uri: "https://gitlab.eurecom.fr/oai/openairinterface5g.git"
-            ref: "rh_ci_oc"
+            ref: "develop"
             httpProxy: http://proxy.eurecom.fr:8080
             httpsProxy: https://proxy.eurecom.fr:8080
     strategy:
@@ -45,4 +45,4 @@ spec:
     output:
         to:
             kind: "ImageStreamTag"
-            name: "oai-nr-ue:tmp-rhel8-latest"
+            name: "oai-nr-ue:rhel8-latest"
diff --git a/openshift/oai-nr-ue-rh8-image-stream.yml b/openshift/oai-nr-ue-rh8-image-stream.yml
index cb456c9cc9..e61cc0dfde 100644
--- a/openshift/oai-nr-ue-rh8-image-stream.yml
+++ b/openshift/oai-nr-ue-rh8-image-stream.yml
@@ -24,7 +24,7 @@ apiVersion: v1
 kind: ImageStream
 metadata:
     name: oai-nr-ue
-    namespace: oaicicd-ran-tmp
+    namespace: oai
 status:
-    tag: tmp-rhel8-latest
+    tag: rhel8-latest
 
diff --git a/openshift/oai-ran-build-config.yml b/openshift/oai-ran-build-config.yml
index 94097f1396..39d7a40f6d 100644
--- a/openshift/oai-ran-build-config.yml
+++ b/openshift/oai-ran-build-config.yml
@@ -29,7 +29,7 @@ spec:
     source:
         git:
             uri: "https://gitlab.eurecom.fr/oai/openairinterface5g.git"
-            ref: "rh_ci_oc"
+            ref: "develop"
             httpProxy: http://proxy.eurecom.fr:8080
             httpsProxy: https://proxy.eurecom.fr:8080
         secrets:
@@ -49,4 +49,4 @@ spec:
     output:
         to:
             kind: "ImageStreamTag"
-            name: "oai-ran:ci-ran-tmp"
+            name: "oai-ran:latest"
diff --git a/openshift/oai-ran-image-stream.yml b/openshift/oai-ran-image-stream.yml
index df5cb70a5c..e1ef9d0b31 100644
--- a/openshift/oai-ran-image-stream.yml
+++ b/openshift/oai-ran-image-stream.yml
@@ -24,7 +24,7 @@ apiVersion: v1
 kind: ImageStream
 metadata:
     name: oai-ran
-    namespace: oaicicd-ran-tmp
+    namespace: oai
 status:
-    tag: ci-ran-tmp
+    tag: latest
 
diff --git a/openshift/oai-ran-rh8-build-config.yml b/openshift/oai-ran-rh8-build-config.yml
index ab5c73b11a..3d27b7cb5c 100644
--- a/openshift/oai-ran-rh8-build-config.yml
+++ b/openshift/oai-ran-rh8-build-config.yml
@@ -29,7 +29,7 @@ spec:
     source:
         git:
             uri: "https://gitlab.eurecom.fr/oai/openairinterface5g.git"
-            ref: "rh_ci_oc"
+            ref: "develop"
             httpProxy: http://proxy.eurecom.fr:8080
             httpsProxy: https://proxy.eurecom.fr:8080
         secrets:
@@ -54,4 +54,4 @@ spec:
     output:
         to:
             kind: "ImageStreamTag"
-            name: "oai-ran:tmp-rhel8-latest"
+            name: "oai-ran:rhel8-latest"
diff --git a/openshift/oai-ran-rh8-image-stream.yml b/openshift/oai-ran-rh8-image-stream.yml
index 5b8b397aaa..f6f4f8614f 100644
--- a/openshift/oai-ran-rh8-image-stream.yml
+++ b/openshift/oai-ran-rh8-image-stream.yml
@@ -24,7 +24,7 @@ apiVersion: v1
 kind: ImageStream
 metadata:
     name: oai-ran
-    namespace: oaicicd-ran-tmp
+    namespace: oai
 status:
-    tag: tmp-rhel8-latest
+    tag: rhel8-latest