diff --git a/.tekton/dashboards-console-plugin-0-3-pull-request.yaml b/.tekton/dashboards-console-plugin-0-3-pull-request.yaml
index 342ee34..e338c64 100644
--- a/.tekton/dashboards-console-plugin-0-3-pull-request.yaml
+++ b/.tekton/dashboards-console-plugin-0-3-pull-request.yaml
@@ -27,7 +27,7 @@ spec:
   - name: revision
     value: '{{revision}}'
   - name: output-image
-    value: quay.io/redhat-user-workloads/cluster-observabilit-tenant/cluster-observability-operator-1-0/dashboards-console-plugin-0-3:on-pr-{{revision}}
+    value: quay.io/redhat-user-workloads/cluster-observabilit-tenant/dashboards-console-plugin-0-3:on-pr-{{revision}}
   - name: image-expires-after
     value: 5d
   - name: build-platforms
diff --git a/.tekton/dashboards-console-plugin-0-3-push.yaml b/.tekton/dashboards-console-plugin-0-3-push.yaml
index 8500157..3f95faa 100644
--- a/.tekton/dashboards-console-plugin-0-3-push.yaml
+++ b/.tekton/dashboards-console-plugin-0-3-push.yaml
@@ -26,7 +26,7 @@ spec:
   - name: revision
     value: '{{revision}}'
   - name: output-image
-    value: quay.io/redhat-user-workloads/cluster-observabilit-tenant/cluster-observability-operator-1-0/dashboards-console-plugin-0-3:{{revision}}
+    value: quay.io/redhat-user-workloads/cluster-observabilit-tenant/dashboards-console-plugin-0-3:{{revision}}
   - name: build-platforms
     value:
     - linux/x86_64
diff --git a/.tekton/distributed-tracing-console-plugin-0-3-pull-request.yaml b/.tekton/distributed-tracing-console-plugin-0-3-pull-request.yaml
index e0082db..cc7b053 100644
--- a/.tekton/distributed-tracing-console-plugin-0-3-pull-request.yaml
+++ b/.tekton/distributed-tracing-console-plugin-0-3-pull-request.yaml
@@ -27,7 +27,7 @@ spec:
   - name: revision
     value: '{{revision}}'
   - name: output-image
-    value: quay.io/redhat-user-workloads/cluster-observabilit-tenant/cluster-observability-operator-1-0/distributed-tracing-console-plugin-0-3:on-pr-{{revision}}
+    value: quay.io/redhat-user-workloads/cluster-observabilit-tenant/distributed-tracing-console-plugin-0-3:on-pr-{{revision}}
   - name: image-expires-after
     value: 5d
   - name: build-platforms
diff --git a/.tekton/distributed-tracing-console-plugin-0-3-push.yaml b/.tekton/distributed-tracing-console-plugin-0-3-push.yaml
index 9ec2483..760d7bb 100644
--- a/.tekton/distributed-tracing-console-plugin-0-3-push.yaml
+++ b/.tekton/distributed-tracing-console-plugin-0-3-push.yaml
@@ -26,7 +26,7 @@ spec:
   - name: revision
     value: '{{revision}}'
   - name: output-image
-    value: quay.io/redhat-user-workloads/cluster-observabilit-tenant/cluster-observability-operator-1-0/distributed-tracing-console-plugin-0-3:{{revision}}
+    value: quay.io/redhat-user-workloads/cluster-observabilit-tenant/distributed-tracing-console-plugin-0-3:{{revision}}
   - name: build-platforms
     value:
     - linux/x86_64
diff --git a/.tekton/korrel8r-pull-request.yaml b/.tekton/korrel8r-pull-request.yaml
index ed3e166..51a63e8 100644
--- a/.tekton/korrel8r-pull-request.yaml
+++ b/.tekton/korrel8r-pull-request.yaml
@@ -27,7 +27,7 @@ spec:
   - name: revision
     value: '{{revision}}'
   - name: output-image
-    value: quay.io/redhat-user-workloads/cluster-observabilit-tenant/cluster-observability-operator-1-0/korrel8r:on-pr-{{revision}}
+    value: quay.io/redhat-user-workloads/cluster-observabilit-tenant/korrel8r:on-pr-{{revision}}
   - name: image-expires-after
     value: 5d
   - name: build-platforms
diff --git a/.tekton/korrel8r-push.yaml b/.tekton/korrel8r-push.yaml
index 2a1a374..a168e3b 100644
--- a/.tekton/korrel8r-push.yaml
+++ b/.tekton/korrel8r-push.yaml
@@ -26,7 +26,7 @@ spec:
   - name: revision
     value: '{{revision}}'
   - name: output-image
-    value: quay.io/redhat-user-workloads/cluster-observabilit-tenant/cluster-observability-operator-1-0/korrel8r:{{revision}}
+    value: quay.io/redhat-user-workloads/cluster-observabilit-tenant/korrel8r:{{revision}}
   - name: build-platforms
     value:
     - linux/x86_64
diff --git a/.tekton/logging-console-plugin-6-0-pull-request.yaml b/.tekton/logging-console-plugin-6-0-pull-request.yaml
index 4ff10a7..bf67e27 100644
--- a/.tekton/logging-console-plugin-6-0-pull-request.yaml
+++ b/.tekton/logging-console-plugin-6-0-pull-request.yaml
@@ -27,7 +27,7 @@ spec:
   - name: revision
     value: '{{revision}}'
   - name: output-image
-    value: quay.io/redhat-user-workloads/cluster-observabilit-tenant/cluster-observability-operator-1-0/logging-console-plugin-6-0:on-pr-{{revision}}
+    value: quay.io/redhat-user-workloads/cluster-observabilit-tenant/logging-console-plugin-6-0:on-pr-{{revision}}
   - name: image-expires-after
     value: 5d
   - name: build-platforms
diff --git a/.tekton/logging-console-plugin-6-0-push.yaml b/.tekton/logging-console-plugin-6-0-push.yaml
index f3863c6..1ba8870 100644
--- a/.tekton/logging-console-plugin-6-0-push.yaml
+++ b/.tekton/logging-console-plugin-6-0-push.yaml
@@ -26,7 +26,7 @@ spec:
   - name: revision
     value: '{{revision}}'
   - name: output-image
-    value: quay.io/redhat-user-workloads/cluster-observabilit-tenant/cluster-observability-operator-1-0/logging-console-plugin-6-0:{{revision}}
+    value: quay.io/redhat-user-workloads/cluster-observabilit-tenant/logging-console-plugin-6-0:{{revision}}
   - name: build-platforms
     value:
     - linux/x86_64
diff --git a/.tekton/monitoring-console-plugin-0-3-pull-request.yaml b/.tekton/monitoring-console-plugin-0-3-pull-request.yaml
index 0710afd..ae9fd60 100644
--- a/.tekton/monitoring-console-plugin-0-3-pull-request.yaml
+++ b/.tekton/monitoring-console-plugin-0-3-pull-request.yaml
@@ -27,7 +27,7 @@ spec:
   - name: revision
     value: '{{revision}}'
   - name: output-image
-    value: quay.io/redhat-user-workloads/cluster-observabilit-tenant/cluster-observability-operator-1-0/monitoring-console-plugin-0-3:on-pr-{{revision}}
+    value: quay.io/redhat-user-workloads/cluster-observabilit-tenant/monitoring-console-plugin-0-3:on-pr-{{revision}}
   - name: image-expires-after
     value: 5d
   - name: build-platforms
diff --git a/.tekton/monitoring-console-plugin-0-3-push.yaml b/.tekton/monitoring-console-plugin-0-3-push.yaml
index 82cdf5d..13ee17d 100644
--- a/.tekton/monitoring-console-plugin-0-3-push.yaml
+++ b/.tekton/monitoring-console-plugin-0-3-push.yaml
@@ -26,7 +26,7 @@ spec:
   - name: revision
     value: '{{revision}}'
   - name: output-image
-    value: quay.io/redhat-user-workloads/cluster-observabilit-tenant/cluster-observability-operator-1-0/monitoring-console-plugin-0-3:{{revision}}
+    value: quay.io/redhat-user-workloads/cluster-observabilit-tenant/monitoring-console-plugin-0-3:{{revision}}
   - name: build-platforms
     value:
     - linux/x86_64
diff --git a/.tekton/prometheus-pull-request.yaml b/.tekton/prometheus-pull-request.yaml
index 7c7538d..5dd1695 100644
--- a/.tekton/prometheus-pull-request.yaml
+++ b/.tekton/prometheus-pull-request.yaml
@@ -27,7 +27,7 @@ spec:
   - name: revision
     value: '{{revision}}'
   - name: output-image
-    value: quay.io/redhat-user-workloads/cluster-observabilit-tenant/cluster-observability-operator-1-0/prometheus:on-pr-{{revision}}
+    value: quay.io/redhat-user-workloads/cluster-observabilit-tenant/prometheus:on-pr-{{revision}}
   - name: image-expires-after
     value: 5d
   - name: build-platforms
diff --git a/.tekton/prometheus-push.yaml b/.tekton/prometheus-push.yaml
index cee40c6..d94bea8 100644
--- a/.tekton/prometheus-push.yaml
+++ b/.tekton/prometheus-push.yaml
@@ -26,7 +26,7 @@ spec:
   - name: revision
     value: '{{revision}}'
   - name: output-image
-    value: quay.io/redhat-user-workloads/cluster-observabilit-tenant/cluster-observability-operator-1-0/prometheus:{{revision}}
+    value: quay.io/redhat-user-workloads/cluster-observabilit-tenant/prometheus:{{revision}}
   - name: build-platforms
     value:
     - linux/x86_64
diff --git a/.tekton/thanos-pull-request.yaml b/.tekton/thanos-pull-request.yaml
index 8d29614..e55b162 100644
--- a/.tekton/thanos-pull-request.yaml
+++ b/.tekton/thanos-pull-request.yaml
@@ -27,7 +27,7 @@ spec:
   - name: revision
     value: '{{revision}}'
   - name: output-image
-    value: quay.io/redhat-user-workloads/cluster-observabilit-tenant/cluster-observability-operator-1-0/thanos:on-pr-{{revision}}
+    value: quay.io/redhat-user-workloads/cluster-observabilit-tenant/thanos:on-pr-{{revision}}
   - name: image-expires-after
     value: 5d
   - name: build-platforms
diff --git a/.tekton/thanos-push.yaml b/.tekton/thanos-push.yaml
index ea880b3..5006011 100644
--- a/.tekton/thanos-push.yaml
+++ b/.tekton/thanos-push.yaml
@@ -26,7 +26,7 @@ spec:
   - name: revision
     value: '{{revision}}'
   - name: output-image
-    value: quay.io/redhat-user-workloads/cluster-observabilit-tenant/cluster-observability-operator-1-0/thanos:{{revision}}
+    value: quay.io/redhat-user-workloads/cluster-observabilit-tenant/thanos:{{revision}}
   - name: build-platforms
     value:
     - linux/x86_64
diff --git a/.tekton/troubleshooting-panel-console-plugin-0-3-pull-request.yaml b/.tekton/troubleshooting-panel-console-plugin-0-3-pull-request.yaml
index ff9a650..26aa76b 100644
--- a/.tekton/troubleshooting-panel-console-plugin-0-3-pull-request.yaml
+++ b/.tekton/troubleshooting-panel-console-plugin-0-3-pull-request.yaml
@@ -27,7 +27,7 @@ spec:
   - name: revision
     value: '{{revision}}'
   - name: output-image
-    value: quay.io/redhat-user-workloads/cluster-observabilit-tenant/cluster-observability-operator-1-0/troubleshooting-panel-console-plugin-0-3:on-pr-{{revision}}
+    value: quay.io/redhat-user-workloads/cluster-observabilit-tenant/troubleshooting-panel-console-plugin-0-3:on-pr-{{revision}}
   - name: image-expires-after
     value: 5d
   - name: build-platforms
diff --git a/.tekton/troubleshooting-panel-console-plugin-0-3-push.yaml b/.tekton/troubleshooting-panel-console-plugin-0-3-push.yaml
index 13513e1..7eae3d1 100644
--- a/.tekton/troubleshooting-panel-console-plugin-0-3-push.yaml
+++ b/.tekton/troubleshooting-panel-console-plugin-0-3-push.yaml
@@ -26,7 +26,7 @@ spec:
   - name: revision
     value: '{{revision}}'
   - name: output-image
-    value: quay.io/redhat-user-workloads/cluster-observabilit-tenant/cluster-observability-operator-1-0/troubleshooting-panel-console-plugin-0-3:{{revision}}
+    value: quay.io/redhat-user-workloads/cluster-observabilit-tenant/troubleshooting-panel-console-plugin-0-3:{{revision}}
   - name: build-platforms
     value:
     - linux/x86_64
diff --git a/bundle-patches/render_templates b/bundle-patches/render_templates
index 6a989ce..89ba075 100755
--- a/bundle-patches/render_templates
+++ b/bundle-patches/render_templates
@@ -35,25 +35,25 @@ COO_CONF_RELOADER_IMAGE_URL="quay.io/redhat-user-workloads/cluster-observabilit-
 
 COO_ALERTMANAGER_IMAGE_URL="quay.io/redhat-user-workloads/cluster-observabilit-tenant/alertmanager@sha256:99429fb7e8dbc79e4b231c7137cf17ebd8f7ad81ee93f7d3e3f3f749879ef8bf"
 
-COO_PROMETHEUS_IMAGE_URL="quay.io/redhat-user-workloads/cluster-observabilit-tenant/cluster-observability-operator-1-0/prometheus@sha256:1cd4939db6efb0b2de54f9ad69dcb4467eff5e7d1019bc65f0d111903d47e214"
+COO_PROMETHEUS_IMAGE_URL="quay.io/redhat-user-workloads/cluster-observabilit-tenant/prometheus@sha256:1cd4939db6efb0b2de54f9ad69dcb4467eff5e7d1019bc65f0d111903d47e214"
 
-COO_THANOS_IMAGE_URL="quay.io/redhat-user-workloads/cluster-observabilit-tenant/cluster-observability-operator-1-0/thanos@sha256:dc047e3ffe72076cc4b5219edfe60f0ee3d026d634766e97a80da8fde52ba40a"
+COO_THANOS_IMAGE_URL="quay.io/redhat-user-workloads/cluster-observabilit-tenant/thanos@sha256:dc047e3ffe72076cc4b5219edfe60f0ee3d026d634766e97a80da8fde52ba40a"
 
 COO_ADMISSION_WEBHOOK_IMAGE_URL="quay.io/redhat-user-workloads/cluster-observabilit-tenant/obo-prometheus-operator-admission-webhook@sha256:448d362c6bac544182da7a6d70d2ccc224c82399713d3339a4002952a6488ba3"
 
 COO_PO_IMAGE_URL="quay.io/redhat-user-workloads/cluster-observabilit-tenant/obo-prometheus-operator@sha256:0cb47c7e7d85a7856abea48cb360b80801d4760df96964f029a26bd8ac5dbe9d"
 
-COO_CONSOLE_DASHBOARDS_PLUGIN_IMAGE_URL="quay.io/redhat-user-workloads/cluster-observabilit-tenant/cluster-observability-operator-1-0/dashboards-console-plugin-0-3@sha256:637f0ce4fb03f829dedc6f523069aa9417db9f6d01a6cb82d78ea6721bec3926"
+COO_CONSOLE_DASHBOARDS_PLUGIN_IMAGE_URL="quay.io/redhat-user-workloads/cluster-observabilit-tenant/dashboards-console-plugin-0-3@sha256:637f0ce4fb03f829dedc6f523069aa9417db9f6d01a6cb82d78ea6721bec3926"
 
-COO_CONSOLE_DISTRIBUTED_TRACING_PLUGIN_IMAGE_URL="quay.io/redhat-user-workloads/cluster-observabilit-tenant/cluster-observability-operator-1-0/distributed-tracing-console-plugin-0-3@sha256:f7fa6e0a6cb7cd3fdf91c4399944eaca52adbf1951f872de5a30f191aaa8d09b"
+COO_CONSOLE_DISTRIBUTED_TRACING_PLUGIN_IMAGE_URL="quay.io/redhat-user-workloads/cluster-observabilit-tenant/distributed-tracing-console-plugin-0-3@sha256:f7fa6e0a6cb7cd3fdf91c4399944eaca52adbf1951f872de5a30f191aaa8d09b"
 
-COO_CONSOLE_LOGGING_PLUGIN_IMAGE_URL="quay.io/redhat-user-workloads/cluster-observabilit-tenant/cluster-observability-operator-1-0/logging-console-plugin-6-0@sha256:9ef523c96d8bf1dfe5e5e807986c8e6c427d3d1f8025824d9023d6387a7aae60"
+COO_CONSOLE_LOGGING_PLUGIN_IMAGE_URL="quay.io/redhat-user-workloads/cluster-observabilit-tenant/logging-console-plugin-6-0@sha256:9ef523c96d8bf1dfe5e5e807986c8e6c427d3d1f8025824d9023d6387a7aae60"
 
-COO_CONSOLE_TROUBLESHOOTING_PANEL_PLUGIN_IMAGE_URL="quay.io/redhat-user-workloads/cluster-observabilit-tenant/cluster-observability-operator-1-0/troubleshooting-panel-console-plugin-0-3@sha256:e3996867f3b7b539731933a14596b9b44c7b107008e041c6509c9a1cfb83f37b"
+COO_CONSOLE_TROUBLESHOOTING_PANEL_PLUGIN_IMAGE_URL="quay.io/redhat-user-workloads/cluster-observabilit-tenant/troubleshooting-panel-console-plugin-0-3@sha256:e3996867f3b7b539731933a14596b9b44c7b107008e041c6509c9a1cfb83f37b"
 
-COO_CONSOLE_MONITORING_PLUGIN_IMAGE_URL="quay.io/redhat-user-workloads/cluster-observabilit-tenant/cluster-observability-operator-1-0/monitoring-console-plugin-0-3@sha256:07ccac7309ea8834849cd127875dde08705abdcd69dbbedabb16f4aaf0d53452"
+COO_CONSOLE_MONITORING_PLUGIN_IMAGE_URL="quay.io/redhat-user-workloads/cluster-observabilit-tenant/monitoring-console-plugin-0-3@sha256:07ccac7309ea8834849cd127875dde08705abdcd69dbbedabb16f4aaf0d53452"
 
-COO_KORREL8R_IMAGE_URL="quay.io/redhat-user-workloads/cluster-observabilit-tenant/cluster-observability-operator-1-0/korrel8r@sha256:1b6e0ee0f676c1709d11fbb2738fc77e838bd1843b7f46e7ffd2fff12f03ea16"
+COO_KORREL8R_IMAGE_URL="quay.io/redhat-user-workloads/cluster-observabilit-tenant/korrel8r@sha256:1b6e0ee0f676c1709d11fbb2738fc77e838bd1843b7f46e7ffd2fff12f03ea16"
 
 # Add related images for disconnected installs
 # First we add an empty list