diff --git a/ci-operator/config/openshift/console-plugin-template/openshift-console-plugin-template-main.yaml b/ci-operator/config/openshift/console-plugin-template/openshift-console-plugin-template-main.yaml
index 9704877cd2157..cea7703342b2a 100644
--- a/ci-operator/config/openshift/console-plugin-template/openshift-console-plugin-template-main.yaml
+++ b/ci-operator/config/openshift/console-plugin-template/openshift-console-plugin-template-main.yaml
@@ -1,8 +1,8 @@
 build_root:
   image_stream_tag:
-    name: release
-    namespace: openshift
-    tag: console-plugin-test-cypress
+    name: console-plugin-test-cypress
+    namespace: ci
+    tag: node22
 images:
 - dockerfile_path: Dockerfile
   to: console-plugin-template
diff --git a/ci-operator/config/openshift/console-plugin-template/openshift-console-plugin-template-release-4.19.yaml b/ci-operator/config/openshift/console-plugin-template/openshift-console-plugin-template-release-4.19.yaml
index 83a5f14d19d4c..5801911488062 100644
--- a/ci-operator/config/openshift/console-plugin-template/openshift-console-plugin-template-release-4.19.yaml
+++ b/ci-operator/config/openshift/console-plugin-template/openshift-console-plugin-template-release-4.19.yaml
@@ -1,8 +1,8 @@
 build_root:
   image_stream_tag:
-    name: release
-    namespace: openshift
-    tag: console-plugin-test-cypress
+    name: console-plugin-test-cypress
+    namespace: ci
+    tag: node22
 images:
 - dockerfile_path: Dockerfile
   to: console-plugin-template
diff --git a/ci-operator/config/openshift/console-plugin-template/openshift-console-plugin-template-release-4.20.yaml b/ci-operator/config/openshift/console-plugin-template/openshift-console-plugin-template-release-4.20.yaml
index 91b9a7cbcfe0c..e611243647df9 100644
--- a/ci-operator/config/openshift/console-plugin-template/openshift-console-plugin-template-release-4.20.yaml
+++ b/ci-operator/config/openshift/console-plugin-template/openshift-console-plugin-template-release-4.20.yaml
@@ -1,8 +1,8 @@
 build_root:
   image_stream_tag:
-    name: release
-    namespace: openshift
-    tag: console-plugin-test-cypress
+    name: console-plugin-test-cypress
+    namespace: ci
+    tag: node22
 images:
 - dockerfile_path: Dockerfile
   to: console-plugin-template
diff --git a/ci-operator/config/openshift/console-plugin-template/openshift-console-plugin-template-release-4.21.yaml b/ci-operator/config/openshift/console-plugin-template/openshift-console-plugin-template-release-4.21.yaml
index 1eb0158b2a218..e69e11bbd5d6f 100644
--- a/ci-operator/config/openshift/console-plugin-template/openshift-console-plugin-template-release-4.21.yaml
+++ b/ci-operator/config/openshift/console-plugin-template/openshift-console-plugin-template-release-4.21.yaml
@@ -1,8 +1,8 @@
 build_root:
   image_stream_tag:
-    name: release
-    namespace: openshift
-    tag: console-plugin-test-cypress
+    name: console-plugin-test-cypress
+    namespace: ci
+    tag: node22
 images:
 - dockerfile_path: Dockerfile
   to: console-plugin-template
diff --git a/ci-operator/config/openshift/console-plugin-template/openshift-console-plugin-template-release-4.22.yaml b/ci-operator/config/openshift/console-plugin-template/openshift-console-plugin-template-release-4.22.yaml
index 1a63c86fe38f2..d5afc09fc8402 100644
--- a/ci-operator/config/openshift/console-plugin-template/openshift-console-plugin-template-release-4.22.yaml
+++ b/ci-operator/config/openshift/console-plugin-template/openshift-console-plugin-template-release-4.22.yaml
@@ -1,8 +1,8 @@
 build_root:
   image_stream_tag:
-    name: release
-    namespace: openshift
-    tag: console-plugin-test-cypress
+    name: console-plugin-test-cypress
+    namespace: ci
+    tag: node22
 images:
 - dockerfile_path: Dockerfile
   to: console-plugin-template
diff --git a/core-services/prow/02_config/_labels.yaml b/core-services/prow/02_config/_labels.yaml
index d8914e6c11c8f..51562f41ae72b 100644
--- a/core-services/prow/02_config/_labels.yaml
+++ b/core-services/prow/02_config/_labels.yaml
@@ -750,6 +750,11 @@ repos:
         name: kind/cypress
         target: both
         addedBy: label
+      - color: 00D8FF
+        description: Related to dynamic-demo-plugin
+        name: kind/demo-plugin
+        target: both
+        addedBy: label
       - color: e11d21
         description: Categorizes a PR as containing plugin API changes
         name: plugin-api-changed