diff --git a/ci-operator/config/openshift-priv/cluster-capi-operator/openshift-priv-cluster-capi-operator-main.yaml b/ci-operator/config/openshift-priv/cluster-capi-operator/openshift-priv-cluster-capi-operator-main.yaml
index 00dee0af4914..63afcff7a0d7 100644
--- a/ci-operator/config/openshift-priv/cluster-capi-operator/openshift-priv-cluster-capi-operator-main.yaml
+++ b/ci-operator/config/openshift-priv/cluster-capi-operator/openshift-priv-cluster-capi-operator-main.yaml
@@ -44,8 +44,8 @@ resources:
     limits:
       memory: 4Gi
     requests:
-      cpu: 100m
-      memory: 200Mi
+      cpu: 200m
+      memory: 400Mi
 tests:
 - as: lint
   commands: make lint
diff --git a/ci-operator/config/openshift-priv/cluster-capi-operator/openshift-priv-cluster-capi-operator-release-4.17.yaml b/ci-operator/config/openshift-priv/cluster-capi-operator/openshift-priv-cluster-capi-operator-release-4.17.yaml
index 180583c09370..80a9ba941af5 100644
--- a/ci-operator/config/openshift-priv/cluster-capi-operator/openshift-priv-cluster-capi-operator-release-4.17.yaml
+++ b/ci-operator/config/openshift-priv/cluster-capi-operator/openshift-priv-cluster-capi-operator-release-4.17.yaml
@@ -45,8 +45,8 @@ resources:
     limits:
       memory: 4Gi
     requests:
-      cpu: 100m
-      memory: 200Mi
+      cpu: 200m
+      memory: 400Mi
 tests:
 - as: lint
   commands: make lint
diff --git a/ci-operator/config/openshift-priv/cluster-capi-operator/openshift-priv-cluster-capi-operator-release-4.18.yaml b/ci-operator/config/openshift-priv/cluster-capi-operator/openshift-priv-cluster-capi-operator-release-4.18.yaml
index d8ec53ba2697..147ba33f238b 100644
--- a/ci-operator/config/openshift-priv/cluster-capi-operator/openshift-priv-cluster-capi-operator-release-4.18.yaml
+++ b/ci-operator/config/openshift-priv/cluster-capi-operator/openshift-priv-cluster-capi-operator-release-4.18.yaml
@@ -44,8 +44,8 @@ resources:
     limits:
       memory: 4Gi
     requests:
-      cpu: 100m
-      memory: 200Mi
+      cpu: 200m
+      memory: 400Mi
 tests:
 - as: lint
   commands: make lint
diff --git a/ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-release-4.17.yaml b/ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-release-4.17.yaml
index dd79a1c1eef5..9562f25f9629 100644
--- a/ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-release-4.17.yaml
+++ b/ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-release-4.17.yaml
@@ -44,8 +44,8 @@ resources:
     limits:
       memory: 4Gi
     requests:
-      cpu: 100m
-      memory: 200Mi
+      cpu: 200m
+      memory: 400Mi
 tests:
 - as: lint
   commands: make lint
diff --git a/ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-release-4.18.yaml b/ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-release-4.18.yaml
index 2d0508bf3130..0832398a480f 100644
--- a/ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-release-4.18.yaml
+++ b/ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-release-4.18.yaml
@@ -43,8 +43,8 @@ resources:
     limits:
       memory: 4Gi
     requests:
-      cpu: 100m
-      memory: 200Mi
+      cpu: 200m
+      memory: 400Mi
 tests:
 - as: lint
   commands: make lint
diff --git a/ci-operator/config/stolostron/multicluster-global-hub/stolostron-multicluster-global-hub-main.yaml b/ci-operator/config/stolostron/multicluster-global-hub/stolostron-multicluster-global-hub-main.yaml
index fa3cd3634396..4a6659c1ca1b 100644
--- a/ci-operator/config/stolostron/multicluster-global-hub/stolostron-multicluster-global-hub-main.yaml
+++ b/ci-operator/config/stolostron/multicluster-global-hub/stolostron-multicluster-global-hub-main.yaml
@@ -3,10 +3,6 @@ base_images:
     name: ubi-minimal
     namespace: ocp
     tag: "9"
-  stolostron_builder_go1.21-linux:
-    name: builder
-    namespace: stolostron
-    tag: go1.21-linux
   stolostron_builder_go1.22-linux:
     name: builder
     namespace: stolostron
@@ -20,23 +16,23 @@ images:
 - dockerfile_path: operator/Dockerfile
   from: base
   inputs:
-    stolostron_builder_go1.21-linux:
+    stolostron_builder_go1.22-linux:
       as:
-      - registry.ci.openshift.org/stolostron/builder:go1.21-linux
+      - registry.ci.openshift.org/stolostron/builder:go1.22-linux
   to: multicluster-global-hub-operator
 - dockerfile_path: manager/Dockerfile
   from: base
   inputs:
-    stolostron_builder_go1.21-linux:
+    stolostron_builder_go1.22-linux:
       as:
-      - registry.ci.openshift.org/stolostron/builder:go1.21-linux
+      - registry.ci.openshift.org/stolostron/builder:go1.22-linux
   to: multicluster-global-hub-manager
 - dockerfile_path: agent/Dockerfile
   from: base
   inputs:
-    stolostron_builder_go1.21-linux:
+    stolostron_builder_go1.22-linux:
       as:
-      - registry.ci.openshift.org/stolostron/builder:go1.21-linux
+      - registry.ci.openshift.org/stolostron/builder:go1.22-linux
   to: multicluster-global-hub-agent
 promotion:
   to:
diff --git a/clusters/hosted-mgmt/hive/pools/ocp-release-4.16.3-x86-64-for-4.16.0-0-to-4.17.0-0_clusterimageset.yaml b/clusters/hosted-mgmt/hive/pools/ocp-release-4.16.3-x86-64-for-4.16.0-0-to-4.17.0-0_clusterimageset.yaml
index 36909312c34b..56a491f17097 100644
--- a/clusters/hosted-mgmt/hive/pools/ocp-release-4.16.3-x86-64-for-4.16.0-0-to-4.17.0-0_clusterimageset.yaml
+++ b/clusters/hosted-mgmt/hive/pools/ocp-release-4.16.3-x86-64-for-4.16.0-0-to-4.17.0-0_clusterimageset.yaml
@@ -3,7 +3,6 @@ kind: ClusterImageSet
 metadata:
   annotations:
     version_lower: 4.16.0-0
-    version_stream: 4-stable
     version_upper: 4.17.0-0
   creationTimestamp: null
   name: ocp-release-4.16.3-x86-64-for-4.16.0-0-to-4.17.0-0