diff --git a/Makefile b/Makefile
index 9bd786ea..003c5a26 100644
--- a/Makefile
+++ b/Makefile
@@ -230,24 +230,6 @@ e2e-upstream-test: get-kueue-image wait-for-image deploy-cert-manager wait-for-c
 	@rm -f .kueue_image
 
 
-.PHONY: e2e-tech-preview-test
-e2e-tech-preview-test: wait-for-image deploy-cert-manager ginkgo
-	@echo "Running operator e2e tests with released images..."
-	export KUEUE_IMAGE=registry.redhat.io/kueue-tech-preview/kueue-rhel9@sha256:d0d6c34952e3d60be62fe7add33aa7ae2b0ac5c1bd2592e319f4cc28b2a2783e
-	$(GINKGO) -v ./test/e2e/...
-	make undeploy-ocp
-	@rm -f .kueue_image
-
-.PHONY: e2e-tech-preview-upstream-test
-e2e-tech-preview-upstream-test: wait-for-image deploy-cert-manager wait-for-cert-manager deploy-ocp
-	@echo "Running upstream e2e tests with released images..."
-	export KUEUE_IMAGE=registry.redhat.io/kueue-tech-preview/kueue-rhel9@sha256:d0d6c34952e3d60be62fe7add33aa7ae2b0ac5c1bd2592e319f4cc28b2a2783e
-	cd $(TEMP_DIR) && KUEUE_NAMESPACE="openshift-kueue-operator" make -f Makefile-test-ocp.mk test-e2e-upstream-ocp
-	@echo "Cleaning up TEMP_DIR: $(TEMP_DIR)"
-	@rm -rf $(TEMP_DIR)
-	make undeploy-ocp
-	@rm -f .kueue_image
-
 .PHONY: e2e-tech-preview-test
 e2e-tech-preview-test: wait-for-image deploy-cert-manager ginkgo
 	@echo "Running operator e2e tests with released images..."
diff --git a/fbc/v4.18/catalog-template.yaml b/fbc/v4.18/catalog-template.yaml
index 0f2b1574..bdb5c9fa 100644
--- a/fbc/v4.18/catalog-template.yaml
+++ b/fbc/v4.18/catalog-template.yaml
@@ -4,4 +4,4 @@ GenerateMinorChannels: true
 DefaultChannelTypePreference: "minor"
 Stable:
   Bundles:
-  - Image: quay.io/redhat-user-workloads/kueue-operator-tenant/kueue-bundle-1-0@sha256:ce10c13a9dfd0267630b1e53b80515739c38d36b0323176d69a522500e1f4b7b
\ No newline at end of file
+  - Image: quay.io/redhat-user-workloads/kueue-operator-tenant/kueue-bundle-1-0@sha256:0d339f44231f7608292fff03cffd5f0e0c7d7757f30740f056091afc61f1812c
\ No newline at end of file
diff --git a/fbc/v4.18/catalog/kueue-operator/catalog.json b/fbc/v4.18/catalog/kueue-operator/catalog.json
index d4bb57e6..16dbcfe9 100644
--- a/fbc/v4.18/catalog/kueue-operator/catalog.json
+++ b/fbc/v4.18/catalog/kueue-operator/catalog.json
@@ -1,23 +1,23 @@
 {
     "schema": "olm.package",
     "name": "kueue-operator",
-    "defaultChannel": "stable-v0.0"
+    "defaultChannel": "stable-v0.1"
 }
 {
     "schema": "olm.channel",
-    "name": "stable-v0.0",
+    "name": "stable-v0.1",
     "package": "kueue-operator",
     "entries": [
         {
-            "name": "kueue-operator.v0.0.1"
+            "name": "kueue-operator.v0.1.0"
         }
     ]
 }
 {
     "schema": "olm.bundle",
-    "name": "kueue-operator.v0.0.1",
+    "name": "kueue-operator.v0.1.0",
     "package": "kueue-operator",
-    "image": "quay.io/redhat-user-workloads/kueue-operator-tenant/kueue-bundle-1-0@sha256:a006ae12d6af7218f820ecc595af287bef0284fd69fb6b223dc284d685c66114",
+    "image": "quay.io/redhat-user-workloads/kueue-operator-tenant/kueue-bundle-1-0@sha256:0d339f44231f7608292fff03cffd5f0e0c7d7757f30740f056091afc61f1812c",
     "properties": [
         {
             "type": "olm.gvk",
@@ -31,17 +31,17 @@
             "type": "olm.package",
             "value": {
                 "packageName": "kueue-operator",
-                "version": "0.0.1"
+                "version": "0.1.0"
             }
         },
         {
             "type": "olm.csv.metadata",
             "value": {
                 "annotations": {
-                    "alm-examples": "[\n  {\n    \"apiVersion\": \"operator.openshift.io/v1alpha1\",\n    \"kind\": \"Kueue\",\n    \"metadata\": {\n      \"labels\": {\n        \"app.kubernetes.io/managed-by\": \"kustomize\",\n        \"app.kubernetes.io/name\": \"kueue-operator\"\n      },\n      \"name\": \"cluster\",\n      \"namespace\": \"openshift-kueue-operator\"\n    },\n    \"spec\": {\n      \"config\": {\n        \"integrations\": {\n          \"frameworks\": [\n            \"BatchJob\",\n            \"Pod\",\n            \"Deployment\",\n            \"StatefulSet\"\n          ]\n        }\n      },\n      \"managementState\": \"Managed\"\n    }\n  },\n  {\n    \"apiVersion\": \"operator.openshift.io/v1alpha1\",\n    \"kind\": \"Kueue\",\n    \"metadata\": {\n      \"labels\": {\n        \"app.kubernetes.io/managed-by\": \"kustomize\",\n        \"app.kubernetes.io/name\": \"kueue-operator\"\n      },\n      \"name\": \"cluster\",\n      \"namespace\": \"openshift-kueue-operator\"\n    },\n    \"spec\": {\n      \"config\": {\n        \"integrations\": {\n          \"externalFrameworks\": [\n            \"AppWrapper\"\n          ],\n          \"frameworks\": [\n            \"BatchJob\",\n            \"RayJob\",\n            \"RayCluster\"\n          ]\n        }\n      }\n    }\n  }\n]",
+                    "alm-examples": "[\n  {\n    \"apiVersion\": \"operator.openshift.io/v1alpha1\",\n    \"kind\": \"Kueue\",\n    \"metadata\": {\n      \"labels\": {\n        \"app.kubernetes.io/managed-by\": \"kustomize\",\n        \"app.kubernetes.io/name\": \"kueue-operator\"\n      },\n      \"name\": \"cluster\",\n      \"namespace\": \"openshift-kueue-operator\"\n    },\n    \"spec\": {\n      \"config\": {\n        \"integrations\": {\n          \"frameworks\": [\n            \"AppWrapper\"\n          ]\n        },\n        \"kueueGangSchedulingPolicy\": {\n          \"policy\": \"Disabled\"\n        },\n        \"preemption\": {\n          \"preemptionStrategy\": \"FairSharing\"\n        },\n        \"queueLabelPolicy\": {\n          \"queueLabelPolicy\": \"QueueNameOptional\"\n        }\n      },\n      \"managementState\": \"Managed\"\n    }\n  },\n  {\n    \"apiVersion\": \"operator.openshift.io/v1alpha1\",\n    \"kind\": \"Kueue\",\n    \"metadata\": {\n      \"labels\": {\n        \"app.kubernetes.io/managed-by\": \"kustomize\",\n        \"app.kubernetes.io/name\": \"kueue-operator\"\n      },\n      \"name\": \"cluster\",\n      \"namespace\": \"openshift-kueue-operator\"\n    },\n    \"spec\": {\n      \"config\": {\n        \"integrations\": {\n          \"frameworks\": [\n            \"BatchJob\",\n            \"Pod\",\n            \"Deployment\",\n            \"StatefulSet\"\n          ]\n        }\n      },\n      \"managementState\": \"Managed\"\n    }\n  },\n  {\n    \"apiVersion\": \"operator.openshift.io/v1alpha1\",\n    \"kind\": \"Kueue\",\n    \"metadata\": {\n      \"labels\": {\n        \"app.kubernetes.io/managed-by\": \"kustomize\",\n        \"app.kubernetes.io/name\": \"kueue-operator\"\n      },\n      \"name\": \"cluster\",\n      \"namespace\": \"openshift-kueue-operator\"\n    },\n    \"spec\": {\n      \"config\": {\n        \"integrations\": {\n          \"frameworks\": [\n            \"BatchJob\",\n            \"RayJob\",\n            \"RayCluster\",\n            \"AppWrapper\",\n            \"PyTorchJob\"\n          ]\n        },\n        \"kueueGangSchedulingPolicy\": {\n          \"byWorkload\": \"Parallel\",\n          \"policy\": \"ByWorkload\"\n        },\n        \"preemption\": {\n          \"preemptionStrategy\": \"Classical\"\n        },\n        \"queueLabelPolicy\": {\n          \"queueLabelPolicy\": \"QueueNameRequired\"\n        }\n      },\n      \"managementState\": \"Managed\"\n    }\n  }\n]",
                     "capabilities": "Basic Install",
                     "console.openshift.io/operator-monitoring-default": "true",
-                    "createdAt": "2025-04-03T17:38:12Z",
+                    "createdAt": "2025-05-01T17:14:19Z",
                     "features.operators.openshift.io/cnf": "false",
                     "features.operators.openshift.io/cni": "false",
                     "features.operators.openshift.io/csi": "false",
@@ -114,16 +114,16 @@
     ],
     "relatedImages": [
         {
-            "name": "operand-image",
-            "image": "registry.redhat.io/kueue-tech-preview/kueue-rhel9@sha256:d0d6c34952e3d60be62fe7add33aa7ae2b0ac5c1bd2592e319f4cc28b2a2783e"
+            "name": "",
+            "image": "quay.io/redhat-user-workloads/kueue-operator-tenant/kueue-bundle-1-0@sha256:0d339f44231f7608292fff03cffd5f0e0c7d7757f30740f056091afc61f1812c"
         },
         {
             "name": "",
-            "image": "quay.io/redhat-user-workloads/kueue-operator-tenant/kueue-bundle-1-0@sha256:a006ae12d6af7218f820ecc595af287bef0284fd69fb6b223dc284d685c66114"
+            "image": "registry.redhat.io/kueue-tech-preview/kueue-rhel9-operator@sha256:fbf86df2779e4866e99c9b642fe240d21695459439bb43608c99e755c031fc19"
         },
         {
-            "name": "operator-image",
-            "image": "quay.io/redhat-user-workloads/kueue-operator-tenant/kueue-operator@sha256:d90da026cf2633ee1a02e2f5674808088f5acd0c54c987941ccb39c214842adb"
+            "name": "operand-image",
+            "image": "registry.redhat.io/kueue-tech-preview/kueue-rhel9@sha256:5e1c44d2a931df99c9d068720b787fffd0dfa9afee5b6c85a63fcddee0dcbd38"
         }
     ]
 }
diff --git a/fbc/v4.19/Containerfile.catalog b/fbc/v4.19/Containerfile.catalog
index be037561..6b00fcd9 100644
--- a/fbc/v4.19/Containerfile.catalog
+++ b/fbc/v4.19/Containerfile.catalog
@@ -1,5 +1,5 @@
 # The base image is expected to contain /bin/opm (with a serve subcommand) and /bin/grpc_health_probe
-FROM registry.redhat.io/openshift4/ose-operator-registry-rhel9:v4.19
+FROM brew.registry.redhat.io/rh-osbs/openshift-ose-operator-registry-rhel9:v4.19
 
 ENTRYPOINT ["/bin/opm"]
 CMD ["serve", "/configs", "--cache-dir=/tmp/cache"]
diff --git a/fbc/v4.19/catalog-template.yaml b/fbc/v4.19/catalog-template.yaml
index 0f2b1574..bdb5c9fa 100644
--- a/fbc/v4.19/catalog-template.yaml
+++ b/fbc/v4.19/catalog-template.yaml
@@ -4,4 +4,4 @@ GenerateMinorChannels: true
 DefaultChannelTypePreference: "minor"
 Stable:
   Bundles:
-  - Image: quay.io/redhat-user-workloads/kueue-operator-tenant/kueue-bundle-1-0@sha256:ce10c13a9dfd0267630b1e53b80515739c38d36b0323176d69a522500e1f4b7b
\ No newline at end of file
+  - Image: quay.io/redhat-user-workloads/kueue-operator-tenant/kueue-bundle-1-0@sha256:0d339f44231f7608292fff03cffd5f0e0c7d7757f30740f056091afc61f1812c
\ No newline at end of file
diff --git a/fbc/v4.19/catalog/kueue-operator/catalog.json b/fbc/v4.19/catalog/kueue-operator/catalog.json
index d4bb57e6..16dbcfe9 100644
--- a/fbc/v4.19/catalog/kueue-operator/catalog.json
+++ b/fbc/v4.19/catalog/kueue-operator/catalog.json
@@ -1,23 +1,23 @@
 {
     "schema": "olm.package",
     "name": "kueue-operator",
-    "defaultChannel": "stable-v0.0"
+    "defaultChannel": "stable-v0.1"
 }
 {
     "schema": "olm.channel",
-    "name": "stable-v0.0",
+    "name": "stable-v0.1",
     "package": "kueue-operator",
     "entries": [
         {
-            "name": "kueue-operator.v0.0.1"
+            "name": "kueue-operator.v0.1.0"
         }
     ]
 }
 {
     "schema": "olm.bundle",
-    "name": "kueue-operator.v0.0.1",
+    "name": "kueue-operator.v0.1.0",
     "package": "kueue-operator",
-    "image": "quay.io/redhat-user-workloads/kueue-operator-tenant/kueue-bundle-1-0@sha256:a006ae12d6af7218f820ecc595af287bef0284fd69fb6b223dc284d685c66114",
+    "image": "quay.io/redhat-user-workloads/kueue-operator-tenant/kueue-bundle-1-0@sha256:0d339f44231f7608292fff03cffd5f0e0c7d7757f30740f056091afc61f1812c",
     "properties": [
         {
             "type": "olm.gvk",
@@ -31,17 +31,17 @@
             "type": "olm.package",
             "value": {
                 "packageName": "kueue-operator",
-                "version": "0.0.1"
+                "version": "0.1.0"
             }
         },
         {
             "type": "olm.csv.metadata",
             "value": {
                 "annotations": {
-                    "alm-examples": "[\n  {\n    \"apiVersion\": \"operator.openshift.io/v1alpha1\",\n    \"kind\": \"Kueue\",\n    \"metadata\": {\n      \"labels\": {\n        \"app.kubernetes.io/managed-by\": \"kustomize\",\n        \"app.kubernetes.io/name\": \"kueue-operator\"\n      },\n      \"name\": \"cluster\",\n      \"namespace\": \"openshift-kueue-operator\"\n    },\n    \"spec\": {\n      \"config\": {\n        \"integrations\": {\n          \"frameworks\": [\n            \"BatchJob\",\n            \"Pod\",\n            \"Deployment\",\n            \"StatefulSet\"\n          ]\n        }\n      },\n      \"managementState\": \"Managed\"\n    }\n  },\n  {\n    \"apiVersion\": \"operator.openshift.io/v1alpha1\",\n    \"kind\": \"Kueue\",\n    \"metadata\": {\n      \"labels\": {\n        \"app.kubernetes.io/managed-by\": \"kustomize\",\n        \"app.kubernetes.io/name\": \"kueue-operator\"\n      },\n      \"name\": \"cluster\",\n      \"namespace\": \"openshift-kueue-operator\"\n    },\n    \"spec\": {\n      \"config\": {\n        \"integrations\": {\n          \"externalFrameworks\": [\n            \"AppWrapper\"\n          ],\n          \"frameworks\": [\n            \"BatchJob\",\n            \"RayJob\",\n            \"RayCluster\"\n          ]\n        }\n      }\n    }\n  }\n]",
+                    "alm-examples": "[\n  {\n    \"apiVersion\": \"operator.openshift.io/v1alpha1\",\n    \"kind\": \"Kueue\",\n    \"metadata\": {\n      \"labels\": {\n        \"app.kubernetes.io/managed-by\": \"kustomize\",\n        \"app.kubernetes.io/name\": \"kueue-operator\"\n      },\n      \"name\": \"cluster\",\n      \"namespace\": \"openshift-kueue-operator\"\n    },\n    \"spec\": {\n      \"config\": {\n        \"integrations\": {\n          \"frameworks\": [\n            \"AppWrapper\"\n          ]\n        },\n        \"kueueGangSchedulingPolicy\": {\n          \"policy\": \"Disabled\"\n        },\n        \"preemption\": {\n          \"preemptionStrategy\": \"FairSharing\"\n        },\n        \"queueLabelPolicy\": {\n          \"queueLabelPolicy\": \"QueueNameOptional\"\n        }\n      },\n      \"managementState\": \"Managed\"\n    }\n  },\n  {\n    \"apiVersion\": \"operator.openshift.io/v1alpha1\",\n    \"kind\": \"Kueue\",\n    \"metadata\": {\n      \"labels\": {\n        \"app.kubernetes.io/managed-by\": \"kustomize\",\n        \"app.kubernetes.io/name\": \"kueue-operator\"\n      },\n      \"name\": \"cluster\",\n      \"namespace\": \"openshift-kueue-operator\"\n    },\n    \"spec\": {\n      \"config\": {\n        \"integrations\": {\n          \"frameworks\": [\n            \"BatchJob\",\n            \"Pod\",\n            \"Deployment\",\n            \"StatefulSet\"\n          ]\n        }\n      },\n      \"managementState\": \"Managed\"\n    }\n  },\n  {\n    \"apiVersion\": \"operator.openshift.io/v1alpha1\",\n    \"kind\": \"Kueue\",\n    \"metadata\": {\n      \"labels\": {\n        \"app.kubernetes.io/managed-by\": \"kustomize\",\n        \"app.kubernetes.io/name\": \"kueue-operator\"\n      },\n      \"name\": \"cluster\",\n      \"namespace\": \"openshift-kueue-operator\"\n    },\n    \"spec\": {\n      \"config\": {\n        \"integrations\": {\n          \"frameworks\": [\n            \"BatchJob\",\n            \"RayJob\",\n            \"RayCluster\",\n            \"AppWrapper\",\n            \"PyTorchJob\"\n          ]\n        },\n        \"kueueGangSchedulingPolicy\": {\n          \"byWorkload\": \"Parallel\",\n          \"policy\": \"ByWorkload\"\n        },\n        \"preemption\": {\n          \"preemptionStrategy\": \"Classical\"\n        },\n        \"queueLabelPolicy\": {\n          \"queueLabelPolicy\": \"QueueNameRequired\"\n        }\n      },\n      \"managementState\": \"Managed\"\n    }\n  }\n]",
                     "capabilities": "Basic Install",
                     "console.openshift.io/operator-monitoring-default": "true",
-                    "createdAt": "2025-04-03T17:38:12Z",
+                    "createdAt": "2025-05-01T17:14:19Z",
                     "features.operators.openshift.io/cnf": "false",
                     "features.operators.openshift.io/cni": "false",
                     "features.operators.openshift.io/csi": "false",
@@ -114,16 +114,16 @@
     ],
     "relatedImages": [
         {
-            "name": "operand-image",
-            "image": "registry.redhat.io/kueue-tech-preview/kueue-rhel9@sha256:d0d6c34952e3d60be62fe7add33aa7ae2b0ac5c1bd2592e319f4cc28b2a2783e"
+            "name": "",
+            "image": "quay.io/redhat-user-workloads/kueue-operator-tenant/kueue-bundle-1-0@sha256:0d339f44231f7608292fff03cffd5f0e0c7d7757f30740f056091afc61f1812c"
         },
         {
             "name": "",
-            "image": "quay.io/redhat-user-workloads/kueue-operator-tenant/kueue-bundle-1-0@sha256:a006ae12d6af7218f820ecc595af287bef0284fd69fb6b223dc284d685c66114"
+            "image": "registry.redhat.io/kueue-tech-preview/kueue-rhel9-operator@sha256:fbf86df2779e4866e99c9b642fe240d21695459439bb43608c99e755c031fc19"
         },
         {
-            "name": "operator-image",
-            "image": "quay.io/redhat-user-workloads/kueue-operator-tenant/kueue-operator@sha256:d90da026cf2633ee1a02e2f5674808088f5acd0c54c987941ccb39c214842adb"
+            "name": "operand-image",
+            "image": "registry.redhat.io/kueue-tech-preview/kueue-rhel9@sha256:5e1c44d2a931df99c9d068720b787fffd0dfa9afee5b6c85a63fcddee0dcbd38"
         }
     ]
 }