diff --git a/openshift/README.md b/openshift/README.md
index e5a2b00bdd..07470a38df 100644
--- a/openshift/README.md
+++ b/openshift/README.md
@@ -49,11 +49,11 @@ will need `etc-pki-entitlement` inside the container image.
 To import `etc-pki-entitlement` in your project follow this
 [guide](https://docs.openshift.com/container-platform/4.14/cicd/builds/running-entitled-builds.html#builds-source-secrets-entitlements_running-entitled-builds)
 
-In case you have difficulties in following it then you can copy the
-certificates from an RHEL9 host
+You can do it as a kubeadmin/system admin user or you should have the rights 
+to read secrets from `openshift-config-managed` project
 
 ```bash
-oc create secret generic etc-pki-entitlement --from-file /etc/pki/entitlement/{NUMBER_ON_YOUR_COMPUTER}.pem --from-file /etc/pki/entitlement/{NUMBER_ON_YOUR_COMPUTER}-key.pem
+oc get secret etc-pki-entitlement -n openshift-config-managed -o json |   jq 'del(.metadata.resourceVersion)' | jq 'del(.metadata.creationTimestamp)' |   jq 'del(.metadata.uid)' | jq 'del(.metadata.namespace)' |   oc create -f -
 ```
 
 # 2. Build of `base` shared image
diff --git a/openshift/oai-clang-bc.yaml b/openshift/oai-clang-bc.yaml
index ee7a760fcc..aff54929c5 100644
--- a/openshift/oai-clang-bc.yaml
+++ b/openshift/oai-clang-bc.yaml
@@ -19,15 +19,16 @@
 # *      contact@openairinterface.org
 # */
 #---------------------------------------------------------------------
-
+## Resource consumption 3Gi, 5CPU
 kind: BuildConfig
 apiVersion: build.openshift.io/v1
 metadata:
   name: "oai-clang"
+  namespace: "oaicicd-ran"
 spec:
-    runPolicy: "Serial"
     nodeSelector:
-        kubernetes.io/hostname: demophon
+        node-role.kubernetes.io/fhi72-intel3: ""
+    runPolicy: "Serial"
     source:
         type: "Binary"
     strategy:
diff --git a/openshift/oai-enb-bc.yaml b/openshift/oai-enb-bc.yaml
index 215faf675e..11f20c4da6 100644
--- a/openshift/oai-enb-bc.yaml
+++ b/openshift/oai-enb-bc.yaml
@@ -25,6 +25,15 @@ apiVersion: build.openshift.io/v1
 metadata:
     name: "oai-enb"
 spec:
+    resources:
+      limits:
+        cpu: 2
+        memory: 2Gi
+      requests:
+        cpu: 0.5
+        memory: 1Gi
+    nodeSelector:
+        node-role.kubernetes.io/ran-build: ""
     runPolicy: "Serial"
     source:
         type: "Binary"
diff --git a/openshift/oai-gnb-aw2s-bc.yaml b/openshift/oai-gnb-aw2s-bc.yaml
index 2edbd73f87..520b442982 100644
--- a/openshift/oai-gnb-aw2s-bc.yaml
+++ b/openshift/oai-gnb-aw2s-bc.yaml
@@ -24,7 +24,17 @@ kind: BuildConfig
 apiVersion: build.openshift.io/v1
 metadata:
   name: "oai-gnb-aw2s"
+  namespace: "oaicicd-ran"
 spec:
+    resources:
+      limits:
+        cpu: 2
+        memory: 2Gi
+      requests:
+        cpu: 0.5
+        memory: 1Gi
+    nodeSelector:
+        node-role.kubernetes.io/fhi72: ""
     runPolicy: "Serial"
     source:
         type: "Binary"
diff --git a/openshift/oai-gnb-bc.yaml b/openshift/oai-gnb-bc.yaml
index 693cbfd784..29314f2b50 100644
--- a/openshift/oai-gnb-bc.yaml
+++ b/openshift/oai-gnb-bc.yaml
@@ -24,7 +24,17 @@ kind: BuildConfig
 apiVersion: build.openshift.io/v1
 metadata:
   name: "oai-gnb"
+  namespace: "oaicicd-ran"
 spec:
+    resources:
+      limits:
+        cpu: 2
+        memory: 2Gi
+      requests:
+        cpu: 0.5
+        memory: 1Gi
+    nodeSelector:
+        node-role.kubernetes.io/ran-build: ""
     runPolicy: "Serial"
     source:
         type: "Binary"
diff --git a/openshift/oai-gnb-fhi72-bc.yaml b/openshift/oai-gnb-fhi72-bc.yaml
index 0e453ae379..14b9e7fbbe 100644
--- a/openshift/oai-gnb-fhi72-bc.yaml
+++ b/openshift/oai-gnb-fhi72-bc.yaml
@@ -24,7 +24,17 @@ kind: BuildConfig
 apiVersion: build.openshift.io/v1
 metadata:
   name: "oai-gnb-fhi72"
+  namespace: "oaicicd-ran"
 spec:
+    resources:
+      limits:
+        cpu: 2
+        memory: 2Gi
+      requests:
+        cpu: 0.5
+        memory: 1Gi
+    nodeSelector:
+        node-role.kubernetes.io/fhi72: ""
     runPolicy: "Serial"
     source:
         type: "Binary"
diff --git a/openshift/oai-lte-ue-bc.yaml b/openshift/oai-lte-ue-bc.yaml
index 7bb41456c6..b2db0b5085 100644
--- a/openshift/oai-lte-ue-bc.yaml
+++ b/openshift/oai-lte-ue-bc.yaml
@@ -24,7 +24,17 @@ kind: BuildConfig
 apiVersion: build.openshift.io/v1
 metadata:
     name: "oai-lte-ue"
+    namespace: "oaicicd-ran"
 spec:
+    resources:
+      limits:
+        cpu: 2
+        memory: 2Gi
+      requests:
+        cpu: 0.5
+        memory: 1Gi
+    nodeSelector:
+        node-role.kubernetes.io/ran-base: ""
     runPolicy: "Serial"
     source:
         type: "Binary"
diff --git a/openshift/oai-nr-cuup-bc.yaml b/openshift/oai-nr-cuup-bc.yaml
index eceff70348..fec59b1d5a 100644
--- a/openshift/oai-nr-cuup-bc.yaml
+++ b/openshift/oai-nr-cuup-bc.yaml
@@ -25,6 +25,15 @@ apiVersion: build.openshift.io/v1
 metadata:
   name: "oai-nr-cuup"
 spec:
+    resources:
+      limits:
+        cpu: 1
+        memory: 2Gi
+      requests:
+        cpu: 0.5
+        memory: 1Gi
+    nodeSelector:
+        node-role.kubernetes.io/ran-build: ""
     runPolicy: "Serial"
     source:
         type: "Binary"
diff --git a/openshift/oai-nr-ue-bc.yaml b/openshift/oai-nr-ue-bc.yaml
index 4c4bf3f9c6..0a04fbb7c8 100644
--- a/openshift/oai-nr-ue-bc.yaml
+++ b/openshift/oai-nr-ue-bc.yaml
@@ -24,7 +24,17 @@ kind: BuildConfig
 apiVersion: build.openshift.io/v1
 metadata:
     name: "oai-nr-ue"
+    namespace: "oaicicd-ran"
 spec:
+    resources:
+      limits:
+        cpu: 2
+        memory: 2Gi
+      requests:
+        cpu: 0.5
+        memory: 1Gi
+    nodeSelector:
+        node-role.kubernetes.io/fhi72-intel3: ""
     runPolicy: "Serial"
     source:
         type: "Binary"
diff --git a/openshift/oai-physim-bc.yaml b/openshift/oai-physim-bc.yaml
index 74be4013c2..f564c1905a 100644
--- a/openshift/oai-physim-bc.yaml
+++ b/openshift/oai-physim-bc.yaml
@@ -19,15 +19,17 @@
 # *      contact@openairinterface.org
 # */
 #---------------------------------------------------------------------
+### Resource consumption 12Gi, 19CPU (SMT ENABLED)
 
 kind: BuildConfig
 apiVersion: build.openshift.io/v1
 metadata:
   name: "oai-physim"
+  namespace: "oaicicd-ran"
 spec:
     runPolicy: "Serial"
     nodeSelector:
-        kubernetes.io/hostname: demophon
+        node-role.kubernetes.io/ran-base: ""
     source:
         type: "Binary"
     strategy:
diff --git a/openshift/ran-base-bc.yaml b/openshift/ran-base-bc.yaml
index 5707e64abb..77b6238c60 100644
--- a/openshift/ran-base-bc.yaml
+++ b/openshift/ran-base-bc.yaml
@@ -20,14 +20,16 @@
 # */
 #---------------------------------------------------------------------
 #
+### Resource consumption 16Gi, 10CPU
 kind: BuildConfig
 apiVersion: build.openshift.io/v1
 metadata:
   name: "ran-base"
+  namespace: "oaicicd-ran"
 spec:
     runPolicy: "Serial"
     nodeSelector:
-        kubernetes.io/hostname: acamas
+        node-role.kubernetes.io/ran-base: ""
     source:
         type: "Binary"
         secrets:
diff --git a/openshift/ran-build-bc.yaml b/openshift/ran-build-bc.yaml
index 93479a59f6..210ae2dbde 100644
--- a/openshift/ran-build-bc.yaml
+++ b/openshift/ran-build-bc.yaml
@@ -20,14 +20,16 @@
 # */
 #---------------------------------------------------------------------
 #
+### Resource consumption 2.5Gi, 17CPU (SMT ENABLED)
 kind: BuildConfig
 apiVersion: build.openshift.io/v1
 metadata:
   name: "ran-build"
+  namespace: "oaicicd-ran"
 spec:
     runPolicy: "Serial"
     nodeSelector:
-        kubernetes.io/hostname: acamas
+        node-role.kubernetes.io/ran-build: ""
     source:
         type: "Binary"
     strategy:
diff --git a/openshift/ran-build-fhi72-bc.yaml b/openshift/ran-build-fhi72-bc.yaml
index 35a7bd55b0..be75b4ebb2 100644
--- a/openshift/ran-build-fhi72-bc.yaml
+++ b/openshift/ran-build-fhi72-bc.yaml
@@ -20,14 +20,16 @@
 # */
 #---------------------------------------------------------------------
 #
+### Resource consumption 5Gi, 9CPU
 kind: BuildConfig
 apiVersion: build.openshift.io/v1
 metadata:
   name: "ran-build-fhi72"
+  namespace: "oaicicd-ran"
 spec:
     runPolicy: "Serial"
     nodeSelector:
-        kubernetes.io/hostname: demophon
+        node-role.kubernetes.io/fhi72: ""
     source:
         type: "Binary"
     strategy: