From d3affc6322425eca499bdf17656f5d86baaa89f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbyn=C4=9Bk=20Dr=C3=A1pela?= <zbynek.drapela@gmail.com>
Date: Thu, 12 Mar 2026 11:55:37 +0100
Subject: [PATCH 01/17] chore(ci): remove exclamation mark from plugin
 definitions

---
 .../diff-values_showcase-sanity-plugins.yaml  | 48 +++++++++----------
 .../value_files/values_showcase.yaml          |  6 +--
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/.ci/pipelines/value_files/diff-values_showcase-sanity-plugins.yaml b/.ci/pipelines/value_files/diff-values_showcase-sanity-plugins.yaml
index 462056e26e..8a6efba841 100644
--- a/.ci/pipelines/value_files/diff-values_showcase-sanity-plugins.yaml
+++ b/.ci/pipelines/value_files/diff-values_showcase-sanity-plugins.yaml
@@ -4,13 +4,13 @@ global:
       #  sanity check https://issues.redhat.com/browse/RHIDP-5301
       - package: ./dynamic-plugins/dist/backstage-plugin-catalog-backend-module-gitlab-org-dynamic
         disabled: false
-      - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/roadiehq-backstage-plugin-github-insights:bs_1.45.3__3.4.1!roadiehq-backstage-plugin-github-insights
+      - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/roadiehq-backstage-plugin-github-insights:bs_1.45.3__3.4.1
         disabled: false
-      - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/roadiehq-backstage-plugin-security-insights:bs_1.45.3__3.3.1!roadiehq-backstage-plugin-security-insights
+      - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/roadiehq-backstage-plugin-security-insights:bs_1.45.3__3.3.1
         disabled: false
       - package: ./dynamic-plugins/dist/backstage-plugin-scaffolder-backend-module-gitlab-dynamic
         disabled: false
-      - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/immobiliarelabs-backstage-plugin-gitlab:bs_1.45.3__6.13.0!immobiliarelabs-backstage-plugin-gitlab
+      - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/immobiliarelabs-backstage-plugin-gitlab:bs_1.45.3__6.13.0
         disabled: false
       - package: ./dynamic-plugins/dist/roadiehq-backstage-plugin-argo-cd-backend-dynamic
         disabled: false
@@ -37,13 +37,13 @@ global:
                     token: "temp"
       - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-argocd:bs_1.45.3__2.4.0
         disabled: false
-      - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-plugin-scaffolder-backend-module-azure:bs_1.45.3__0.2.15!backstage-plugin-scaffolder-backend-module-azure
+      - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-plugin-scaffolder-backend-module-azure:bs_1.45.3__0.2.15
         disabled: false
-      - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-azure-devops-backend:bs_1.45.3__0.23.0!backstage-community-plugin-azure-devops-backend
+      - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-azure-devops-backend:bs_1.45.3__0.23.0
         disabled: false
-      - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-azure-devops:bs_1.45.3__0.23.0!backstage-community-plugin-azure-devops
+      - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-azure-devops:bs_1.45.3__0.23.0
         disabled: false
-      - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-jenkins-backend:bs_1.45.3__0.22.0!backstage-community-plugin-jenkins-backend
+      - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-jenkins-backend:bs_1.45.3__0.22.0
         disabled: false
         pluginConfig:
           jenkins:
@@ -52,7 +52,7 @@ global:
                 baseUrl: "temp"
                 username: "temp"
                 apiKey: "temp"
-      - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-jenkins:bs_1.45.3__0.26.0!backstage-community-plugin-jenkins
+      - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-jenkins:bs_1.45.3__0.26.0
         disabled: false
       - package: ./dynamic-plugins/dist/backstage-plugin-notifications
         disabled: false
@@ -70,7 +70,7 @@ global:
         disabled: false
       - package: ./dynamic-plugins/dist/backstage-plugin-signals
         disabled: false
-      - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-sonarqube-backend:bs_1.45.3__0.15.0!backstage-community-plugin-sonarqube-backend
+      - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-sonarqube-backend:bs_1.45.3__0.15.0
         disabled: false
         pluginConfig:
           sonarqube:
@@ -79,7 +79,7 @@ global:
                 instanceKey: "mySonarqube"
                 baseUrl: "https://default-sonarqube.example.com"
                 apiKey: "123456789abcdef0123456789abcedf012"
-      - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-sonarqube:bs_1.45.3__0.21.0!backstage-community-plugin-sonarqube
+      - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-sonarqube:bs_1.45.3__0.21.0
         disabled: false
       - package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-dynamic-home-page
         disabled: false
@@ -95,9 +95,9 @@ global:
               backstage.plugin-techdocs-module-addons-contrib:
                 techdocsAddons:
                   - importName: ReportIssue
-      - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/pagerduty-backstage-plugin:bs_1.45.3__0.16.4!pagerduty-backstage-plugin
+      - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/pagerduty-backstage-plugin:bs_1.45.3__0.16.4
         disabled: true
-      - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/pagerduty-backstage-plugin-backend:bs_1.45.3__0.10.1!pagerduty-backstage-plugin-backend
+      - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/pagerduty-backstage-plugin-backend:bs_1.45.3__0.10.1
         disabled: true
         pluginConfig:
           pagerDuty:
@@ -106,13 +106,13 @@ global:
               clientId: "temp"
               clientSecret: "temp"
               subDomain: "temp"
-      - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-plugin-scaffolder-backend-module-gerrit:bs_1.45.3__0.2.15!backstage-plugin-scaffolder-backend-module-gerrit
+      - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-plugin-scaffolder-backend-module-gerrit:bs_1.45.3__0.2.15
         disabled: false
-      - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/roadiehq-scaffolder-backend-module-utils:bs_1.45.3__4.1.1!roadiehq-scaffolder-backend-module-utils
+      - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/roadiehq-scaffolder-backend-module-utils:bs_1.45.3__4.1.1
         disabled: false
       - package: ./dynamic-plugins/dist/backstage-community-plugin-scaffolder-backend-module-kubernetes-dynamic
         disabled: false
-      - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-scaffolder-backend-module-quay:bs_1.45.3__2.14.0!backstage-community-plugin-scaffolder-backend-module-quay
+      - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-scaffolder-backend-module-quay:bs_1.45.3__2.14.0
         disabled: false
       - package: ./dynamic-plugins/dist/backstage-community-plugin-scaffolder-backend-module-regex-dynamic
         disabled: false
@@ -126,9 +126,9 @@ global:
             username: "temp"
             # The password to use for authentication.
             password: "temp"
-      - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-scaffolder-backend-module-sonarqube:bs_1.45.3__2.11.0!backstage-community-plugin-scaffolder-backend-module-sonarqube
+      - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-scaffolder-backend-module-sonarqube:bs_1.45.3__2.11.0
         disabled: false
-      - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-3scale-backend:bs_1.45.3__3.10.0!backstage-community-plugin-3scale-backend
+      - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-3scale-backend:bs_1.45.3__3.10.0
         disabled: true
         pluginConfig:
           catalog:
@@ -137,7 +137,7 @@ global:
                 default:
                   baseUrl: "temp"
                   accessToken: "temp"
-      - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-plugin-scaffolder-backend-module-bitbucket-cloud:bs_1.45.3__0.2.15!backstage-plugin-scaffolder-backend-module-bitbucket-cloud
+      - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-plugin-scaffolder-backend-module-bitbucket-cloud:bs_1.45.3__0.2.15
         disabled: false
         pluginConfig:
           # https://backstage.io/docs/integrations/bitbucketCloud/discovery#configuration
@@ -146,17 +146,17 @@ global:
               bitbucketCloud:
                 default: # identifies your ingested dataset
                   workspace: "temp"
-      - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-dynatrace:bs_1.45.3__10.12.1!backstage-community-plugin-dynatrace
+      - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-dynatrace:bs_1.45.3__10.12.1
         disabled: false
-      - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/roadiehq-backstage-plugin-jira:bs_1.45.3__2.14.0!roadiehq-backstage-plugin-jira
+      - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/roadiehq-backstage-plugin-jira:bs_1.45.3__2.14.0
         disabled: false
-      - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/roadiehq-backstage-plugin-datadog:bs_1.45.3__2.6.0!roadiehq-backstage-plugin-datadog
+      - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/roadiehq-backstage-plugin-datadog:bs_1.45.3__2.6.0
         disabled: false
-      - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-nexus-repository-manager:bs_1.45.3__1.19.3!backstage-community-plugin-nexus-repository-manager
+      - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-nexus-repository-manager:bs_1.45.3__1.19.3
         disabled: false
-      - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-jfrog-artifactory:bs_1.45.3__1.24.0!backstage-community-plugin-jfrog-artifactory
+      - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-jfrog-artifactory:bs_1.45.3__1.24.0
         disabled: false
-      - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-lighthouse:bs_1.45.3__0.16.0!backstage-community-plugin-lighthouse
+      - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-lighthouse:bs_1.45.3__0.16.0
         disabled: false
       - package: ./dynamic-plugins/dist/backstage-community-plugin-analytics-provider-segment
         disabled: false
diff --git a/.ci/pipelines/value_files/values_showcase.yaml b/.ci/pipelines/value_files/values_showcase.yaml
index cee24f5a43..73c3def4df 100644
--- a/.ci/pipelines/value_files/values_showcase.yaml
+++ b/.ci/pipelines/value_files/values_showcase.yaml
@@ -125,7 +125,7 @@ global:
         disabled: false
       - package: ./dynamic-plugins/dist/backstage-plugin-catalog-backend-module-github-dynamic
         disabled: false
-      - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/red-hat-developer-hub-backstage-plugin-application-provider-test:bs_1.45.3__0.6.0!red-hat-developer-hub-backstage-plugin-application-provider-test
+      - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/red-hat-developer-hub-backstage-plugin-application-provider-test:bs_1.45.3__0.6.0
         pluginConfig:
           dynamicPlugins:
             frontend:
@@ -138,7 +138,7 @@ global:
                     importName: TestProviderOne
                   - mountPoint: application/provider
                     importName: TestProviderTwo
-      - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/red-hat-developer-hub-backstage-plugin-application-listener-test:bs_1.45.3__0.6.0!red-hat-developer-hub-backstage-plugin-application-listener-test
+      - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/red-hat-developer-hub-backstage-plugin-application-listener-test:bs_1.45.3__0.6.0
         pluginConfig:
           dynamicPlugins:
             frontend:
@@ -234,7 +234,7 @@ global:
       - package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-global-header
         disabled: false
       # Enable an extra header test plugin
-      - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/red-hat-developer-hub-backstage-plugin-global-header-test:bs_1.45.3__0.7.0!red-hat-developer-hub-backstage-plugin-global-header-test
+      - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/red-hat-developer-hub-backstage-plugin-global-header-test:bs_1.45.3__0.7.0
         pluginConfig:
           dynamicPlugins:
             frontend:

From 90aa9302d35b921713fc9510a57505b026861dda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbyn=C4=9Bk=20Dr=C3=A1pela?= <zbynek.drapela@gmail.com>
Date: Thu, 12 Mar 2026 13:13:16 +0100
Subject: [PATCH 02/17] chore(ci): update sanity plugins value yaml to use
 inherit

---
 .../diff-values_showcase-sanity-plugins.yaml  | 48 +++++++++----------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/.ci/pipelines/value_files/diff-values_showcase-sanity-plugins.yaml b/.ci/pipelines/value_files/diff-values_showcase-sanity-plugins.yaml
index 8a6efba841..e6cb89a34f 100644
--- a/.ci/pipelines/value_files/diff-values_showcase-sanity-plugins.yaml
+++ b/.ci/pipelines/value_files/diff-values_showcase-sanity-plugins.yaml
@@ -4,13 +4,13 @@ global:
       #  sanity check https://issues.redhat.com/browse/RHIDP-5301
       - package: ./dynamic-plugins/dist/backstage-plugin-catalog-backend-module-gitlab-org-dynamic
         disabled: false
-      - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/roadiehq-backstage-plugin-github-insights:bs_1.45.3__3.4.1
+      - package: 'oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/roadiehq-backstage-plugin-github-insights:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
-      - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/roadiehq-backstage-plugin-security-insights:bs_1.45.3__3.3.1
+      - package: 'oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/roadiehq-backstage-plugin-security-insights:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
       - package: ./dynamic-plugins/dist/backstage-plugin-scaffolder-backend-module-gitlab-dynamic
         disabled: false
-      - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/immobiliarelabs-backstage-plugin-gitlab:bs_1.45.3__6.13.0
+      - package: 'oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/immobiliarelabs-backstage-plugin-gitlab:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
       - package: ./dynamic-plugins/dist/roadiehq-backstage-plugin-argo-cd-backend-dynamic
         disabled: false
@@ -35,15 +35,15 @@ global:
                   - name: argoInstance1
                     url: "temp"
                     token: "temp"
-      - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-argocd:bs_1.45.3__2.4.0
+      - package: 'oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-argocd:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
       - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-plugin-scaffolder-backend-module-azure:bs_1.45.3__0.2.15
         disabled: false
-      - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-azure-devops-backend:bs_1.45.3__0.23.0
+      - package: 'oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-azure-devops-backend:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
-      - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-azure-devops:bs_1.45.3__0.23.0
+      - package: 'oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-azure-devops:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
-      - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-jenkins-backend:bs_1.45.3__0.22.0
+      - package: 'oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-jenkins-backend:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
         pluginConfig:
           jenkins:
@@ -52,7 +52,7 @@ global:
                 baseUrl: "temp"
                 username: "temp"
                 apiKey: "temp"
-      - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-jenkins:bs_1.45.3__0.26.0
+      - package: 'oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-jenkins:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
       - package: ./dynamic-plugins/dist/backstage-plugin-notifications
         disabled: false
@@ -70,7 +70,7 @@ global:
         disabled: false
       - package: ./dynamic-plugins/dist/backstage-plugin-signals
         disabled: false
-      - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-sonarqube-backend:bs_1.45.3__0.15.0
+      - package: 'oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-sonarqube-backend:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
         pluginConfig:
           sonarqube:
@@ -79,7 +79,7 @@ global:
                 instanceKey: "mySonarqube"
                 baseUrl: "https://default-sonarqube.example.com"
                 apiKey: "123456789abcdef0123456789abcedf012"
-      - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-sonarqube:bs_1.45.3__0.21.0
+      - package: 'oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-sonarqube:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
       - package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-dynamic-home-page
         disabled: false
@@ -95,9 +95,9 @@ global:
               backstage.plugin-techdocs-module-addons-contrib:
                 techdocsAddons:
                   - importName: ReportIssue
-      - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/pagerduty-backstage-plugin:bs_1.45.3__0.16.4
+      - package: 'oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/pagerduty-backstage-plugin:{{ "{{" }}inherit{{ "}}" }}'
         disabled: true
-      - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/pagerduty-backstage-plugin-backend:bs_1.45.3__0.10.1
+      - package: 'oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/pagerduty-backstage-plugin-backend:{{ "{{" }}inherit{{ "}}" }}'
         disabled: true
         pluginConfig:
           pagerDuty:
@@ -106,13 +106,13 @@ global:
               clientId: "temp"
               clientSecret: "temp"
               subDomain: "temp"
-      - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-plugin-scaffolder-backend-module-gerrit:bs_1.45.3__0.2.15
+      - package: 'oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-plugin-scaffolder-backend-module-gerrit:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
-      - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/roadiehq-scaffolder-backend-module-utils:bs_1.45.3__4.1.1
+      - package: 'oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/roadiehq-scaffolder-backend-module-utils:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
       - package: ./dynamic-plugins/dist/backstage-community-plugin-scaffolder-backend-module-kubernetes-dynamic
         disabled: false
-      - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-scaffolder-backend-module-quay:bs_1.45.3__2.14.0
+      - package: 'oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-scaffolder-backend-module-quay:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
       - package: ./dynamic-plugins/dist/backstage-community-plugin-scaffolder-backend-module-regex-dynamic
         disabled: false
@@ -126,9 +126,9 @@ global:
             username: "temp"
             # The password to use for authentication.
             password: "temp"
-      - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-scaffolder-backend-module-sonarqube:bs_1.45.3__2.11.0
+      - package: 'oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-scaffolder-backend-module-sonarqube:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
-      - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-3scale-backend:bs_1.45.3__3.10.0
+      - package: 'oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-3scale-backend:{{ "{{" }}inherit{{ "}}" }}'
         disabled: true
         pluginConfig:
           catalog:
@@ -137,7 +137,7 @@ global:
                 default:
                   baseUrl: "temp"
                   accessToken: "temp"
-      - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-plugin-scaffolder-backend-module-bitbucket-cloud:bs_1.45.3__0.2.15
+      - package: 'oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-plugin-scaffolder-backend-module-bitbucket-cloud:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
         pluginConfig:
           # https://backstage.io/docs/integrations/bitbucketCloud/discovery#configuration
@@ -146,17 +146,17 @@ global:
               bitbucketCloud:
                 default: # identifies your ingested dataset
                   workspace: "temp"
-      - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-dynatrace:bs_1.45.3__10.12.1
+      - package: 'oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-dynatrace:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
-      - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/roadiehq-backstage-plugin-jira:bs_1.45.3__2.14.0
+      - package: 'oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/roadiehq-backstage-plugin-jira:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
-      - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/roadiehq-backstage-plugin-datadog:bs_1.45.3__2.6.0
+      - package: 'oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/roadiehq-backstage-plugin-datadog:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
-      - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-nexus-repository-manager:bs_1.45.3__1.19.3
+      - package: 'oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-nexus-repository-manager:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
-      - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-jfrog-artifactory:bs_1.45.3__1.24.0
+      - package: 'oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-jfrog-artifactory:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
-      - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-lighthouse:bs_1.45.3__0.16.0
+      - package: 'oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-lighthouse:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
       - package: ./dynamic-plugins/dist/backstage-community-plugin-analytics-provider-segment
         disabled: false

From a3cf2c83c2f34ccc18e5e166ea6debca1f912ffa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbyn=C4=9Bk=20Dr=C3=A1pela?= <zbynek.drapela@gmail.com>
Date: Thu, 12 Mar 2026 13:27:34 +0100
Subject: [PATCH 03/17] chore(ci): disable scorecard plugin on K8s

---
 .ci/pipelines/value_files/diff-values_showcase_AKS.yaml | 6 ++++++
 .ci/pipelines/value_files/diff-values_showcase_EKS.yaml | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/.ci/pipelines/value_files/diff-values_showcase_AKS.yaml b/.ci/pipelines/value_files/diff-values_showcase_AKS.yaml
index 21b3f19a6a..06ac42999b 100644
--- a/.ci/pipelines/value_files/diff-values_showcase_AKS.yaml
+++ b/.ci/pipelines/value_files/diff-values_showcase_AKS.yaml
@@ -9,6 +9,12 @@ global:
     plugins:
       - package: ./dynamic-plugins/dist/backstage-community-plugin-catalog-backend-module-scaffolder-relation-processor-dynamic
         disabled: false
+
+      # Scorecard - test ignored
+      # Test file: e2e-tests/playwright/e2e/plugins/scorecard/scorecard.spec.ts
+      - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/red-hat-developer-hub-backstage-plugin-scorecard:bs_1.45.3__2.3.5
+        disabled: true
+
       # Disable orchestrator plugins for AKS
       - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-orchestrator:{{ "{{" }}inherit{{ "}}" }}'
         disabled: true
diff --git a/.ci/pipelines/value_files/diff-values_showcase_EKS.yaml b/.ci/pipelines/value_files/diff-values_showcase_EKS.yaml
index a1e8c6495b..072c5422de 100644
--- a/.ci/pipelines/value_files/diff-values_showcase_EKS.yaml
+++ b/.ci/pipelines/value_files/diff-values_showcase_EKS.yaml
@@ -11,6 +11,12 @@ global:
     plugins:
       - package: ./dynamic-plugins/dist/backstage-community-plugin-catalog-backend-module-scaffolder-relation-processor-dynamic
         disabled: false
+
+      # Scorecard - test ignored
+      # Test file: e2e-tests/playwright/e2e/plugins/scorecard/scorecard.spec.ts
+      - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/red-hat-developer-hub-backstage-plugin-scorecard:bs_1.45.3__2.3.5
+        disabled: true
+
       # Disable orchestrator plugins for EKS
       - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-orchestrator:{{ "{{" }}inherit{{ "}}" }}'
         disabled: true

From 5118e0f745668c5b6ca35ba62808263e9a306d42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbyn=C4=9Bk=20Dr=C3=A1pela?= <zbynek.drapela@gmail.com>
Date: Thu, 12 Mar 2026 14:47:29 +0100
Subject: [PATCH 04/17] chore(ci): disable unused plugins on K8s platforms

re-enable scorecard on K8s
---
 .../diff-values_showcase-rbac_AKS.yaml        | 26 ++++++++++++++-
 .../diff-values_showcase-rbac_EKS.yaml        | 26 ++++++++++++++-
 .../diff-values_showcase-rbac_GKE.yaml        | 32 +++++++++++++++++--
 .../value_files/diff-values_showcase_AKS.yaml |  7 ++--
 .../value_files/diff-values_showcase_EKS.yaml |  7 ++--
 .../value_files/diff-values_showcase_GKE.yaml | 12 +------
 6 files changed, 87 insertions(+), 23 deletions(-)

diff --git a/.ci/pipelines/value_files/diff-values_showcase-rbac_AKS.yaml b/.ci/pipelines/value_files/diff-values_showcase-rbac_AKS.yaml
index c56af19527..8e88328d4d 100644
--- a/.ci/pipelines/value_files/diff-values_showcase-rbac_AKS.yaml
+++ b/.ci/pipelines/value_files/diff-values_showcase-rbac_AKS.yaml
@@ -6,7 +6,31 @@ route:
   enabled: false
 global:
   dynamic:
-    plugins: []
+    plugins:
+      # These plugins correspond to tests that are ignored in showcase-rbac-k8s project
+      # See e2e-tests/playwright.config.ts SHOWCASE_RBAC_K8S config
+
+      # Tekton not in showcase-rbac-k8s testMatch
+      - package: ./dynamic-plugins/dist/backstage-community-plugin-tekton
+        disabled: true
+
+      # Adoption Insights not in showcase-rbac-k8s testMatch
+      - package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-adoption-insights
+        disabled: true
+      - package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-adoption-insights-backend-dynamic
+        disabled: true
+      - package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-analytics-module-adoption-insights-dynamic
+        disabled: true
+
+      # Orchestrator tests ignored on showcase-rbac-k8s: e2e-tests/playwright/e2e/plugins/orchestrator/*.spec.ts
+      - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-orchestrator:{{ "{{" }}inherit{{ "}}" }}'
+        disabled: true
+      - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-orchestrator-backend:{{ "{{" }}inherit{{ "}}" }}'
+        disabled: true
+      - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-scaffolder-backend-module-orchestrator:{{ "{{" }}inherit{{ "}}" }}'
+        disabled: true
+      - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-orchestrator-form-widgets:{{ "{{" }}inherit{{ "}}" }}'
+        disabled: true
 upstream:
   backstage:
     appConfig:
diff --git a/.ci/pipelines/value_files/diff-values_showcase-rbac_EKS.yaml b/.ci/pipelines/value_files/diff-values_showcase-rbac_EKS.yaml
index f8ae7eb0fb..445e37c084 100644
--- a/.ci/pipelines/value_files/diff-values_showcase-rbac_EKS.yaml
+++ b/.ci/pipelines/value_files/diff-values_showcase-rbac_EKS.yaml
@@ -6,7 +6,31 @@ route:
   enabled: false
 global:
   dynamic:
-    plugins: []
+    plugins:
+      # These plugins correspond to tests that are ignored in showcase-rbac-k8s project
+      # See e2e-tests/playwright.config.ts SHOWCASE_RBAC_K8S config
+
+      # Tekton not in showcase-rbac-k8s testMatch
+      - package: ./dynamic-plugins/dist/backstage-community-plugin-tekton
+        disabled: true
+
+      # Adoption Insights not in showcase-rbac-k8s testMatch
+      - package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-adoption-insights
+        disabled: true
+      - package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-adoption-insights-backend-dynamic
+        disabled: true
+      - package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-analytics-module-adoption-insights-dynamic
+        disabled: true
+
+      # Orchestrator tests ignored on showcase-rbac-k8s: e2e-tests/playwright/e2e/plugins/orchestrator/*.spec.ts
+      - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-orchestrator:{{ "{{" }}inherit{{ "}}" }}'
+        disabled: true
+      - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-orchestrator-backend:{{ "{{" }}inherit{{ "}}" }}'
+        disabled: true
+      - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-scaffolder-backend-module-orchestrator:{{ "{{" }}inherit{{ "}}" }}'
+        disabled: true
+      - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-orchestrator-form-widgets:{{ "{{" }}inherit{{ "}}" }}'
+        disabled: true
 upstream:
   backstage:
     appConfig:
diff --git a/.ci/pipelines/value_files/diff-values_showcase-rbac_GKE.yaml b/.ci/pipelines/value_files/diff-values_showcase-rbac_GKE.yaml
index 2c1eb9e2c9..31f7008b81 100644
--- a/.ci/pipelines/value_files/diff-values_showcase-rbac_GKE.yaml
+++ b/.ci/pipelines/value_files/diff-values_showcase-rbac_GKE.yaml
@@ -1,12 +1,40 @@
 # This file is for GKE installation only.
 # It is applied by `helm upgrade` after the `values-showcase.yaml` is applied and only contains complementary differences for GKE.
 # Note, that it overwrites the whole key that is present in this file.
-#   e.g. global.dynamic.plugins key is completely overwritten by the content of this file.
+# The only exception is global.dynamic.plugins, that gets merged with the base file.
 route:
   enabled: false
 global:
   dynamic:
-    plugins: []
+    plugins:
+      # Disable plugins to save disk space on GKE
+      # These plugins correspond to tests that are ignored in showcase-rbac-k8s project
+      # See e2e-tests/playwright.config.ts SHOWCASE_RBAC_K8S config
+
+      # Tekton - not installed on K8s clusters (AKS/EKS/GKE)
+      # Not in showcase-rbac-k8s testMatch
+      - package: ./dynamic-plugins/dist/backstage-community-plugin-tekton
+        disabled: true
+
+      # Adoption Insights - large plugin (~300MB) causing disk space issues
+      # Not in showcase-rbac-k8s testMatch
+      - package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-adoption-insights
+        disabled: true
+      - package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-adoption-insights-backend-dynamic
+        disabled: true
+      - package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-analytics-module-adoption-insights-dynamic
+        disabled: true
+
+      # Orchestrator - large OCI plugins causing disk space issues
+      # Tests ignored on showcase-rbac-k8s: e2e-tests/playwright/e2e/plugins/orchestrator/*.spec.ts
+      - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-orchestrator:{{ "{{" }}inherit{{ "}}" }}'
+        disabled: true
+      - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-orchestrator-backend:{{ "{{" }}inherit{{ "}}" }}'
+        disabled: true
+      - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-scaffolder-backend-module-orchestrator:{{ "{{" }}inherit{{ "}}" }}'
+        disabled: true
+      - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-orchestrator-form-widgets:{{ "{{" }}inherit{{ "}}" }}'
+        disabled: true
 upstream:
   backstage:
     appConfig:
diff --git a/.ci/pipelines/value_files/diff-values_showcase_AKS.yaml b/.ci/pipelines/value_files/diff-values_showcase_AKS.yaml
index 06ac42999b..f0bd5c1728 100644
--- a/.ci/pipelines/value_files/diff-values_showcase_AKS.yaml
+++ b/.ci/pipelines/value_files/diff-values_showcase_AKS.yaml
@@ -10,12 +10,11 @@ global:
       - package: ./dynamic-plugins/dist/backstage-community-plugin-catalog-backend-module-scaffolder-relation-processor-dynamic
         disabled: false
 
-      # Scorecard - test ignored
-      # Test file: e2e-tests/playwright/e2e/plugins/scorecard/scorecard.spec.ts
-      - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/red-hat-developer-hub-backstage-plugin-scorecard:bs_1.45.3__2.3.5
+      # Tekton not installed on K8s clusters
+      - package: ./dynamic-plugins/dist/backstage-community-plugin-tekton
         disabled: true
 
-      # Disable orchestrator plugins for AKS
+      # Orchestrator tests ignored on showcase-k8s
       - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-orchestrator:{{ "{{" }}inherit{{ "}}" }}'
         disabled: true
       - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-orchestrator-backend:{{ "{{" }}inherit{{ "}}" }}'
diff --git a/.ci/pipelines/value_files/diff-values_showcase_EKS.yaml b/.ci/pipelines/value_files/diff-values_showcase_EKS.yaml
index 072c5422de..a10ff6046c 100644
--- a/.ci/pipelines/value_files/diff-values_showcase_EKS.yaml
+++ b/.ci/pipelines/value_files/diff-values_showcase_EKS.yaml
@@ -12,12 +12,11 @@ global:
       - package: ./dynamic-plugins/dist/backstage-community-plugin-catalog-backend-module-scaffolder-relation-processor-dynamic
         disabled: false
 
-      # Scorecard - test ignored
-      # Test file: e2e-tests/playwright/e2e/plugins/scorecard/scorecard.spec.ts
-      - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/red-hat-developer-hub-backstage-plugin-scorecard:bs_1.45.3__2.3.5
+      # Tekton not installed on K8s clusters
+      - package: ./dynamic-plugins/dist/backstage-community-plugin-tekton
         disabled: true
 
-      # Disable orchestrator plugins for EKS
+      # Orchestrator tests ignored on showcase-k8s
       - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-orchestrator:{{ "{{" }}inherit{{ "}}" }}'
         disabled: true
       - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-orchestrator-backend:{{ "{{" }}inherit{{ "}}" }}'
diff --git a/.ci/pipelines/value_files/diff-values_showcase_GKE.yaml b/.ci/pipelines/value_files/diff-values_showcase_GKE.yaml
index 96a17c64dc..af5d7ea7bf 100644
--- a/.ci/pipelines/value_files/diff-values_showcase_GKE.yaml
+++ b/.ci/pipelines/value_files/diff-values_showcase_GKE.yaml
@@ -9,7 +9,7 @@ global:
     plugins:
       # Disable plugins to save disk space on GKE
       # These plugins correspond to tests that are ignored in showcase-k8s project
-      # See e2e-tests/playwright.config.ts lines 109-125
+      # See e2e-tests/playwright.config.ts SHOWCASE_K8S config
 
       # Tekton - test ignored
       # Test file: e2e-tests/playwright/e2e/plugins/tekton/tekton.spec.ts
@@ -23,16 +23,6 @@ global:
       - package: ./dynamic-plugins/dist/backstage-community-plugin-ocm
         disabled: true
 
-      # Dynamic Home Page - test ignored
-      # Test file: e2e-tests/playwright/e2e/dynamic-home-page-customization.spec.ts
-      - package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-dynamic-home-page
-        disabled: true
-
-      # Scorecard - test ignored
-      # Test file: e2e-tests/playwright/e2e/plugins/scorecard/scorecard.spec.ts
-      - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/red-hat-developer-hub-backstage-plugin-scorecard:bs_1.45.3__2.3.5
-        disabled: true
-
       # Adoption Insights - large plugin (~300MB) causing disk space issues
       # This plugin IS tested on showcase-k8s normally, but disabled on GKE to save disk space
       # Test skipped on GKE: e2e-tests/playwright/e2e/plugins/adoption-insights/adoption-insights.spec.ts

From a8136bfe2976b733198ee5eeabfaab3b685d663d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbyn=C4=9Bk=20Dr=C3=A1pela?= <zbynek.drapela@gmail.com>
Date: Tue, 17 Mar 2026 13:08:58 +0100
Subject: [PATCH 05/17] chore(ci): switch value files from wrappers to OCI
 completely

---
 .../diff-values_showcase-rbac_AKS.yaml        |  8 +--
 .../diff-values_showcase-rbac_EKS.yaml        |  8 +--
 .../diff-values_showcase-rbac_GKE.yaml        |  8 +--
 .../diff-values_showcase-sanity-plugins.yaml  | 42 +++++++-------
 .../value_files/diff-values_showcase_AKS.yaml |  4 +-
 .../value_files/diff-values_showcase_EKS.yaml |  4 +-
 .../value_files/diff-values_showcase_GKE.yaml | 14 ++---
 .../values_showcase-auth-providers.yaml       |  8 +--
 .../value_files/values_showcase-rbac.yaml     | 32 +++++------
 .../value_files/values_showcase.yaml          | 56 +++++++++----------
 10 files changed, 92 insertions(+), 92 deletions(-)

diff --git a/.ci/pipelines/value_files/diff-values_showcase-rbac_AKS.yaml b/.ci/pipelines/value_files/diff-values_showcase-rbac_AKS.yaml
index 8e88328d4d..90c2f7cbab 100644
--- a/.ci/pipelines/value_files/diff-values_showcase-rbac_AKS.yaml
+++ b/.ci/pipelines/value_files/diff-values_showcase-rbac_AKS.yaml
@@ -11,15 +11,15 @@ global:
       # See e2e-tests/playwright.config.ts SHOWCASE_RBAC_K8S config
 
       # Tekton not in showcase-rbac-k8s testMatch
-      - package: ./dynamic-plugins/dist/backstage-community-plugin-tekton
+      - package: 'oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-tekton:{{ "{{" }}inherit{{ "}}" }}'
         disabled: true
 
       # Adoption Insights not in showcase-rbac-k8s testMatch
-      - package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-adoption-insights
+      - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-adoption-insights:{{ "{{" }}inherit{{ "}}" }}'
         disabled: true
-      - package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-adoption-insights-backend-dynamic
+      - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-adoption-insights-backend:{{ "{{" }}inherit{{ "}}" }}'
         disabled: true
-      - package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-analytics-module-adoption-insights-dynamic
+      - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-analytics-module-adoption-insights:{{ "{{" }}inherit{{ "}}" }}'
         disabled: true
 
       # Orchestrator tests ignored on showcase-rbac-k8s: e2e-tests/playwright/e2e/plugins/orchestrator/*.spec.ts
diff --git a/.ci/pipelines/value_files/diff-values_showcase-rbac_EKS.yaml b/.ci/pipelines/value_files/diff-values_showcase-rbac_EKS.yaml
index 445e37c084..8fc18e1b90 100644
--- a/.ci/pipelines/value_files/diff-values_showcase-rbac_EKS.yaml
+++ b/.ci/pipelines/value_files/diff-values_showcase-rbac_EKS.yaml
@@ -11,15 +11,15 @@ global:
       # See e2e-tests/playwright.config.ts SHOWCASE_RBAC_K8S config
 
       # Tekton not in showcase-rbac-k8s testMatch
-      - package: ./dynamic-plugins/dist/backstage-community-plugin-tekton
+      - package: 'oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-tekton:{{ "{{" }}inherit{{ "}}" }}'
         disabled: true
 
       # Adoption Insights not in showcase-rbac-k8s testMatch
-      - package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-adoption-insights
+      - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-adoption-insights:{{ "{{" }}inherit{{ "}}" }}'
         disabled: true
-      - package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-adoption-insights-backend-dynamic
+      - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-adoption-insights-backend:{{ "{{" }}inherit{{ "}}" }}'
         disabled: true
-      - package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-analytics-module-adoption-insights-dynamic
+      - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-analytics-module-adoption-insights:{{ "{{" }}inherit{{ "}}" }}'
         disabled: true
 
       # Orchestrator tests ignored on showcase-rbac-k8s: e2e-tests/playwright/e2e/plugins/orchestrator/*.spec.ts
diff --git a/.ci/pipelines/value_files/diff-values_showcase-rbac_GKE.yaml b/.ci/pipelines/value_files/diff-values_showcase-rbac_GKE.yaml
index 31f7008b81..15ce731359 100644
--- a/.ci/pipelines/value_files/diff-values_showcase-rbac_GKE.yaml
+++ b/.ci/pipelines/value_files/diff-values_showcase-rbac_GKE.yaml
@@ -13,16 +13,16 @@ global:
 
       # Tekton - not installed on K8s clusters (AKS/EKS/GKE)
       # Not in showcase-rbac-k8s testMatch
-      - package: ./dynamic-plugins/dist/backstage-community-plugin-tekton
+      - package: 'oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-tekton:{{ "{{" }}inherit{{ "}}" }}'
         disabled: true
 
       # Adoption Insights - large plugin (~300MB) causing disk space issues
       # Not in showcase-rbac-k8s testMatch
-      - package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-adoption-insights
+      - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-adoption-insights:{{ "{{" }}inherit{{ "}}" }}'
         disabled: true
-      - package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-adoption-insights-backend-dynamic
+      - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-adoption-insights-backend:{{ "{{" }}inherit{{ "}}" }}'
         disabled: true
-      - package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-analytics-module-adoption-insights-dynamic
+      - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-analytics-module-adoption-insights:{{ "{{" }}inherit{{ "}}" }}'
         disabled: true
 
       # Orchestrator - large OCI plugins causing disk space issues
diff --git a/.ci/pipelines/value_files/diff-values_showcase-sanity-plugins.yaml b/.ci/pipelines/value_files/diff-values_showcase-sanity-plugins.yaml
index e6cb89a34f..7c34928840 100644
--- a/.ci/pipelines/value_files/diff-values_showcase-sanity-plugins.yaml
+++ b/.ci/pipelines/value_files/diff-values_showcase-sanity-plugins.yaml
@@ -2,17 +2,17 @@ global:
   dynamic:
     plugins:
       #  sanity check https://issues.redhat.com/browse/RHIDP-5301
-      - package: ./dynamic-plugins/dist/backstage-plugin-catalog-backend-module-gitlab-org-dynamic
+      - package: 'oci://registry.access.redhat.com/rhdh/backstage-plugin-catalog-backend-module-gitlab-org:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
       - package: 'oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/roadiehq-backstage-plugin-github-insights:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
       - package: 'oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/roadiehq-backstage-plugin-security-insights:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
-      - package: ./dynamic-plugins/dist/backstage-plugin-scaffolder-backend-module-gitlab-dynamic
+      - package: 'oci://registry.access.redhat.com/rhdh/backstage-plugin-scaffolder-backend-module-gitlab:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
       - package: 'oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/immobiliarelabs-backstage-plugin-gitlab:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
-      - package: ./dynamic-plugins/dist/roadiehq-backstage-plugin-argo-cd-backend-dynamic
+      - package: 'oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/roadiehq-backstage-plugin-argo-cd-backend:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
         pluginConfig:
           argocd:
@@ -23,7 +23,7 @@ global:
                 instances:
                   - name: argoInstance1
                     url: "temp"
-      - package: ./dynamic-plugins/dist/roadiehq-scaffolder-backend-argocd-dynamic
+      - package: 'oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/roadiehq-scaffolder-backend-argocd:{{ "{{" }}inherit{{ "}}" }}'
         disabled: true
         pluginConfig:
           argocd:
@@ -54,11 +54,11 @@ global:
                 apiKey: "temp"
       - package: 'oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-jenkins:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
-      - package: ./dynamic-plugins/dist/backstage-plugin-notifications
+      - package: 'oci://registry.access.redhat.com/rhdh/backstage-plugin-notifications:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
-      - package: ./dynamic-plugins/dist/backstage-plugin-notifications-backend-dynamic
+      - package: 'oci://registry.access.redhat.com/rhdh/backstage-plugin-notifications-backend:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
-      - package: ./dynamic-plugins/dist/backstage-plugin-notifications-backend-module-email-dynamic
+      - package: 'oci://registry.access.redhat.com/rhdh/backstage-plugin-notifications-backend-module-email:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
         pluginConfig:
           notifications:
@@ -66,9 +66,9 @@ global:
               email:
                 transportConfig:
                 sender: "temp"
-      - package: ./dynamic-plugins/dist/backstage-plugin-signals-backend-dynamic
+      - package: 'oci://registry.access.redhat.com/rhdh/backstage-plugin-signals-backend:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
-      - package: ./dynamic-plugins/dist/backstage-plugin-signals
+      - package: 'oci://registry.access.redhat.com/rhdh/backstage-plugin-signals:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
       - package: 'oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-sonarqube-backend:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
@@ -81,13 +81,13 @@ global:
                 apiKey: "123456789abcdef0123456789abcedf012"
       - package: 'oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-sonarqube:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
-      - package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-dynamic-home-page
+      - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-dynamic-home-page:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
-      - package: ./dynamic-plugins/dist/backstage-plugin-techdocs-backend-dynamic
+      - package: 'oci://registry.access.redhat.com/rhdh/backstage-plugin-techdocs-backend:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
-      - package: ./dynamic-plugins/dist/backstage-plugin-techdocs
+      - package: 'oci://registry.access.redhat.com/rhdh/backstage-plugin-techdocs:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
-      - package: ./dynamic-plugins/dist/backstage-plugin-techdocs-module-addons-contrib
+      - package: 'oci://registry.access.redhat.com/rhdh/backstage-plugin-techdocs-module-addons-contrib:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
         pluginConfig:
           dynamicPlugins:
@@ -110,13 +110,13 @@ global:
         disabled: false
       - package: 'oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/roadiehq-scaffolder-backend-module-utils:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
-      - package: ./dynamic-plugins/dist/backstage-community-plugin-scaffolder-backend-module-kubernetes-dynamic
+      - package: 'oci://registry.access.redhat.com/rhdh/backstage-community-plugin-scaffolder-backend-module-kubernetes:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
       - package: 'oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-scaffolder-backend-module-quay:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
-      - package: ./dynamic-plugins/dist/backstage-community-plugin-scaffolder-backend-module-regex-dynamic
+      - package: 'oci://registry.access.redhat.com/rhdh/backstage-community-plugin-scaffolder-backend-module-regex:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
-      - package: ./dynamic-plugins/dist/backstage-community-plugin-scaffolder-backend-module-servicenow-dynamic
+      - package: 'oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-scaffolder-backend-module-servicenow:{{ "{{" }}inherit{{ "}}" }}'
         disabled: true
         pluginConfig:
           servicenow:
@@ -158,11 +158,11 @@ global:
         disabled: false
       - package: 'oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-lighthouse:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
-      - package: ./dynamic-plugins/dist/backstage-community-plugin-analytics-provider-segment
+      - package: 'oci://registry.access.redhat.com/rhdh/backstage-community-plugin-analytics-provider-segment:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
-      - package: ./dynamic-plugins/dist/backstage-community-plugin-catalog-backend-module-scaffolder-relation-processor-dynamic
+      - package: 'oci://registry.access.redhat.com/rhdh/backstage-community-plugin-catalog-backend-module-scaffolder-relation-processor:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
-      - package: ./dynamic-plugins/dist/backstage-plugin-catalog-backend-module-msgraph-dynamic
+      - package: 'oci://registry.access.redhat.com/rhdh/backstage-plugin-catalog-backend-module-msgraph:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
         pluginConfig:
           catalog:
@@ -181,7 +181,7 @@ global:
                       seconds: 15
                     timeout:
                       minutes: 15
-      - package: ./dynamic-plugins/dist/backstage-plugin-catalog-backend-module-ldap-dynamic
+      - package: 'oci://registry.access.redhat.com/rhdh/backstage-plugin-catalog-backend-module-ldap:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
         pluginConfig:
           catalog:
@@ -209,5 +209,5 @@ global:
                     timeout:
                       minutes: 15
 
-      - package: ./dynamic-plugins/dist/backstage-community-plugin-catalog-backend-module-pingidentity-dynamic
+      - package: 'oci://registry.access.redhat.com/rhdh/backstage-community-plugin-catalog-backend-module-pingidentity:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
diff --git a/.ci/pipelines/value_files/diff-values_showcase_AKS.yaml b/.ci/pipelines/value_files/diff-values_showcase_AKS.yaml
index f0bd5c1728..2d50500881 100644
--- a/.ci/pipelines/value_files/diff-values_showcase_AKS.yaml
+++ b/.ci/pipelines/value_files/diff-values_showcase_AKS.yaml
@@ -7,11 +7,11 @@ route:
 global:
   dynamic:
     plugins:
-      - package: ./dynamic-plugins/dist/backstage-community-plugin-catalog-backend-module-scaffolder-relation-processor-dynamic
+      - package: 'oci://registry.access.redhat.com/rhdh/backstage-community-plugin-catalog-backend-module-scaffolder-relation-processor:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
 
       # Tekton not installed on K8s clusters
-      - package: ./dynamic-plugins/dist/backstage-community-plugin-tekton
+      - package: 'oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-tekton:{{ "{{" }}inherit{{ "}}" }}'
         disabled: true
 
       # Orchestrator tests ignored on showcase-k8s
diff --git a/.ci/pipelines/value_files/diff-values_showcase_EKS.yaml b/.ci/pipelines/value_files/diff-values_showcase_EKS.yaml
index a10ff6046c..99ed357f63 100644
--- a/.ci/pipelines/value_files/diff-values_showcase_EKS.yaml
+++ b/.ci/pipelines/value_files/diff-values_showcase_EKS.yaml
@@ -9,11 +9,11 @@ global:
   host: $EKS_INSTANCE_DOMAIN_NAME
   dynamic:
     plugins:
-      - package: ./dynamic-plugins/dist/backstage-community-plugin-catalog-backend-module-scaffolder-relation-processor-dynamic
+      - package: 'oci://registry.access.redhat.com/rhdh/backstage-community-plugin-catalog-backend-module-scaffolder-relation-processor:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
 
       # Tekton not installed on K8s clusters
-      - package: ./dynamic-plugins/dist/backstage-community-plugin-tekton
+      - package: 'oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-tekton:{{ "{{" }}inherit{{ "}}" }}'
         disabled: true
 
       # Orchestrator tests ignored on showcase-k8s
diff --git a/.ci/pipelines/value_files/diff-values_showcase_GKE.yaml b/.ci/pipelines/value_files/diff-values_showcase_GKE.yaml
index af5d7ea7bf..31754a163a 100644
--- a/.ci/pipelines/value_files/diff-values_showcase_GKE.yaml
+++ b/.ci/pipelines/value_files/diff-values_showcase_GKE.yaml
@@ -13,24 +13,24 @@ global:
 
       # Tekton - test ignored
       # Test file: e2e-tests/playwright/e2e/plugins/tekton/tekton.spec.ts
-      - package: ./dynamic-plugins/dist/backstage-community-plugin-tekton
+      - package: 'oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-tekton:{{ "{{" }}inherit{{ "}}" }}'
         disabled: true
 
       # OCM - test ignored
       # Test file: e2e-tests/playwright/e2e/plugins/ocm.spec.ts (currently doesn't exist)
-      - package: ./dynamic-plugins/dist/backstage-community-plugin-ocm-backend-dynamic
+      - package: 'oci://registry.access.redhat.com/rhdh/backstage-community-plugin-ocm-backend:{{ "{{" }}inherit{{ "}}" }}'
         disabled: true
-      - package: ./dynamic-plugins/dist/backstage-community-plugin-ocm
+      - package: 'oci://registry.access.redhat.com/rhdh/backstage-community-plugin-ocm:{{ "{{" }}inherit{{ "}}" }}'
         disabled: true
 
       # Adoption Insights - large plugin (~300MB) causing disk space issues
       # This plugin IS tested on showcase-k8s normally, but disabled on GKE to save disk space
       # Test skipped on GKE: e2e-tests/playwright/e2e/plugins/adoption-insights/adoption-insights.spec.ts
-      - package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-adoption-insights
+      - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-adoption-insights:{{ "{{" }}inherit{{ "}}" }}'
         disabled: true
-      - package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-adoption-insights-backend-dynamic
+      - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-adoption-insights-backend:{{ "{{" }}inherit{{ "}}" }}'
         disabled: true
-      - package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-analytics-module-adoption-insights-dynamic
+      - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-analytics-module-adoption-insights:{{ "{{" }}inherit{{ "}}" }}'
         disabled: true
 
       # Orchestrator - large OCI plugins causing disk space issues
@@ -45,7 +45,7 @@ global:
         disabled: true
 
       # Scaffolder relation processor - keep enabled for K8s
-      - package: ./dynamic-plugins/dist/backstage-community-plugin-catalog-backend-module-scaffolder-relation-processor-dynamic
+      - package: 'oci://registry.access.redhat.com/rhdh/backstage-community-plugin-catalog-backend-module-scaffolder-relation-processor:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
 upstream:
   backstage:
diff --git a/.ci/pipelines/value_files/values_showcase-auth-providers.yaml b/.ci/pipelines/value_files/values_showcase-auth-providers.yaml
index 37883e16ad..6409f60ffc 100644
--- a/.ci/pipelines/value_files/values_showcase-auth-providers.yaml
+++ b/.ci/pipelines/value_files/values_showcase-auth-providers.yaml
@@ -3,13 +3,13 @@ global:
     includes:
       - dynamic-plugins.default.yaml
     plugins:
-      - package: ./dynamic-plugins/dist/backstage-community-plugin-catalog-backend-module-keycloak-dynamic
+      - package: 'oci://registry.access.redhat.com/rhdh/backstage-community-plugin-catalog-backend-module-keycloak:{{ "{{" }}inherit{{ "}}" }}'
         disabled: true
-      - package: ./dynamic-plugins/dist/backstage-plugin-catalog-backend-module-github-org-dynamic
+      - package: 'oci://registry.access.redhat.com/rhdh/backstage-plugin-catalog-backend-module-github-org:{{ "{{" }}inherit{{ "}}" }}'
         disabled: true
-      - package: ./dynamic-plugins/dist/backstage-plugin-catalog-backend-module-msgraph-dynamic
+      - package: 'oci://registry.access.redhat.com/rhdh/backstage-plugin-catalog-backend-module-msgraph:{{ "{{" }}inherit{{ "}}" }}'
         disabled: true
-      - package: ./dynamic-plugins/dist/backstage-community-plugin-rbac
+      - package: 'oci://registry.access.redhat.com/rhdh/backstage-community-plugin-rbac:{{ "{{" }}inherit{{ "}}" }}'
         disabled: true
 upstream:
   backstage:
diff --git a/.ci/pipelines/value_files/values_showcase-rbac.yaml b/.ci/pipelines/value_files/values_showcase-rbac.yaml
index 52fdd5822a..1286914444 100644
--- a/.ci/pipelines/value_files/values_showcase-rbac.yaml
+++ b/.ci/pipelines/value_files/values_showcase-rbac.yaml
@@ -20,7 +20,7 @@ global:
     plugins:
       # Enforce new quick start configuration for now but normally this should not be required.
       # FIXME: remove this again.
-      - package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-quickstart
+      - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-quickstart:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
         pluginConfig:
           app:
@@ -121,7 +121,7 @@ global:
                     importName: QuickstartButton
                     config:
                       priority: 100
-      - package: ./dynamic-plugins/dist/backstage-plugin-catalog-backend-module-github-dynamic
+      - package: 'oci://registry.access.redhat.com/rhdh/backstage-plugin-catalog-backend-module-github:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
         pluginConfig:
           catalog:
@@ -138,7 +138,7 @@ global:
                       minutes: 1
                     initialDelay:
                       seconds: 15
-      - package: ./dynamic-plugins/dist/backstage-plugin-catalog-backend-module-github-org-dynamic
+      - package: 'oci://registry.access.redhat.com/rhdh/backstage-plugin-catalog-backend-module-github-org:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
         pluginConfig:
           catalog:
@@ -182,15 +182,15 @@ global:
                       if:
                         anyOf:
                           - isQuayAvailable
-      - package: ./dynamic-plugins/dist/backstage-community-plugin-catalog-backend-module-keycloak-dynamic
+      - package: 'oci://registry.access.redhat.com/rhdh/backstage-community-plugin-catalog-backend-module-keycloak:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
-      - package: ./dynamic-plugins/dist/backstage-community-plugin-tekton
+      - package: 'oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-tekton:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
-      - package: ./dynamic-plugins/dist/backstage-community-plugin-topology
+      - package: 'oci://registry.access.redhat.com/rhdh/backstage-community-plugin-topology:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
-      - package: ./dynamic-plugins/dist/backstage-plugin-kubernetes
+      - package: 'oci://registry.access.redhat.com/rhdh/backstage-plugin-kubernetes:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
-      - package: ./dynamic-plugins/dist/backstage-plugin-kubernetes-backend-dynamic
+      - package: 'oci://registry.access.redhat.com/rhdh/backstage-plugin-kubernetes-backend:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
         pluginConfig:
           kubernetes:
@@ -220,18 +220,18 @@ global:
             serviceLocatorMethod:
               type: multiTenant
       # Enable Bulk import plugins.
-      - package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-bulk-import-backend-dynamic
+      - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-bulk-import-backend:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
-      - package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-bulk-import
+      - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-bulk-import:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
-      - package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-global-header
+      - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-global-header:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
       # Enable tech-radar plugin.
-      - package: ./dynamic-plugins/dist/backstage-community-plugin-tech-radar
+      - package: 'oci://registry.access.redhat.com/rhdh/backstage-community-plugin-tech-radar:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
-      - package: ./dynamic-plugins/dist/backstage-community-plugin-tech-radar-backend-dynamic
+      - package: 'oci://registry.access.redhat.com/rhdh/backstage-community-plugin-tech-radar-backend:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
-      - package: ./dynamic-plugins/dist/backstage-community-plugin-rbac
+      - package: 'oci://registry.access.redhat.com/rhdh/backstage-community-plugin-rbac:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
         pluginConfig:
           dynamicPlugins:
@@ -255,7 +255,7 @@ global:
                   rbac:
                     parent: default.admin
                     icon: rbacIcon
-      - package: ./dynamic-plugins/dist/backstage-community-plugin-analytics-provider-segment
+      - package: 'oci://registry.access.redhat.com/rhdh/backstage-community-plugin-analytics-provider-segment:{{ "{{" }}inherit{{ "}}" }}'
         disabled: true
       #Enable Scorecard plugin.
       - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/red-hat-developer-hub-backstage-plugin-scorecard:bs_1.45.3__2.3.4
@@ -356,7 +356,7 @@ global:
             frontend:
               red-hat-developer-hub.backstage-plugin-orchestrator-form-widgets: {}
 
-      - package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-dynamic-home-page
+      - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-dynamic-home-page:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
         pluginConfig:
           dynamicPlugins:
diff --git a/.ci/pipelines/value_files/values_showcase.yaml b/.ci/pipelines/value_files/values_showcase.yaml
index 73c3def4df..5c7c03d3ec 100644
--- a/.ci/pipelines/value_files/values_showcase.yaml
+++ b/.ci/pipelines/value_files/values_showcase.yaml
@@ -20,7 +20,7 @@ global:
     plugins:
       # Enforce new quick start configuration for now but normally this should not be required.
       # FIXME: remove this again.
-      - package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-quickstart
+      - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-quickstart:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
         pluginConfig:
           app:
@@ -121,9 +121,9 @@ global:
                     importName: QuickstartButton
                     config:
                       priority: 100
-      - package: ./dynamic-plugins/dist/backstage-plugin-scaffolder-backend-module-github-dynamic
+      - package: 'oci://registry.access.redhat.com/rhdh/backstage-plugin-scaffolder-backend-module-github:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
-      - package: ./dynamic-plugins/dist/backstage-plugin-catalog-backend-module-github-dynamic
+      - package: 'oci://registry.access.redhat.com/rhdh/backstage-plugin-catalog-backend-module-github:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
       - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/red-hat-developer-hub-backstage-plugin-application-provider-test:bs_1.45.3__0.6.0
         pluginConfig:
@@ -146,7 +146,7 @@ global:
                 mountPoints:
                   - mountPoint: application/listener
                     importName: LocationListener
-      - package: ./dynamic-plugins/dist/backstage-plugin-catalog-backend-module-github-org-dynamic
+      - package: 'oci://registry.access.redhat.com/rhdh/backstage-plugin-catalog-backend-module-github-org:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
         pluginConfig:
           catalog:
@@ -192,13 +192,13 @@ global:
                           - isQuayAvailable
       - package: 'oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-scaffolder-backend-module-quay:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
-      - package: ./dynamic-plugins/dist/backstage-community-plugin-catalog-backend-module-keycloak-dynamic
+      - package: 'oci://registry.access.redhat.com/rhdh/backstage-community-plugin-catalog-backend-module-keycloak:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
-      - package: ./dynamic-plugins/dist/backstage-community-plugin-tekton
+      - package: 'oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-tekton:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
-      - package: ./dynamic-plugins/dist/backstage-plugin-kubernetes
+      - package: 'oci://registry.access.redhat.com/rhdh/backstage-plugin-kubernetes:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
-      - package: ./dynamic-plugins/dist/backstage-plugin-kubernetes-backend-dynamic
+      - package: 'oci://registry.access.redhat.com/rhdh/backstage-plugin-kubernetes-backend:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
         pluginConfig:
           kubernetes:
@@ -227,11 +227,11 @@ global:
             serviceLocatorMethod:
               type: multiTenant
       # Enable bulk import plugins.
-      - package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-bulk-import-backend-dynamic
+      - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-bulk-import-backend:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
-      - package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-bulk-import
+      - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-bulk-import:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
-      - package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-global-header
+      - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-global-header:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
       # Enable an extra header test plugin
       - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/red-hat-developer-hub-backstage-plugin-global-header-test:bs_1.45.3__0.7.0
@@ -249,20 +249,20 @@ global:
                     config:
                       priority: 95
       # Enable notifications plugins.
-      - package: ./dynamic-plugins/dist/backstage-plugin-notifications
+      - package: 'oci://registry.access.redhat.com/rhdh/backstage-plugin-notifications:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
-      - package: ./dynamic-plugins/dist/backstage-plugin-notifications-backend-dynamic
+      - package: 'oci://registry.access.redhat.com/rhdh/backstage-plugin-notifications-backend:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
-      - package: ./dynamic-plugins/dist/backstage-plugin-signals-backend-dynamic
+      - package: 'oci://registry.access.redhat.com/rhdh/backstage-plugin-signals-backend:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
-      - package: ./dynamic-plugins/dist/backstage-plugin-signals
+      - package: 'oci://registry.access.redhat.com/rhdh/backstage-plugin-signals:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
       # Enable tech-radar plugins.
-      - package: ./dynamic-plugins/dist/backstage-community-plugin-tech-radar
+      - package: 'oci://registry.access.redhat.com/rhdh/backstage-community-plugin-tech-radar:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
-      - package: ./dynamic-plugins/dist/backstage-community-plugin-tech-radar-backend-dynamic
+      - package: 'oci://registry.access.redhat.com/rhdh/backstage-community-plugin-tech-radar-backend:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
-      - package: ./dynamic-plugins/dist/backstage-plugin-techdocs-module-addons-contrib
+      - package: 'oci://registry.access.redhat.com/rhdh/backstage-plugin-techdocs-module-addons-contrib:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
         pluginConfig:
           dynamicPlugins:
@@ -270,19 +270,19 @@ global:
               backstage.plugin-techdocs-module-addons-contrib:
                 techdocsAddons:
                   - importName: ReportIssue
-      - package: ./dynamic-plugins/dist/backstage-community-plugin-acr
+      - package: 'oci://registry.access.redhat.com/rhdh/backstage-community-plugin-acr:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
-      - package: ./dynamic-plugins/dist/backstage-community-plugin-scaffolder-backend-module-kubernetes-dynamic
+      - package: 'oci://registry.access.redhat.com/rhdh/backstage-community-plugin-scaffolder-backend-module-kubernetes:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
-      - package: ./dynamic-plugins/dist/roadiehq-scaffolder-backend-module-http-request-dynamic
+      - package: 'oci://registry.access.redhat.com/rhdh/roadiehq-scaffolder-backend-module-http-request:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
-      - package: ./dynamic-plugins/dist/backstage-community-plugin-catalog-backend-module-scaffolder-relation-processor-dynamic
+      - package: 'oci://registry.access.redhat.com/rhdh/backstage-community-plugin-catalog-backend-module-scaffolder-relation-processor:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
       - package: 'oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/immobiliarelabs-backstage-plugin-gitlab-backend:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
-      - package: ./dynamic-plugins/dist/backstage-plugin-catalog-backend-module-gitlab-dynamic
+      - package: 'oci://registry.access.redhat.com/rhdh/backstage-plugin-catalog-backend-module-gitlab:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
-      - package: ./dynamic-plugins/dist/backstage-community-plugin-topology
+      - package: 'oci://registry.access.redhat.com/rhdh/backstage-community-plugin-topology:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
       - package: "@pataknight/backstage-plugin-rhdh-qe-theme@0.5.5"
         disabled: false
@@ -290,13 +290,13 @@ global:
       - package: "@backstage-community/plugin-todo@0.2.42"
         disabled: false
         integrity: sha512-agmfwxHkZPy0zaXzjMKY9Us9l7J2og+z7p2lDWQBmlJ1KZRo6OBQdnlG1mTEryfEEl/bx5Ko+f1PhFj2/BmiIQ==
-      - package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-catalog-backend-module-extensions-dynamic
+      - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-catalog-backend-module-extensions:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
-      - package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-extensions-backend-dynamic
+      - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-extensions-backend:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
-      - package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-extensions
+      - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-extensions:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
-      - package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-global-floating-action-button
+      - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-global-floating-action-button:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
       # Enable orchestrator plugins
       - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-orchestrator:{{ "{{" }}inherit{{ "}}" }}'

From 8f572e6631195ad820e1ca15272378e1789b57c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbyn=C4=9Bk=20Dr=C3=A1pela?= <zbynek.drapela@gmail.com>
Date: Tue, 17 Mar 2026 13:45:57 +0100
Subject: [PATCH 06/17] Revert "chore(ci): switch value files from wrappers to
 OCI completely"

This reverts commit c911db3a0f73d05335cd3e2482ca24b9f07ec5fd.
---
 .../diff-values_showcase-rbac_AKS.yaml        |  8 +--
 .../diff-values_showcase-rbac_EKS.yaml        |  8 +--
 .../diff-values_showcase-rbac_GKE.yaml        |  8 +--
 .../diff-values_showcase-sanity-plugins.yaml  | 42 +++++++-------
 .../value_files/diff-values_showcase_AKS.yaml |  4 +-
 .../value_files/diff-values_showcase_EKS.yaml |  4 +-
 .../value_files/diff-values_showcase_GKE.yaml | 14 ++---
 .../values_showcase-auth-providers.yaml       |  8 +--
 .../value_files/values_showcase-rbac.yaml     | 32 +++++------
 .../value_files/values_showcase.yaml          | 56 +++++++++----------
 10 files changed, 92 insertions(+), 92 deletions(-)

diff --git a/.ci/pipelines/value_files/diff-values_showcase-rbac_AKS.yaml b/.ci/pipelines/value_files/diff-values_showcase-rbac_AKS.yaml
index 90c2f7cbab..8e88328d4d 100644
--- a/.ci/pipelines/value_files/diff-values_showcase-rbac_AKS.yaml
+++ b/.ci/pipelines/value_files/diff-values_showcase-rbac_AKS.yaml
@@ -11,15 +11,15 @@ global:
       # See e2e-tests/playwright.config.ts SHOWCASE_RBAC_K8S config
 
       # Tekton not in showcase-rbac-k8s testMatch
-      - package: 'oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-tekton:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/backstage-community-plugin-tekton
         disabled: true
 
       # Adoption Insights not in showcase-rbac-k8s testMatch
-      - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-adoption-insights:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-adoption-insights
         disabled: true
-      - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-adoption-insights-backend:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-adoption-insights-backend-dynamic
         disabled: true
-      - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-analytics-module-adoption-insights:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-analytics-module-adoption-insights-dynamic
         disabled: true
 
       # Orchestrator tests ignored on showcase-rbac-k8s: e2e-tests/playwright/e2e/plugins/orchestrator/*.spec.ts
diff --git a/.ci/pipelines/value_files/diff-values_showcase-rbac_EKS.yaml b/.ci/pipelines/value_files/diff-values_showcase-rbac_EKS.yaml
index 8fc18e1b90..445e37c084 100644
--- a/.ci/pipelines/value_files/diff-values_showcase-rbac_EKS.yaml
+++ b/.ci/pipelines/value_files/diff-values_showcase-rbac_EKS.yaml
@@ -11,15 +11,15 @@ global:
       # See e2e-tests/playwright.config.ts SHOWCASE_RBAC_K8S config
 
       # Tekton not in showcase-rbac-k8s testMatch
-      - package: 'oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-tekton:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/backstage-community-plugin-tekton
         disabled: true
 
       # Adoption Insights not in showcase-rbac-k8s testMatch
-      - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-adoption-insights:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-adoption-insights
         disabled: true
-      - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-adoption-insights-backend:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-adoption-insights-backend-dynamic
         disabled: true
-      - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-analytics-module-adoption-insights:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-analytics-module-adoption-insights-dynamic
         disabled: true
 
       # Orchestrator tests ignored on showcase-rbac-k8s: e2e-tests/playwright/e2e/plugins/orchestrator/*.spec.ts
diff --git a/.ci/pipelines/value_files/diff-values_showcase-rbac_GKE.yaml b/.ci/pipelines/value_files/diff-values_showcase-rbac_GKE.yaml
index 15ce731359..31f7008b81 100644
--- a/.ci/pipelines/value_files/diff-values_showcase-rbac_GKE.yaml
+++ b/.ci/pipelines/value_files/diff-values_showcase-rbac_GKE.yaml
@@ -13,16 +13,16 @@ global:
 
       # Tekton - not installed on K8s clusters (AKS/EKS/GKE)
       # Not in showcase-rbac-k8s testMatch
-      - package: 'oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-tekton:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/backstage-community-plugin-tekton
         disabled: true
 
       # Adoption Insights - large plugin (~300MB) causing disk space issues
       # Not in showcase-rbac-k8s testMatch
-      - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-adoption-insights:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-adoption-insights
         disabled: true
-      - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-adoption-insights-backend:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-adoption-insights-backend-dynamic
         disabled: true
-      - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-analytics-module-adoption-insights:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-analytics-module-adoption-insights-dynamic
         disabled: true
 
       # Orchestrator - large OCI plugins causing disk space issues
diff --git a/.ci/pipelines/value_files/diff-values_showcase-sanity-plugins.yaml b/.ci/pipelines/value_files/diff-values_showcase-sanity-plugins.yaml
index 7c34928840..e6cb89a34f 100644
--- a/.ci/pipelines/value_files/diff-values_showcase-sanity-plugins.yaml
+++ b/.ci/pipelines/value_files/diff-values_showcase-sanity-plugins.yaml
@@ -2,17 +2,17 @@ global:
   dynamic:
     plugins:
       #  sanity check https://issues.redhat.com/browse/RHIDP-5301
-      - package: 'oci://registry.access.redhat.com/rhdh/backstage-plugin-catalog-backend-module-gitlab-org:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/backstage-plugin-catalog-backend-module-gitlab-org-dynamic
         disabled: false
       - package: 'oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/roadiehq-backstage-plugin-github-insights:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
       - package: 'oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/roadiehq-backstage-plugin-security-insights:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
-      - package: 'oci://registry.access.redhat.com/rhdh/backstage-plugin-scaffolder-backend-module-gitlab:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/backstage-plugin-scaffolder-backend-module-gitlab-dynamic
         disabled: false
       - package: 'oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/immobiliarelabs-backstage-plugin-gitlab:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
-      - package: 'oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/roadiehq-backstage-plugin-argo-cd-backend:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/roadiehq-backstage-plugin-argo-cd-backend-dynamic
         disabled: false
         pluginConfig:
           argocd:
@@ -23,7 +23,7 @@ global:
                 instances:
                   - name: argoInstance1
                     url: "temp"
-      - package: 'oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/roadiehq-scaffolder-backend-argocd:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/roadiehq-scaffolder-backend-argocd-dynamic
         disabled: true
         pluginConfig:
           argocd:
@@ -54,11 +54,11 @@ global:
                 apiKey: "temp"
       - package: 'oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-jenkins:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
-      - package: 'oci://registry.access.redhat.com/rhdh/backstage-plugin-notifications:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/backstage-plugin-notifications
         disabled: false
-      - package: 'oci://registry.access.redhat.com/rhdh/backstage-plugin-notifications-backend:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/backstage-plugin-notifications-backend-dynamic
         disabled: false
-      - package: 'oci://registry.access.redhat.com/rhdh/backstage-plugin-notifications-backend-module-email:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/backstage-plugin-notifications-backend-module-email-dynamic
         disabled: false
         pluginConfig:
           notifications:
@@ -66,9 +66,9 @@ global:
               email:
                 transportConfig:
                 sender: "temp"
-      - package: 'oci://registry.access.redhat.com/rhdh/backstage-plugin-signals-backend:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/backstage-plugin-signals-backend-dynamic
         disabled: false
-      - package: 'oci://registry.access.redhat.com/rhdh/backstage-plugin-signals:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/backstage-plugin-signals
         disabled: false
       - package: 'oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-sonarqube-backend:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
@@ -81,13 +81,13 @@ global:
                 apiKey: "123456789abcdef0123456789abcedf012"
       - package: 'oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-sonarqube:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
-      - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-dynamic-home-page:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-dynamic-home-page
         disabled: false
-      - package: 'oci://registry.access.redhat.com/rhdh/backstage-plugin-techdocs-backend:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/backstage-plugin-techdocs-backend-dynamic
         disabled: false
-      - package: 'oci://registry.access.redhat.com/rhdh/backstage-plugin-techdocs:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/backstage-plugin-techdocs
         disabled: false
-      - package: 'oci://registry.access.redhat.com/rhdh/backstage-plugin-techdocs-module-addons-contrib:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/backstage-plugin-techdocs-module-addons-contrib
         disabled: false
         pluginConfig:
           dynamicPlugins:
@@ -110,13 +110,13 @@ global:
         disabled: false
       - package: 'oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/roadiehq-scaffolder-backend-module-utils:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
-      - package: 'oci://registry.access.redhat.com/rhdh/backstage-community-plugin-scaffolder-backend-module-kubernetes:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/backstage-community-plugin-scaffolder-backend-module-kubernetes-dynamic
         disabled: false
       - package: 'oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-scaffolder-backend-module-quay:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
-      - package: 'oci://registry.access.redhat.com/rhdh/backstage-community-plugin-scaffolder-backend-module-regex:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/backstage-community-plugin-scaffolder-backend-module-regex-dynamic
         disabled: false
-      - package: 'oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-scaffolder-backend-module-servicenow:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/backstage-community-plugin-scaffolder-backend-module-servicenow-dynamic
         disabled: true
         pluginConfig:
           servicenow:
@@ -158,11 +158,11 @@ global:
         disabled: false
       - package: 'oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-lighthouse:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
-      - package: 'oci://registry.access.redhat.com/rhdh/backstage-community-plugin-analytics-provider-segment:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/backstage-community-plugin-analytics-provider-segment
         disabled: false
-      - package: 'oci://registry.access.redhat.com/rhdh/backstage-community-plugin-catalog-backend-module-scaffolder-relation-processor:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/backstage-community-plugin-catalog-backend-module-scaffolder-relation-processor-dynamic
         disabled: false
-      - package: 'oci://registry.access.redhat.com/rhdh/backstage-plugin-catalog-backend-module-msgraph:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/backstage-plugin-catalog-backend-module-msgraph-dynamic
         disabled: false
         pluginConfig:
           catalog:
@@ -181,7 +181,7 @@ global:
                       seconds: 15
                     timeout:
                       minutes: 15
-      - package: 'oci://registry.access.redhat.com/rhdh/backstage-plugin-catalog-backend-module-ldap:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/backstage-plugin-catalog-backend-module-ldap-dynamic
         disabled: false
         pluginConfig:
           catalog:
@@ -209,5 +209,5 @@ global:
                     timeout:
                       minutes: 15
 
-      - package: 'oci://registry.access.redhat.com/rhdh/backstage-community-plugin-catalog-backend-module-pingidentity:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/backstage-community-plugin-catalog-backend-module-pingidentity-dynamic
         disabled: false
diff --git a/.ci/pipelines/value_files/diff-values_showcase_AKS.yaml b/.ci/pipelines/value_files/diff-values_showcase_AKS.yaml
index 2d50500881..f0bd5c1728 100644
--- a/.ci/pipelines/value_files/diff-values_showcase_AKS.yaml
+++ b/.ci/pipelines/value_files/diff-values_showcase_AKS.yaml
@@ -7,11 +7,11 @@ route:
 global:
   dynamic:
     plugins:
-      - package: 'oci://registry.access.redhat.com/rhdh/backstage-community-plugin-catalog-backend-module-scaffolder-relation-processor:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/backstage-community-plugin-catalog-backend-module-scaffolder-relation-processor-dynamic
         disabled: false
 
       # Tekton not installed on K8s clusters
-      - package: 'oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-tekton:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/backstage-community-plugin-tekton
         disabled: true
 
       # Orchestrator tests ignored on showcase-k8s
diff --git a/.ci/pipelines/value_files/diff-values_showcase_EKS.yaml b/.ci/pipelines/value_files/diff-values_showcase_EKS.yaml
index 99ed357f63..a10ff6046c 100644
--- a/.ci/pipelines/value_files/diff-values_showcase_EKS.yaml
+++ b/.ci/pipelines/value_files/diff-values_showcase_EKS.yaml
@@ -9,11 +9,11 @@ global:
   host: $EKS_INSTANCE_DOMAIN_NAME
   dynamic:
     plugins:
-      - package: 'oci://registry.access.redhat.com/rhdh/backstage-community-plugin-catalog-backend-module-scaffolder-relation-processor:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/backstage-community-plugin-catalog-backend-module-scaffolder-relation-processor-dynamic
         disabled: false
 
       # Tekton not installed on K8s clusters
-      - package: 'oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-tekton:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/backstage-community-plugin-tekton
         disabled: true
 
       # Orchestrator tests ignored on showcase-k8s
diff --git a/.ci/pipelines/value_files/diff-values_showcase_GKE.yaml b/.ci/pipelines/value_files/diff-values_showcase_GKE.yaml
index 31754a163a..af5d7ea7bf 100644
--- a/.ci/pipelines/value_files/diff-values_showcase_GKE.yaml
+++ b/.ci/pipelines/value_files/diff-values_showcase_GKE.yaml
@@ -13,24 +13,24 @@ global:
 
       # Tekton - test ignored
       # Test file: e2e-tests/playwright/e2e/plugins/tekton/tekton.spec.ts
-      - package: 'oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-tekton:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/backstage-community-plugin-tekton
         disabled: true
 
       # OCM - test ignored
       # Test file: e2e-tests/playwright/e2e/plugins/ocm.spec.ts (currently doesn't exist)
-      - package: 'oci://registry.access.redhat.com/rhdh/backstage-community-plugin-ocm-backend:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/backstage-community-plugin-ocm-backend-dynamic
         disabled: true
-      - package: 'oci://registry.access.redhat.com/rhdh/backstage-community-plugin-ocm:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/backstage-community-plugin-ocm
         disabled: true
 
       # Adoption Insights - large plugin (~300MB) causing disk space issues
       # This plugin IS tested on showcase-k8s normally, but disabled on GKE to save disk space
       # Test skipped on GKE: e2e-tests/playwright/e2e/plugins/adoption-insights/adoption-insights.spec.ts
-      - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-adoption-insights:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-adoption-insights
         disabled: true
-      - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-adoption-insights-backend:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-adoption-insights-backend-dynamic
         disabled: true
-      - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-analytics-module-adoption-insights:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-analytics-module-adoption-insights-dynamic
         disabled: true
 
       # Orchestrator - large OCI plugins causing disk space issues
@@ -45,7 +45,7 @@ global:
         disabled: true
 
       # Scaffolder relation processor - keep enabled for K8s
-      - package: 'oci://registry.access.redhat.com/rhdh/backstage-community-plugin-catalog-backend-module-scaffolder-relation-processor:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/backstage-community-plugin-catalog-backend-module-scaffolder-relation-processor-dynamic
         disabled: false
 upstream:
   backstage:
diff --git a/.ci/pipelines/value_files/values_showcase-auth-providers.yaml b/.ci/pipelines/value_files/values_showcase-auth-providers.yaml
index 6409f60ffc..37883e16ad 100644
--- a/.ci/pipelines/value_files/values_showcase-auth-providers.yaml
+++ b/.ci/pipelines/value_files/values_showcase-auth-providers.yaml
@@ -3,13 +3,13 @@ global:
     includes:
       - dynamic-plugins.default.yaml
     plugins:
-      - package: 'oci://registry.access.redhat.com/rhdh/backstage-community-plugin-catalog-backend-module-keycloak:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/backstage-community-plugin-catalog-backend-module-keycloak-dynamic
         disabled: true
-      - package: 'oci://registry.access.redhat.com/rhdh/backstage-plugin-catalog-backend-module-github-org:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/backstage-plugin-catalog-backend-module-github-org-dynamic
         disabled: true
-      - package: 'oci://registry.access.redhat.com/rhdh/backstage-plugin-catalog-backend-module-msgraph:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/backstage-plugin-catalog-backend-module-msgraph-dynamic
         disabled: true
-      - package: 'oci://registry.access.redhat.com/rhdh/backstage-community-plugin-rbac:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/backstage-community-plugin-rbac
         disabled: true
 upstream:
   backstage:
diff --git a/.ci/pipelines/value_files/values_showcase-rbac.yaml b/.ci/pipelines/value_files/values_showcase-rbac.yaml
index 1286914444..52fdd5822a 100644
--- a/.ci/pipelines/value_files/values_showcase-rbac.yaml
+++ b/.ci/pipelines/value_files/values_showcase-rbac.yaml
@@ -20,7 +20,7 @@ global:
     plugins:
       # Enforce new quick start configuration for now but normally this should not be required.
       # FIXME: remove this again.
-      - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-quickstart:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-quickstart
         disabled: false
         pluginConfig:
           app:
@@ -121,7 +121,7 @@ global:
                     importName: QuickstartButton
                     config:
                       priority: 100
-      - package: 'oci://registry.access.redhat.com/rhdh/backstage-plugin-catalog-backend-module-github:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/backstage-plugin-catalog-backend-module-github-dynamic
         disabled: false
         pluginConfig:
           catalog:
@@ -138,7 +138,7 @@ global:
                       minutes: 1
                     initialDelay:
                       seconds: 15
-      - package: 'oci://registry.access.redhat.com/rhdh/backstage-plugin-catalog-backend-module-github-org:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/backstage-plugin-catalog-backend-module-github-org-dynamic
         disabled: false
         pluginConfig:
           catalog:
@@ -182,15 +182,15 @@ global:
                       if:
                         anyOf:
                           - isQuayAvailable
-      - package: 'oci://registry.access.redhat.com/rhdh/backstage-community-plugin-catalog-backend-module-keycloak:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/backstage-community-plugin-catalog-backend-module-keycloak-dynamic
         disabled: false
-      - package: 'oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-tekton:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/backstage-community-plugin-tekton
         disabled: false
-      - package: 'oci://registry.access.redhat.com/rhdh/backstage-community-plugin-topology:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/backstage-community-plugin-topology
         disabled: false
-      - package: 'oci://registry.access.redhat.com/rhdh/backstage-plugin-kubernetes:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/backstage-plugin-kubernetes
         disabled: false
-      - package: 'oci://registry.access.redhat.com/rhdh/backstage-plugin-kubernetes-backend:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/backstage-plugin-kubernetes-backend-dynamic
         disabled: false
         pluginConfig:
           kubernetes:
@@ -220,18 +220,18 @@ global:
             serviceLocatorMethod:
               type: multiTenant
       # Enable Bulk import plugins.
-      - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-bulk-import-backend:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-bulk-import-backend-dynamic
         disabled: false
-      - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-bulk-import:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-bulk-import
         disabled: false
-      - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-global-header:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-global-header
         disabled: false
       # Enable tech-radar plugin.
-      - package: 'oci://registry.access.redhat.com/rhdh/backstage-community-plugin-tech-radar:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/backstage-community-plugin-tech-radar
         disabled: false
-      - package: 'oci://registry.access.redhat.com/rhdh/backstage-community-plugin-tech-radar-backend:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/backstage-community-plugin-tech-radar-backend-dynamic
         disabled: false
-      - package: 'oci://registry.access.redhat.com/rhdh/backstage-community-plugin-rbac:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/backstage-community-plugin-rbac
         disabled: false
         pluginConfig:
           dynamicPlugins:
@@ -255,7 +255,7 @@ global:
                   rbac:
                     parent: default.admin
                     icon: rbacIcon
-      - package: 'oci://registry.access.redhat.com/rhdh/backstage-community-plugin-analytics-provider-segment:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/backstage-community-plugin-analytics-provider-segment
         disabled: true
       #Enable Scorecard plugin.
       - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/red-hat-developer-hub-backstage-plugin-scorecard:bs_1.45.3__2.3.4
@@ -356,7 +356,7 @@ global:
             frontend:
               red-hat-developer-hub.backstage-plugin-orchestrator-form-widgets: {}
 
-      - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-dynamic-home-page:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-dynamic-home-page
         disabled: false
         pluginConfig:
           dynamicPlugins:
diff --git a/.ci/pipelines/value_files/values_showcase.yaml b/.ci/pipelines/value_files/values_showcase.yaml
index 5c7c03d3ec..73c3def4df 100644
--- a/.ci/pipelines/value_files/values_showcase.yaml
+++ b/.ci/pipelines/value_files/values_showcase.yaml
@@ -20,7 +20,7 @@ global:
     plugins:
       # Enforce new quick start configuration for now but normally this should not be required.
       # FIXME: remove this again.
-      - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-quickstart:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-quickstart
         disabled: false
         pluginConfig:
           app:
@@ -121,9 +121,9 @@ global:
                     importName: QuickstartButton
                     config:
                       priority: 100
-      - package: 'oci://registry.access.redhat.com/rhdh/backstage-plugin-scaffolder-backend-module-github:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/backstage-plugin-scaffolder-backend-module-github-dynamic
         disabled: false
-      - package: 'oci://registry.access.redhat.com/rhdh/backstage-plugin-catalog-backend-module-github:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/backstage-plugin-catalog-backend-module-github-dynamic
         disabled: false
       - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/red-hat-developer-hub-backstage-plugin-application-provider-test:bs_1.45.3__0.6.0
         pluginConfig:
@@ -146,7 +146,7 @@ global:
                 mountPoints:
                   - mountPoint: application/listener
                     importName: LocationListener
-      - package: 'oci://registry.access.redhat.com/rhdh/backstage-plugin-catalog-backend-module-github-org:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/backstage-plugin-catalog-backend-module-github-org-dynamic
         disabled: false
         pluginConfig:
           catalog:
@@ -192,13 +192,13 @@ global:
                           - isQuayAvailable
       - package: 'oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-scaffolder-backend-module-quay:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
-      - package: 'oci://registry.access.redhat.com/rhdh/backstage-community-plugin-catalog-backend-module-keycloak:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/backstage-community-plugin-catalog-backend-module-keycloak-dynamic
         disabled: false
-      - package: 'oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-tekton:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/backstage-community-plugin-tekton
         disabled: false
-      - package: 'oci://registry.access.redhat.com/rhdh/backstage-plugin-kubernetes:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/backstage-plugin-kubernetes
         disabled: false
-      - package: 'oci://registry.access.redhat.com/rhdh/backstage-plugin-kubernetes-backend:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/backstage-plugin-kubernetes-backend-dynamic
         disabled: false
         pluginConfig:
           kubernetes:
@@ -227,11 +227,11 @@ global:
             serviceLocatorMethod:
               type: multiTenant
       # Enable bulk import plugins.
-      - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-bulk-import-backend:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-bulk-import-backend-dynamic
         disabled: false
-      - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-bulk-import:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-bulk-import
         disabled: false
-      - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-global-header:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-global-header
         disabled: false
       # Enable an extra header test plugin
       - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/red-hat-developer-hub-backstage-plugin-global-header-test:bs_1.45.3__0.7.0
@@ -249,20 +249,20 @@ global:
                     config:
                       priority: 95
       # Enable notifications plugins.
-      - package: 'oci://registry.access.redhat.com/rhdh/backstage-plugin-notifications:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/backstage-plugin-notifications
         disabled: false
-      - package: 'oci://registry.access.redhat.com/rhdh/backstage-plugin-notifications-backend:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/backstage-plugin-notifications-backend-dynamic
         disabled: false
-      - package: 'oci://registry.access.redhat.com/rhdh/backstage-plugin-signals-backend:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/backstage-plugin-signals-backend-dynamic
         disabled: false
-      - package: 'oci://registry.access.redhat.com/rhdh/backstage-plugin-signals:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/backstage-plugin-signals
         disabled: false
       # Enable tech-radar plugins.
-      - package: 'oci://registry.access.redhat.com/rhdh/backstage-community-plugin-tech-radar:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/backstage-community-plugin-tech-radar
         disabled: false
-      - package: 'oci://registry.access.redhat.com/rhdh/backstage-community-plugin-tech-radar-backend:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/backstage-community-plugin-tech-radar-backend-dynamic
         disabled: false
-      - package: 'oci://registry.access.redhat.com/rhdh/backstage-plugin-techdocs-module-addons-contrib:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/backstage-plugin-techdocs-module-addons-contrib
         disabled: false
         pluginConfig:
           dynamicPlugins:
@@ -270,19 +270,19 @@ global:
               backstage.plugin-techdocs-module-addons-contrib:
                 techdocsAddons:
                   - importName: ReportIssue
-      - package: 'oci://registry.access.redhat.com/rhdh/backstage-community-plugin-acr:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/backstage-community-plugin-acr
         disabled: false
-      - package: 'oci://registry.access.redhat.com/rhdh/backstage-community-plugin-scaffolder-backend-module-kubernetes:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/backstage-community-plugin-scaffolder-backend-module-kubernetes-dynamic
         disabled: false
-      - package: 'oci://registry.access.redhat.com/rhdh/roadiehq-scaffolder-backend-module-http-request:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/roadiehq-scaffolder-backend-module-http-request-dynamic
         disabled: false
-      - package: 'oci://registry.access.redhat.com/rhdh/backstage-community-plugin-catalog-backend-module-scaffolder-relation-processor:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/backstage-community-plugin-catalog-backend-module-scaffolder-relation-processor-dynamic
         disabled: false
       - package: 'oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/immobiliarelabs-backstage-plugin-gitlab-backend:{{ "{{" }}inherit{{ "}}" }}'
         disabled: false
-      - package: 'oci://registry.access.redhat.com/rhdh/backstage-plugin-catalog-backend-module-gitlab:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/backstage-plugin-catalog-backend-module-gitlab-dynamic
         disabled: false
-      - package: 'oci://registry.access.redhat.com/rhdh/backstage-community-plugin-topology:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/backstage-community-plugin-topology
         disabled: false
       - package: "@pataknight/backstage-plugin-rhdh-qe-theme@0.5.5"
         disabled: false
@@ -290,13 +290,13 @@ global:
       - package: "@backstage-community/plugin-todo@0.2.42"
         disabled: false
         integrity: sha512-agmfwxHkZPy0zaXzjMKY9Us9l7J2og+z7p2lDWQBmlJ1KZRo6OBQdnlG1mTEryfEEl/bx5Ko+f1PhFj2/BmiIQ==
-      - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-catalog-backend-module-extensions:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-catalog-backend-module-extensions-dynamic
         disabled: false
-      - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-extensions-backend:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-extensions-backend-dynamic
         disabled: false
-      - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-extensions:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-extensions
         disabled: false
-      - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-global-floating-action-button:{{ "{{" }}inherit{{ "}}" }}'
+      - package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-global-floating-action-button
         disabled: false
       # Enable orchestrator plugins
       - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-orchestrator:{{ "{{" }}inherit{{ "}}" }}'

From 52b173f94c4261714713124f28ac73935377b5ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbyn=C4=9Bk=20Dr=C3=A1pela?= <zbynek.drapela@gmail.com>
Date: Tue, 17 Mar 2026 13:45:48 +0100
Subject: [PATCH 07/17] chore(ci): fix inherit for Operator

---
 .ci/pipelines/utils.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.ci/pipelines/utils.sh b/.ci/pipelines/utils.sh
index 7aad65cc31..27c8ee8f61 100755
--- a/.ci/pipelines/utils.sh
+++ b/.ci/pipelines/utils.sh
@@ -765,7 +765,7 @@ metadata:
   name: dynamic-plugins
 data:
   dynamic-plugins.yaml: |" > ${final_file}
-  yq '.global.dynamic' ${base_file} | sed -e 's/^/    /' >> ${final_file}
+  yq '.global.dynamic' ${base_file} | sed -e 's/^/    /' -e 's/{{ "{{" }}inherit{{ "}}" }}/{{inherit}}/g' >> ${final_file}
 }
 
 create_conditional_policies_operator() {

From c92d7a2f306e822c1c2af6a96c826b2e30ef45ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbyn=C4=9Bk=20Dr=C3=A1pela?= <zbynek.drapela@gmail.com>
Date: Wed, 18 Mar 2026 13:55:46 +0100
Subject: [PATCH 08/17] fix: rbac E2E tests with API

---
 e2e-tests/playwright/e2e/audit-log/log-utils.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/e2e-tests/playwright/e2e/audit-log/log-utils.ts b/e2e-tests/playwright/e2e/audit-log/log-utils.ts
index 6f5bf73f1f..cfed8f0817 100644
--- a/e2e-tests/playwright/e2e/audit-log/log-utils.ts
+++ b/e2e-tests/playwright/e2e/audit-log/log-utils.ts
@@ -187,8 +187,10 @@ export class LogUtils {
     maxRetries: number = 4,
     retryDelay: number = 2000,
   ): Promise<string> {
-    const podSelector =
-      "app.kubernetes.io/component=backstage,app.kubernetes.io/name=developer-hub";
+    const isOperator = process.env.JOB_NAME?.includes("operator") ?? false;
+    const podSelector = isOperator
+      ? "app.kubernetes.io/component=backstage,app.kubernetes.io/instance=rhdh,app.kubernetes.io/name=backstage"
+      : "app.kubernetes.io/component=backstage,app.kubernetes.io/name=developer-hub";
     const tailNumber = 100;
 
     let grepCommand = `oc logs -l ${podSelector} --tail=${tailNumber} -c backstage-backend -n ${namespace}`;

From 9f76d0663022c338f6f01886a912978bf175b898 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbyn=C4=9Bk=20Dr=C3=A1pela?= <zbynek.drapela@gmail.com>
Date: Wed, 18 Mar 2026 14:05:37 +0100
Subject: [PATCH 09/17] chore(e2e): extract RHDH pod selector for both Helm and
 Operator

---
 .../playwright/e2e/audit-log/log-utils.ts     |  6 ++--
 e2e-tests/playwright/utils/constants.ts       | 10 +++++++
 e2e-tests/playwright/utils/helper.ts          | 29 +++++++++++++++----
 e2e-tests/playwright/utils/kube-client.ts     |  8 ++---
 4 files changed, 39 insertions(+), 14 deletions(-)

diff --git a/e2e-tests/playwright/e2e/audit-log/log-utils.ts b/e2e-tests/playwright/e2e/audit-log/log-utils.ts
index cfed8f0817..44e384f757 100644
--- a/e2e-tests/playwright/e2e/audit-log/log-utils.ts
+++ b/e2e-tests/playwright/e2e/audit-log/log-utils.ts
@@ -7,6 +7,7 @@ import {
   type EventStatus,
   type EventSeverityLevel,
 } from "./logs";
+import { getBackstagePodSelector } from "../../utils/helper";
 
 export class LogUtils {
   /**
@@ -187,10 +188,7 @@ export class LogUtils {
     maxRetries: number = 4,
     retryDelay: number = 2000,
   ): Promise<string> {
-    const isOperator = process.env.JOB_NAME?.includes("operator") ?? false;
-    const podSelector = isOperator
-      ? "app.kubernetes.io/component=backstage,app.kubernetes.io/instance=rhdh,app.kubernetes.io/name=backstage"
-      : "app.kubernetes.io/component=backstage,app.kubernetes.io/name=developer-hub";
+    const podSelector = getBackstagePodSelector();
     const tailNumber = 100;
 
     let grepCommand = `oc logs -l ${podSelector} --tail=${tailNumber} -c backstage-backend -n ${namespace}`;
diff --git a/e2e-tests/playwright/utils/constants.ts b/e2e-tests/playwright/utils/constants.ts
index 8fa788450b..ae348e5955 100644
--- a/e2e-tests/playwright/utils/constants.ts
+++ b/e2e-tests/playwright/utils/constants.ts
@@ -67,3 +67,13 @@ export type JobTypePattern =
   (typeof JOB_TYPE_PATTERNS)[keyof typeof JOB_TYPE_PATTERNS];
 export type IsOpenShiftValue =
   (typeof IS_OPENSHIFT_VALUES)[keyof typeof IS_OPENSHIFT_VALUES];
+
+/**
+ * Kubernetes label selectors for backstage pods per deployment method.
+ * Helm and Operator use different `app.kubernetes.io/name` values.
+ */
+export const BACKSTAGE_POD_SELECTOR = {
+  HELM: "app.kubernetes.io/component=backstage,app.kubernetes.io/name=developer-hub",
+  OPERATOR:
+    "app.kubernetes.io/component=backstage,app.kubernetes.io/instance=rhdh,app.kubernetes.io/name=backstage",
+} as const;
diff --git a/e2e-tests/playwright/utils/helper.ts b/e2e-tests/playwright/utils/helper.ts
index 55668265cc..22e39f41c6 100644
--- a/e2e-tests/playwright/utils/helper.ts
+++ b/e2e-tests/playwright/utils/helper.ts
@@ -1,10 +1,11 @@
 import { type Page, type Locator } from "@playwright/test";
 import fs from "fs";
-import type {
-  JobNamePattern,
-  JobNameRegexPattern,
-  JobTypePattern,
-  IsOpenShiftValue,
+import {
+  BACKSTAGE_POD_SELECTOR,
+  type JobNamePattern,
+  type JobNameRegexPattern,
+  type JobTypePattern,
+  type IsOpenShiftValue,
 } from "./constants";
 
 export async function downloadAndReadFile(
@@ -104,3 +105,21 @@ export function skipIfJobType(jobTypePattern: JobTypePattern): boolean {
 export function skipIfIsOpenShift(isOpenShiftValue: IsOpenShiftValue): boolean {
   return process.env.IS_OPENSHIFT === isOpenShiftValue;
 }
+
+/**
+ * Returns the Kubernetes label selector for backstage pods based on deployment method.
+ * Operator and Helm deployments use different `app.kubernetes.io/name` values.
+ *
+ * @returns The appropriate label selector string
+ *
+ * @example
+ * const selector = getBackstagePodSelector();
+ * // Helm:     "app.kubernetes.io/component=backstage,app.kubernetes.io/name=developer-hub"
+ * // Operator: "app.kubernetes.io/component=backstage,app.kubernetes.io/instance=rhdh,app.kubernetes.io/name=backstage"
+ */
+export function getBackstagePodSelector(): string {
+  const isOperator = process.env.JOB_NAME?.includes("operator") ?? false;
+  return isOperator
+    ? BACKSTAGE_POD_SELECTOR.OPERATOR
+    : BACKSTAGE_POD_SELECTOR.HELM;
+}
diff --git a/e2e-tests/playwright/utils/kube-client.ts b/e2e-tests/playwright/utils/kube-client.ts
index 0cc8c2ab1d..ee7c3c231b 100644
--- a/e2e-tests/playwright/utils/kube-client.ts
+++ b/e2e-tests/playwright/utils/kube-client.ts
@@ -1,6 +1,7 @@
 import * as k8s from "@kubernetes/client-node";
 import { V1ConfigMap } from "@kubernetes/client-node";
 import * as yaml from "js-yaml";
+import { getBackstagePodSelector } from "./helper";
 
 /**
  * Interface representing the structure of Kubernetes API errors.
@@ -622,8 +623,7 @@ export class KubeClient {
     checkInterval: number = 10000, // 10 seconds
   ) {
     const endTime = Date.now() + timeout;
-    const labelSelector =
-      "app.kubernetes.io/component=backstage,app.kubernetes.io/instance=rhdh,app.kubernetes.io/name=backstage";
+    const labelSelector = getBackstagePodSelector();
 
     while (Date.now() < endTime) {
       try {
@@ -731,9 +731,7 @@ export class KubeClient {
   }
 
   async logPodConditions(namespace: string, labelSelector?: string) {
-    const selector =
-      labelSelector ||
-      "app.kubernetes.io/component=backstage,app.kubernetes.io/instance=rhdh,app.kubernetes.io/name=backstage";
+    const selector = labelSelector || getBackstagePodSelector();
 
     try {
       const response = await this.coreV1Api.listNamespacedPod(

From b817874e5aacecc0c298a6cb4e979fca0cfb38a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbyn=C4=9Bk=20Dr=C3=A1pela?= <zbynek.drapela@gmail.com>
Date: Wed, 18 Mar 2026 15:02:49 +0100
Subject: [PATCH 10/17] Update constants.ts

---
 e2e-tests/playwright/utils/constants.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/e2e-tests/playwright/utils/constants.ts b/e2e-tests/playwright/utils/constants.ts
index ae348e5955..d14f709fe7 100644
--- a/e2e-tests/playwright/utils/constants.ts
+++ b/e2e-tests/playwright/utils/constants.ts
@@ -75,5 +75,5 @@ export type IsOpenShiftValue =
 export const BACKSTAGE_POD_SELECTOR = {
   HELM: "app.kubernetes.io/component=backstage,app.kubernetes.io/name=developer-hub",
   OPERATOR:
-    "app.kubernetes.io/component=backstage,app.kubernetes.io/instance=rhdh,app.kubernetes.io/name=backstage",
+    "app.kubernetes.io/component=backstage,app.kubernetes.io/name=backstage",
 } as const;

From 26715bde052a3646bf567f4611471455509f63bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbyn=C4=9Bk=20Dr=C3=A1pela?= <zbynek.drapela@gmail.com>
Date: Fri, 20 Mar 2026 09:13:40 +0100
Subject: [PATCH 11/17] Use deployment selector

---
 .../playwright/e2e/audit-log/log-utils.ts     | 10 ++-
 e2e-tests/playwright/utils/constants.ts       | 13 ++--
 e2e-tests/playwright/utils/helper.ts          | 31 ++++----
 e2e-tests/playwright/utils/kube-client.ts     | 74 +++++++++++++++----
 4 files changed, 94 insertions(+), 34 deletions(-)

diff --git a/e2e-tests/playwright/e2e/audit-log/log-utils.ts b/e2e-tests/playwright/e2e/audit-log/log-utils.ts
index 44e384f757..a01e3b06d8 100644
--- a/e2e-tests/playwright/e2e/audit-log/log-utils.ts
+++ b/e2e-tests/playwright/e2e/audit-log/log-utils.ts
@@ -7,7 +7,7 @@ import {
   type EventStatus,
   type EventSeverityLevel,
 } from "./logs";
-import { getBackstagePodSelector } from "../../utils/helper";
+import { getBackstageDeploySelector } from "../../utils/helper";
 
 export class LogUtils {
   /**
@@ -188,10 +188,14 @@ export class LogUtils {
     maxRetries: number = 4,
     retryDelay: number = 2000,
   ): Promise<string> {
-    const podSelector = getBackstagePodSelector();
+    const deploySelector = getBackstageDeploySelector();
     const tailNumber = 100;
 
-    let grepCommand = `oc logs -l ${podSelector} --tail=${tailNumber} -c backstage-backend -n ${namespace}`;
+    // Resolve the deployment by its metadata labels, then fetch logs from it.
+    // This works for both Helm and Operator since both set app.kubernetes.io/name
+    // on the Deployment (with different values), even though pod labels differ.
+    const deployTarget = `$(oc get deploy -n ${namespace} -l ${deploySelector} -o name)`;
+    let grepCommand = `oc logs ${deployTarget} --tail=${tailNumber} -c backstage-backend -n ${namespace}`;
     for (const word of filterWords) {
       grepCommand += ` | grep '${word}'`;
     }
diff --git a/e2e-tests/playwright/utils/constants.ts b/e2e-tests/playwright/utils/constants.ts
index d14f709fe7..cd18582063 100644
--- a/e2e-tests/playwright/utils/constants.ts
+++ b/e2e-tests/playwright/utils/constants.ts
@@ -69,11 +69,14 @@ export type IsOpenShiftValue =
   (typeof IS_OPENSHIFT_VALUES)[keyof typeof IS_OPENSHIFT_VALUES];
 
 /**
- * Kubernetes label selectors for backstage pods per deployment method.
- * Helm and Operator use different `app.kubernetes.io/name` values.
+ * Kubernetes deployment-level label selectors for backstage.
+ * Both Helm and Operator set `app.kubernetes.io/name` on Deployment metadata
+ * (but with different values). Use these to resolve the deployment, then
+ * target pods via `oc logs deployment/<name>` or `listNamespacedDeployment`.
+ *
+ * @see https://github.com/redhat-developer/rhdh-operator/blob/main/pkg/utils/utils.go
  */
-export const BACKSTAGE_POD_SELECTOR = {
+export const BACKSTAGE_DEPLOY_SELECTOR = {
   HELM: "app.kubernetes.io/component=backstage,app.kubernetes.io/name=developer-hub",
-  OPERATOR:
-    "app.kubernetes.io/component=backstage,app.kubernetes.io/name=backstage",
+  OPERATOR: "app.kubernetes.io/name=backstage",
 } as const;
diff --git a/e2e-tests/playwright/utils/helper.ts b/e2e-tests/playwright/utils/helper.ts
index 22e39f41c6..69e646f7e3 100644
--- a/e2e-tests/playwright/utils/helper.ts
+++ b/e2e-tests/playwright/utils/helper.ts
@@ -1,7 +1,7 @@
 import { type Page, type Locator } from "@playwright/test";
 import fs from "fs";
 import {
-  BACKSTAGE_POD_SELECTOR,
+  BACKSTAGE_DEPLOY_SELECTOR,
   type JobNamePattern,
   type JobNameRegexPattern,
   type JobTypePattern,
@@ -107,19 +107,24 @@ export function skipIfIsOpenShift(isOpenShiftValue: IsOpenShiftValue): boolean {
 }
 
 /**
- * Returns the Kubernetes label selector for backstage pods based on deployment method.
- * Operator and Helm deployments use different `app.kubernetes.io/name` values.
+ * Returns whether the current job is an Operator deployment.
+ */
+export function isOperatorDeployment(): boolean {
+  return process.env.JOB_NAME?.includes("operator") ?? false;
+}
+
+/**
+ * Returns the deployment-level label selector for the backstage Deployment.
+ * Works with `oc get deploy -l` or `listNamespacedDeployment` to resolve the
+ * deployment, then target pods via `oc logs deployment/<name>`.
  *
- * @returns The appropriate label selector string
+ * Generalizes the auth-providers pattern from rhdh-deployment.ts which queries
+ * deployments (not pods) by `app.kubernetes.io/name` + `app.kubernetes.io/instance`.
  *
- * @example
- * const selector = getBackstagePodSelector();
- * // Helm:     "app.kubernetes.io/component=backstage,app.kubernetes.io/name=developer-hub"
- * // Operator: "app.kubernetes.io/component=backstage,app.kubernetes.io/instance=rhdh,app.kubernetes.io/name=backstage"
+ * @returns The appropriate deployment label selector string
  */
-export function getBackstagePodSelector(): string {
-  const isOperator = process.env.JOB_NAME?.includes("operator") ?? false;
-  return isOperator
-    ? BACKSTAGE_POD_SELECTOR.OPERATOR
-    : BACKSTAGE_POD_SELECTOR.HELM;
+export function getBackstageDeploySelector(): string {
+  return isOperatorDeployment()
+    ? BACKSTAGE_DEPLOY_SELECTOR.OPERATOR
+    : BACKSTAGE_DEPLOY_SELECTOR.HELM;
 }
diff --git a/e2e-tests/playwright/utils/kube-client.ts b/e2e-tests/playwright/utils/kube-client.ts
index ee7c3c231b..4bf51ec350 100644
--- a/e2e-tests/playwright/utils/kube-client.ts
+++ b/e2e-tests/playwright/utils/kube-client.ts
@@ -1,7 +1,6 @@
 import * as k8s from "@kubernetes/client-node";
 import { V1ConfigMap } from "@kubernetes/client-node";
 import * as yaml from "js-yaml";
-import { getBackstagePodSelector } from "./helper";
 
 /**
  * Interface representing the structure of Kubernetes API errors.
@@ -623,7 +622,6 @@ export class KubeClient {
     checkInterval: number = 10000, // 10 seconds
   ) {
     const endTime = Date.now() + timeout;
-    const labelSelector = getBackstagePodSelector();
 
     while (Date.now() < endTime) {
       try {
@@ -635,6 +633,12 @@ export class KubeClient {
         const readyReplicas = response.body.status?.readyReplicas || 0;
         const conditions = response.body.status?.conditions || [];
 
+        // Derive the pod label selector from the deployment's matchLabels
+        const matchLabels = response.body.spec?.selector?.matchLabels || {};
+        const podSelector = Object.entries(matchLabels)
+          .map(([k, v]) => `${k}=${v}`)
+          .join(",");
+
         console.log(`Available replicas: ${availableReplicas}`);
         console.log(
           "Deployment conditions:",
@@ -642,10 +646,10 @@ export class KubeClient {
         );
 
         // Check for pod failure states when expecting replicas > 0
-        if (expectedReplicas > 0) {
+        if (expectedReplicas > 0 && podSelector) {
           const podFailureReason = await this.checkPodFailureStates(
             namespace,
-            labelSelector,
+            podSelector,
           );
           if (podFailureReason) {
             console.error(
@@ -658,8 +662,8 @@ export class KubeClient {
           }
         }
 
-        // Log pod conditions using label selector
-        await this.logPodConditions(namespace, labelSelector);
+        // Log pod conditions using the deployment's pod selector
+        await this.logPodConditions(namespace, podSelector);
 
         // Check if the expected replicas match
         if (availableReplicas === expectedReplicas) {
@@ -701,7 +705,7 @@ export class KubeClient {
       // Scale down deployment to 0 replicas
       console.log(`Scaling down deployment ${deploymentName} to 0 replicas.`);
       console.log(`Deployment: ${deploymentName}, Namespace: ${namespace}`);
-      await this.logPodConditions(namespace);
+      await this.logPodConditionsForDeployment(deploymentName, namespace);
       await this.scaleDeployment(deploymentName, namespace, 0);
       await this.waitForDeploymentReady(deploymentName, namespace, 0, 300000); // 5 minutes for scale down
 
@@ -722,7 +726,7 @@ export class KubeClient {
       console.error(
         `Error during deployment restart: Deployment '${deploymentName}' in namespace '${namespace}': ${getKubeApiErrorMessage(error)}`,
       );
-      await this.logPodConditions(namespace);
+      await this.logPodConditionsForDeployment(deploymentName, namespace);
       await this.logDeploymentEvents(deploymentName, namespace);
       throw new Error(
         `Failed to restart deployment '${deploymentName}' in namespace '${namespace}': ${getKubeApiErrorMessage(error)}`,
@@ -730,9 +734,53 @@ export class KubeClient {
     }
   }
 
-  async logPodConditions(namespace: string, labelSelector?: string) {
-    const selector = labelSelector || getBackstagePodSelector();
+  /**
+   * Resolves the pod label selector from a deployment's spec.selector.matchLabels.
+   * Follows the same pattern as auth-providers' rhdh-deployment.ts.
+   */
+  private async getDeploymentPodSelector(
+    deploymentName: string,
+    namespace: string,
+  ): Promise<string | null> {
+    try {
+      const response = await this.appsApi.readNamespacedDeployment(
+        deploymentName,
+        namespace,
+      );
+      const matchLabels = response.body.spec?.selector?.matchLabels || {};
+      const entries = Object.entries(matchLabels);
+      if (entries.length === 0) return null;
+      return entries.map(([k, v]) => `${k}=${v}`).join(",");
+    } catch (error) {
+      console.error(
+        `Error resolving pod selector for deployment '${deploymentName}': ${getKubeApiErrorMessage(error)}`,
+      );
+      return null;
+    }
+  }
+
+  /**
+   * Logs pod conditions for pods belonging to a specific deployment.
+   * Resolves the pod selector from the deployment's matchLabels.
+   */
+  async logPodConditionsForDeployment(
+    deploymentName: string,
+    namespace: string,
+  ) {
+    const selector = await this.getDeploymentPodSelector(
+      deploymentName,
+      namespace,
+    );
+    if (selector) {
+      await this.logPodConditions(namespace, selector);
+    } else {
+      console.warn(
+        `Could not resolve pod selector for deployment '${deploymentName}'`,
+      );
+    }
+  }
 
+  async logPodConditions(namespace: string, labelSelector: string) {
     try {
       const response = await this.coreV1Api.listNamespacedPod(
         namespace,
@@ -740,11 +788,11 @@ export class KubeClient {
         undefined,
         undefined,
         undefined,
-        selector,
+        labelSelector,
       );
 
       if (response.body.items.length === 0) {
-        console.warn(`No pods found for selector: ${selector}`);
+        console.warn(`No pods found for selector: ${labelSelector}`);
       }
 
       for (const pod of response.body.items) {
@@ -756,7 +804,7 @@ export class KubeClient {
       }
     } catch (error) {
       console.error(
-        `Error while retrieving pod conditions for selector '${selector}': ${getKubeApiErrorMessage(error)}`,
+        `Error while retrieving pod conditions for selector '${labelSelector}': ${getKubeApiErrorMessage(error)}`,
       );
     }
   }

From 835f839de41777b74d35bf3d00c82a582b79a8a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbyn=C4=9Bk=20Dr=C3=A1pela?= <zbynek.drapela@gmail.com>
Date: Fri, 20 Mar 2026 09:16:34 +0100
Subject: [PATCH 12/17] remove duplicate prepare_operator

---
 .ci/pipelines/jobs/ocp-operator.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.ci/pipelines/jobs/ocp-operator.sh b/.ci/pipelines/jobs/ocp-operator.sh
index d9ca782aa9..923de39c40 100644
--- a/.ci/pipelines/jobs/ocp-operator.sh
+++ b/.ci/pipelines/jobs/ocp-operator.sh
@@ -45,8 +45,6 @@ initiate_operator_deployments() {
 initiate_operator_deployments_osd_gcp() {
   log::info "Initiating Operator-backed deployments on OSD-GCP (orchestrator disabled)"
 
-  prepare_operator
-
   configure_namespace "${NAME_SPACE}"
   deploy_test_backstage_customization_provider "${NAME_SPACE}"
   local rhdh_base_url="https://backstage-${RELEASE_NAME}-${NAME_SPACE}.${K8S_CLUSTER_ROUTER_BASE}"

From 3c97b76d93bcb59c53e515ba4d431e92dbafb1c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbyn=C4=9Bk=20Dr=C3=A1pela?= <zbynek.drapela@gmail.com>
Date: Fri, 20 Mar 2026 10:59:16 +0100
Subject: [PATCH 13/17] update gitignore for .local-test

---
 e2e-tests/.gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/e2e-tests/.gitignore b/e2e-tests/.gitignore
index 8b26a2fa9d..00179375cd 100644
--- a/e2e-tests/.gitignore
+++ b/e2e-tests/.gitignore
@@ -69,6 +69,9 @@ site
 # e2e test results
 junit-results.xml
 
+# Local e2e test run files
+.local-test
+
 # auth-providers local runs files
 **/app-config.test.yaml
 **/dynamic-plugins.test.yaml

From 6fcf85fcbdb8c0925d6fe2b6a57901b1d5c2c3aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbyn=C4=9Bk=20Dr=C3=A1pela?= <zbynek.drapela@gmail.com>
Date: Fri, 20 Mar 2026 11:48:15 +0100
Subject: [PATCH 14/17] deduplicate podSelector

---
 e2e-tests/playwright/utils/kube-client.ts | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/e2e-tests/playwright/utils/kube-client.ts b/e2e-tests/playwright/utils/kube-client.ts
index 4bf51ec350..ab1b4349c1 100644
--- a/e2e-tests/playwright/utils/kube-client.ts
+++ b/e2e-tests/playwright/utils/kube-client.ts
@@ -633,11 +633,10 @@ export class KubeClient {
         const readyReplicas = response.body.status?.readyReplicas || 0;
         const conditions = response.body.status?.conditions || [];
 
-        // Derive the pod label selector from the deployment's matchLabels
-        const matchLabels = response.body.spec?.selector?.matchLabels || {};
-        const podSelector = Object.entries(matchLabels)
-          .map(([k, v]) => `${k}=${v}`)
-          .join(",");
+        const podSelector = await this.getDeploymentPodSelector(
+          deploymentName,
+          namespace,
+        );
 
         console.log(`Available replicas: ${availableReplicas}`);
         console.log(
@@ -736,7 +735,6 @@ export class KubeClient {
 
   /**
    * Resolves the pod label selector from a deployment's spec.selector.matchLabels.
-   * Follows the same pattern as auth-providers' rhdh-deployment.ts.
    */
   private async getDeploymentPodSelector(
     deploymentName: string,

From 079dd0474519522ec718236c1234cf78dc926445 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbyn=C4=9Bk=20Dr=C3=A1pela?= <zbynek.drapela@gmail.com>
Date: Fri, 20 Mar 2026 11:49:55 +0100
Subject: [PATCH 15/17] remove unused var

---
 .ci/pipelines/env_variables.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.ci/pipelines/env_variables.sh b/.ci/pipelines/env_variables.sh
index 3b8013395e..fe549b9808 100755
--- a/.ci/pipelines/env_variables.sh
+++ b/.ci/pipelines/env_variables.sh
@@ -131,7 +131,6 @@ AZURE_DB_CERTIFICATES_PATH="/tmp/secrets/azure-db-certificates.pem"
 
 JUNIT_RESULTS="junit-results.xml"
 
-SLACK_DATA_ROUTER_WEBHOOK_URL=$(cat /tmp/secrets/SLACK_DATA_ROUTER_WEBHOOK_URL)
 REDIS_USERNAME=temp
 REDIS_USERNAME_ENCODED=$(printf "%s" $REDIS_USERNAME | base64 | tr -d '\n')
 REDIS_PASSWORD=test123

From c619dcb3dd97a9febbe4543bff6c29774cb72403 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbyn=C4=9Bk=20Dr=C3=A1pela?= <zbynek.drapela@gmail.com>
Date: Mon, 23 Mar 2026 15:29:28 +0100
Subject: [PATCH 16/17] chore(ci): fix pod selector

---
 e2e-tests/playwright/utils/kube-client.ts | 49 +++++++++++------------
 1 file changed, 23 insertions(+), 26 deletions(-)

diff --git a/e2e-tests/playwright/utils/kube-client.ts b/e2e-tests/playwright/utils/kube-client.ts
index ab1b4349c1..b3f2b9ed47 100644
--- a/e2e-tests/playwright/utils/kube-client.ts
+++ b/e2e-tests/playwright/utils/kube-client.ts
@@ -623,6 +623,11 @@ export class KubeClient {
   ) {
     const endTime = Date.now() + timeout;
 
+    const podSelector = await this.getDeploymentPodSelector(
+      deploymentName,
+      namespace,
+    );
+
     while (Date.now() < endTime) {
       try {
         const response = await this.appsApi.readNamespacedDeployment(
@@ -633,11 +638,6 @@ export class KubeClient {
         const readyReplicas = response.body.status?.readyReplicas || 0;
         const conditions = response.body.status?.conditions || [];
 
-        const podSelector = await this.getDeploymentPodSelector(
-          deploymentName,
-          namespace,
-        );
-
         console.log(`Available replicas: ${availableReplicas}`);
         console.log(
           "Deployment conditions:",
@@ -739,22 +739,19 @@ export class KubeClient {
   private async getDeploymentPodSelector(
     deploymentName: string,
     namespace: string,
-  ): Promise<string | null> {
-    try {
-      const response = await this.appsApi.readNamespacedDeployment(
-        deploymentName,
-        namespace,
-      );
-      const matchLabels = response.body.spec?.selector?.matchLabels || {};
-      const entries = Object.entries(matchLabels);
-      if (entries.length === 0) return null;
-      return entries.map(([k, v]) => `${k}=${v}`).join(",");
-    } catch (error) {
-      console.error(
-        `Error resolving pod selector for deployment '${deploymentName}': ${getKubeApiErrorMessage(error)}`,
+  ): Promise<string> {
+    const response = await this.appsApi.readNamespacedDeployment(
+      deploymentName,
+      namespace,
+    );
+    const matchLabels = response.body.spec?.selector?.matchLabels || {};
+    const entries = Object.entries(matchLabels);
+    if (entries.length === 0) {
+      throw new Error(
+        `Deployment '${deploymentName}' in namespace '${namespace}' has no matchLabels in selector`,
       );
-      return null;
     }
+    return entries.map(([k, v]) => `${k}=${v}`).join(",");
   }
 
   /**
@@ -765,15 +762,15 @@ export class KubeClient {
     deploymentName: string,
     namespace: string,
   ) {
-    const selector = await this.getDeploymentPodSelector(
-      deploymentName,
-      namespace,
-    );
-    if (selector) {
+    try {
+      const selector = await this.getDeploymentPodSelector(
+        deploymentName,
+        namespace,
+      );
       await this.logPodConditions(namespace, selector);
-    } else {
+    } catch (error) {
       console.warn(
-        `Could not resolve pod selector for deployment '${deploymentName}'`,
+        `Could not resolve pod selector for deployment '${deploymentName}': ${getKubeApiErrorMessage(error)}`,
       );
     }
   }

From 100d318bde56e435c04291093e6fbea5a2554d18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbyn=C4=9Bk=20Dr=C3=A1pela?=
 <61500440+zdrapela@users.noreply.github.com>
Date: Fri, 20 Mar 2026 09:38:15 +0100
Subject: [PATCH 17/17] =?UTF-8?q?Revert=20"fix(ci):=20add=20cluster=20heal?=
 =?UTF-8?q?th=20check=20and=20retry=20logic=20for=20hibernating=20clu?=
 =?UTF-8?q?=E2=80=A6"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 42176f24c85a10a2fc05b78e42f937945c7399ff.
---
 .ci/pipelines/jobs/auth-providers.sh |  1 -
 .ci/pipelines/jobs/ocp-nightly.sh    |  1 -
 .ci/pipelines/jobs/ocp-operator.sh   |  1 -
 .ci/pipelines/jobs/ocp-pull.sh       |  2 --
 .ci/pipelines/jobs/upgrade.sh        |  1 -
 .ci/pipelines/utils.sh               | 23 -----------------------
 6 files changed, 29 deletions(-)

diff --git a/.ci/pipelines/jobs/auth-providers.sh b/.ci/pipelines/jobs/auth-providers.sh
index 1bbeabe5da..31530c974c 100644
--- a/.ci/pipelines/jobs/auth-providers.sh
+++ b/.ci/pipelines/jobs/auth-providers.sh
@@ -14,7 +14,6 @@ source "$DIR"/lib/common.sh
 handle_auth_providers() {
   local retry_operator_installation="${1:-1}"
   common::oc_login
-  wait_for_cluster_ready
   configure_namespace "${OPERATOR_MANAGER}"
   install_rhdh_operator "${OPERATOR_MANAGER}" "$retry_operator_installation"
   wait_for_backstage_crd "default"
diff --git a/.ci/pipelines/jobs/ocp-nightly.sh b/.ci/pipelines/jobs/ocp-nightly.sh
index 070cdec402..b2a08bee4f 100644
--- a/.ci/pipelines/jobs/ocp-nightly.sh
+++ b/.ci/pipelines/jobs/ocp-nightly.sh
@@ -15,7 +15,6 @@ handle_ocp_nightly() {
   export NAME_SPACE_POSTGRES_DB="${NAME_SPACE_POSTGRES_DB:-postgress-external-db-nightly}"
 
   common::oc_login
-  wait_for_cluster_ready
 
   K8S_CLUSTER_ROUTER_BASE=$(oc get route console -n openshift-console -o=jsonpath='{.spec.host}' | sed 's/^[^.]*\.//')
   export K8S_CLUSTER_ROUTER_BASE
diff --git a/.ci/pipelines/jobs/ocp-operator.sh b/.ci/pipelines/jobs/ocp-operator.sh
index 923de39c40..bdd6f97ae4 100644
--- a/.ci/pipelines/jobs/ocp-operator.sh
+++ b/.ci/pipelines/jobs/ocp-operator.sh
@@ -98,7 +98,6 @@ handle_ocp_operator() {
   export NAME_SPACE_RUNTIME="${NAME_SPACE_RUNTIME:-showcase-runtime}"
 
   common::oc_login
-  wait_for_cluster_ready
 
   K8S_CLUSTER_ROUTER_BASE=$(oc get route console -n openshift-console -o=jsonpath='{.spec.host}' | sed 's/^[^.]*\.//')
   export K8S_CLUSTER_ROUTER_BASE
diff --git a/.ci/pipelines/jobs/ocp-pull.sh b/.ci/pipelines/jobs/ocp-pull.sh
index 4373fdb11a..57a5fa5462 100644
--- a/.ci/pipelines/jobs/ocp-pull.sh
+++ b/.ci/pipelines/jobs/ocp-pull.sh
@@ -14,8 +14,6 @@ handle_ocp_pull() {
 
   log::info "Configuring namespace: ${NAME_SPACE}"
   common::oc_login
-  wait_for_cluster_ready
-  log::info "OCP version: $(oc version)"
 
   K8S_CLUSTER_ROUTER_BASE=$(oc get route console -n openshift-console -o=jsonpath='{.spec.host}' | sed 's/^[^.]*\.//')
   export K8S_CLUSTER_ROUTER_BASE
diff --git a/.ci/pipelines/jobs/upgrade.sh b/.ci/pipelines/jobs/upgrade.sh
index 76f4e40dcf..026c869128 100644
--- a/.ci/pipelines/jobs/upgrade.sh
+++ b/.ci/pipelines/jobs/upgrade.sh
@@ -33,7 +33,6 @@ handle_ocp_helm_upgrade() {
   export TAG_NAME_BASE=$previous_release_version
 
   common::oc_login
-  wait_for_cluster_ready
 
   K8S_CLUSTER_ROUTER_BASE=$(oc get route console -n openshift-console -o=jsonpath='{.spec.host}' | sed 's/^[^.]*\.//')
   export K8S_CLUSTER_ROUTER_BASE
diff --git a/.ci/pipelines/utils.sh b/.ci/pipelines/utils.sh
index 27c8ee8f61..399a4a6f8f 100755
--- a/.ci/pipelines/utils.sh
+++ b/.ci/pipelines/utils.sh
@@ -1408,29 +1408,6 @@ force_delete_namespace() {
   log::success "Namespace '${project}' successfully deleted."
 }
 
-# Wait for the cluster API server to be fully responsive after login.
-# Clusters resuming from hibernation may accept login but have degraded API availability.
-wait_for_cluster_ready() {
-  local max_attempts=${1:-20}
-  local wait_seconds=${2:-15}
-
-  log::info "Checking cluster API server readiness..."
-
-  for ((i = 1; i <= max_attempts; i++)); do
-    if oc get nodes &> /dev/null && oc get route console -n openshift-console &> /dev/null; then
-      log::success "Cluster API server is ready"
-      return 0
-    fi
-    if [[ $i -lt $max_attempts ]]; then
-      log::warn "Cluster API not fully ready (attempt ${i}/${max_attempts}). Retrying in ${wait_seconds}s..."
-      sleep "$wait_seconds"
-    fi
-  done
-
-  log::error "Cluster API server did not become ready after ${max_attempts} attempts ($((max_attempts * wait_seconds))s)"
-  return 1
-}
-
 is_openshift() {
   oc get routes.route.openshift.io &> /dev/null || kubectl get routes.route.openshift.io &> /dev/null
 }