diff --git a/modules/dynamic-plugins/con-preinstalled-dynamic-plugins.adoc b/modules/dynamic-plugins/con-preinstalled-dynamic-plugins.adoc
index d12779d679..90f796102d 100644
--- a/modules/dynamic-plugins/con-preinstalled-dynamic-plugins.adoc
+++ b/modules/dynamic-plugins/con-preinstalled-dynamic-plugins.adoc
@@ -10,19 +10,18 @@ The following preinstalled dynamic plugins are enabled by default:
 * `@backstage-community/plugin-analytics-provider-segment`
 * `@backstage-community/plugin-scaffolder-backend-module-quay`
 * `@backstage-community/plugin-scaffolder-backend-module-regex`
+* `@backstage/plugin-techdocs`
 * `@backstage/plugin-techdocs-backend`
 * `@backstage/plugin-techdocs-module-addons-contrib`
-* `@backstage/plugin-techdocs`
-* `@red-hat-developer-hub/backstage-plugin-adoption-insights-backend`
-* `@red-hat-developer-hub/backstage-plugin-adoption-insights`
-* `@red-hat-developer-hub/backstage-plugin-analytics-module-adoption-insights`
 * `@red-hat-developer-hub/backstage-plugin-catalog-backend-module-marketplace`
 * `@red-hat-developer-hub/backstage-plugin-dynamic-home-page`
 * `@red-hat-developer-hub/backstage-plugin-global-floating-action-button`
 * `@red-hat-developer-hub/backstage-plugin-global-header`
-* `@red-hat-developer-hub/backstage-plugin-marketplace-backend`
 * `@red-hat-developer-hub/backstage-plugin-marketplace`
-* `@red-hat-developer-hub/backstage-plugin-quickstart`
+* `@red-hat-developer-hub/backstage-plugin-marketplace-backend`
+* `@red-hat-developer-hub/backstage-plugin-adoption-insights`
+* `@red-hat-developer-hub/backstage-plugin-adoption-insights-backend`
+* `@red-hat-developer-hub/backstage-plugin-analytics-module-adoption-insights`
 
 The dynamic plugins that require custom configuration are disabled by default.
 
diff --git a/modules/dynamic-plugins/ref-rh-supported-plugins.adoc b/modules/dynamic-plugins/ref-rh-supported-plugins.adoc
index 87ca61a519..455e295f7c 100644
--- a/modules/dynamic-plugins/ref-rh-supported-plugins.adoc
+++ b/modules/dynamic-plugins/ref-rh-supported-plugins.adoc
@@ -3,167 +3,149 @@
 
 = {company-name} supported plugins
 
-{company-name} supports the following 26 plugins:
+{company-name} supports the following 24 plugins:
 
 [%header,cols=4*]
 |===
 |*Name* |*Plugin* |*Version* |*Path and required variables*
-|Adoption Insights  |`https://npmjs.com/package/@red-hat-developer-hub/backstage-plugin-adoption-insights/v/0.2.1[@red-hat-developer-hub/backstage-plugin-adoption-insights]` |0.2.1 
-|`./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-adoption-insights`
-
-
 |Analytics Provider Segment  |`https://npmjs.com/package/@backstage-community/plugin-analytics-provider-segment/v/1.16.0[@backstage-community/plugin-analytics-provider-segment]` |1.16.0 
 |`./dynamic-plugins/dist/backstage-community-plugin-analytics-provider-segment`
 
-`SEGMENT_WRITE_KEY`
-
 `SEGMENT_TEST_MODE`
 
+`SEGMENT_WRITE_KEY`
 
-|Argo CD  |`https://npmjs.com/package/@roadiehq/backstage-plugin-argo-cd-backend/v/4.3.1[@roadiehq/backstage-plugin-argo-cd-backend]` |4.3.1 
-|`./dynamic-plugins/dist/roadiehq-backstage-plugin-argo-cd-backend-dynamic`
-
-`ARGOCD_USERNAME`
-
-`ARGOCD_PASSWORD`
-
-`ARGOCD_INSTANCE1_URL`
-
-`ARGOCD_AUTH_TOKEN`
 
-`ARGOCD_INSTANCE2_URL`
-
-`ARGOCD_AUTH_TOKEN2`
+|Keycloak  |`https://npmjs.com/package/@backstage-community/plugin-catalog-backend-module-keycloak/v/3.12.1[@backstage-community/plugin-catalog-backend-module-keycloak]` |3.12.1 
+|`./dynamic-plugins/dist/backstage-community-plugin-catalog-backend-module-keycloak-dynamic`
 
+`KEYCLOAK_BASE_URL`
 
-|Dynamic Home Page  |`https://npmjs.com/package/@red-hat-developer-hub/backstage-plugin-dynamic-home-page/v/1.5.0[@red-hat-developer-hub/backstage-plugin-dynamic-home-page]` |1.5.0 
-|`./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-dynamic-home-page`
+`KEYCLOAK_CLIENT_ID`
 
+`KEYCLOAK_CLIENT_SECRET`
 
-|GitHub  |`https://npmjs.com/package/@backstage/plugin-catalog-backend-module-github/v/0.9.0[@backstage/plugin-catalog-backend-module-github]` |0.9.0 
-|`./dynamic-plugins/dist/backstage-plugin-catalog-backend-module-github-dynamic`
+`KEYCLOAK_LOGIN_REALM`
 
-`GITHUB_ORG`
+`KEYCLOAK_REALM`
 
 
-|GitHub  |`https://npmjs.com/package/@backstage/plugin-scaffolder-backend-module-github/v/0.7.1[@backstage/plugin-scaffolder-backend-module-github]` |0.7.1 
-|`./dynamic-plugins/dist/backstage-plugin-scaffolder-backend-module-github-dynamic`
+|OCM  |`https://npmjs.com/package/@backstage-community/plugin-ocm/v/5.6.0[@backstage-community/plugin-ocm]` |5.6.0 
+|`./dynamic-plugins/dist/backstage-community-plugin-ocm`
 
 
-|GitHub Org  |`https://npmjs.com/package/@backstage/plugin-catalog-backend-module-github-org/v/0.3.10[@backstage/plugin-catalog-backend-module-github-org]` |0.3.10 
-|`./dynamic-plugins/dist/backstage-plugin-catalog-backend-module-github-org-dynamic`
+|OCM  |`https://npmjs.com/package/@backstage-community/plugin-ocm-backend/v/5.7.0[@backstage-community/plugin-ocm-backend]` |5.7.0 
+|`./dynamic-plugins/dist/backstage-community-plugin-ocm-backend-dynamic`
 
-`GITHUB_URL`
+`OCM_HUB_NAME`
 
-`GITHUB_ORG`
+`OCM_HUB_URL`
 
+`OCM_SA_TOKEN`
 
-|Global Floating Action Button  |`https://npmjs.com/package/@red-hat-developer-hub/backstage-plugin-global-floating-action-button/v/1.2.1[@red-hat-developer-hub/backstage-plugin-global-floating-action-button]` |1.2.1 
-|`./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-global-floating-action-button`
 
+|Quay  |`https://npmjs.com/package/@backstage-community/plugin-quay/v/1.21.1[@backstage-community/plugin-quay]` |1.21.1 
+|`./dynamic-plugins/dist/backstage-community-plugin-quay`
 
-|Global Header  |`https://npmjs.com/package/@red-hat-developer-hub/backstage-plugin-global-header/v/1.14.0[@red-hat-developer-hub/backstage-plugin-global-header]` |1.14.0 
-|`./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-global-header`
 
+|RBAC  |`https://npmjs.com/package/@backstage-community/plugin-rbac/v/1.42.0[@backstage-community/plugin-rbac]` |1.42.0 
+|`./dynamic-plugins/dist/backstage-community-plugin-rbac`
 
-|Keycloak  |`https://npmjs.com/package/@backstage-community/plugin-catalog-backend-module-keycloak/v/3.12.1[@backstage-community/plugin-catalog-backend-module-keycloak]` |3.12.1 
-|`./dynamic-plugins/dist/backstage-community-plugin-catalog-backend-module-keycloak-dynamic`
 
-`KEYCLOAK_BASE_URL`
+|Kubernetes  |`https://npmjs.com/package/@backstage-community/plugin-scaffolder-backend-module-kubernetes/v/2.8.1[@backstage-community/plugin-scaffolder-backend-module-kubernetes]` |2.8.1 
+|`./dynamic-plugins/dist/backstage-community-plugin-scaffolder-backend-module-kubernetes-dynamic`
 
-`KEYCLOAK_LOGIN_REALM`
 
-`KEYCLOAK_REALM`
+|Quay  |`https://npmjs.com/package/@backstage-community/plugin-scaffolder-backend-module-quay/v/2.9.1[@backstage-community/plugin-scaffolder-backend-module-quay]` |2.9.1 
+|`./dynamic-plugins/dist/backstage-community-plugin-scaffolder-backend-module-quay-dynamic`
 
-`KEYCLOAK_CLIENT_ID`
 
-`KEYCLOAK_CLIENT_SECRET`
+|Regex  |`https://npmjs.com/package/@backstage-community/plugin-scaffolder-backend-module-regex/v/2.7.0[@backstage-community/plugin-scaffolder-backend-module-regex]` |2.7.0 
+|`./dynamic-plugins/dist/backstage-community-plugin-scaffolder-backend-module-regex-dynamic`
 
 
-|Kubernetes  |`https://npmjs.com/package/@backstage/plugin-kubernetes-backend/v/0.19.6[@backstage/plugin-kubernetes-backend]` |0.19.6 
-|`./dynamic-plugins/dist/backstage-plugin-kubernetes-backend-dynamic`
+|Tekton  |`https://npmjs.com/package/@backstage-community/plugin-tekton/v/3.26.2[@backstage-community/plugin-tekton]` |3.26.2 
+|`./dynamic-plugins/dist/backstage-community-plugin-tekton`
 
-`K8S_CLUSTER_NAME`
 
-`K8S_CLUSTER_URL`
-
-`K8S_CLUSTER_TOKEN`
+|Topology  |`https://npmjs.com/package/@backstage-community/plugin-topology/v/2.2.2[@backstage-community/plugin-topology]` |2.2.2 
+|`./dynamic-plugins/dist/backstage-community-plugin-topology`
 
 
-|Kubernetes  |`https://npmjs.com/package/@backstage-community/plugin-scaffolder-backend-module-kubernetes/v/2.8.1[@backstage-community/plugin-scaffolder-backend-module-kubernetes]` |2.8.1 
-|`./dynamic-plugins/dist/backstage-community-plugin-scaffolder-backend-module-kubernetes-dynamic`
+|GitHub  |`https://npmjs.com/package/@backstage/plugin-catalog-backend-module-github/v/0.9.0[@backstage/plugin-catalog-backend-module-github]` |0.9.0 
+|`./dynamic-plugins/dist/backstage-plugin-catalog-backend-module-github-dynamic`
 
+`GITHUB_ORG`
 
-|Ldap  |`https://npmjs.com/package/@backstage/plugin-catalog-backend-module-ldap/v/0.11.5[@backstage/plugin-catalog-backend-module-ldap]` |0.11.5 
-|`./dynamic-plugins/dist/backstage-plugin-catalog-backend-module-ldap-dynamic`
 
-`LDAP_TARGET_URL`
+|GitHub Org  |`https://npmjs.com/package/@backstage/plugin-catalog-backend-module-github-org/v/0.3.10[@backstage/plugin-catalog-backend-module-github-org]` |0.3.10 
+|`./dynamic-plugins/dist/backstage-plugin-catalog-backend-module-github-org-dynamic`
 
-`LDAP_BIND_DN`
+`GITHUB_ORG`
 
-`LDAP_BIND_SECRET`
+`GITHUB_URL`
 
-`LDAP_USERS_DN`
 
-`LDAP_GROUPS_DN`
+|Kubernetes  |`https://npmjs.com/package/@backstage/plugin-kubernetes-backend/v/0.19.6[@backstage/plugin-kubernetes-backend]` |0.19.6 
+|`./dynamic-plugins/dist/backstage-plugin-kubernetes-backend-dynamic`
 
+`K8S_CLUSTER_NAME`
 
-|OCM  |`https://npmjs.com/package/@backstage-community/plugin-ocm/v/5.6.0[@backstage-community/plugin-ocm]` |5.6.0 
-|`./dynamic-plugins/dist/backstage-community-plugin-ocm`
+`K8S_CLUSTER_TOKEN`
 
+`K8S_CLUSTER_URL`
 
-|OCM  |`https://npmjs.com/package/@backstage-community/plugin-ocm-backend/v/5.7.0[@backstage-community/plugin-ocm-backend]` |5.7.0 
-|`./dynamic-plugins/dist/backstage-community-plugin-ocm-backend-dynamic`
 
-`OCM_HUB_NAME`
+|GitHub  |`https://npmjs.com/package/@backstage/plugin-scaffolder-backend-module-github/v/0.7.1[@backstage/plugin-scaffolder-backend-module-github]` |0.7.1 
+|`./dynamic-plugins/dist/backstage-plugin-scaffolder-backend-module-github-dynamic`
 
-`OCM_HUB_URL`
 
-`OCM_SA_TOKEN`
+|Signals  |`https://npmjs.com/package/@backstage/plugin-signals-backend/v/0.3.4[@backstage/plugin-signals-backend]` |0.3.4 
+|`./dynamic-plugins/dist/backstage-plugin-signals-backend-dynamic`
 
 
-|Quay  |`https://npmjs.com/package/@backstage-community/plugin-quay/v/1.21.1[@backstage-community/plugin-quay]` |1.21.1 
-|`./dynamic-plugins/dist/backstage-community-plugin-quay`
+|TechDocs  |`https://npmjs.com/package/@backstage/plugin-techdocs/v/1.12.6[@backstage/plugin-techdocs]` |1.12.6 
+|`./dynamic-plugins/dist/backstage-plugin-techdocs`
 
 
-|Quay  |`https://npmjs.com/package/@backstage-community/plugin-scaffolder-backend-module-quay/v/2.9.1[@backstage-community/plugin-scaffolder-backend-module-quay]` |2.9.1 
-|`./dynamic-plugins/dist/backstage-community-plugin-scaffolder-backend-module-quay-dynamic`
+|TechDocs  |`https://npmjs.com/package/@backstage/plugin-techdocs-backend/v/2.0.2[@backstage/plugin-techdocs-backend]` |2.0.2 
+|`./dynamic-plugins/dist/backstage-plugin-techdocs-backend-dynamic`
 
 
-|Quickstart  |`https://npmjs.com/package/@red-hat-developer-hub/backstage-plugin-quickstart/v/1.1.0[@red-hat-developer-hub/backstage-plugin-quickstart]` |1.1.0 
-|`./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-quickstart`
+|TechDocs Module Addons Contrib  |`https://npmjs.com/package/@backstage/plugin-techdocs-module-addons-contrib/v/1.1.24[@backstage/plugin-techdocs-module-addons-contrib]` |1.1.24 
+|`./dynamic-plugins/dist/backstage-plugin-techdocs-module-addons-contrib`
 
 
-|RBAC  |`https://npmjs.com/package/@backstage-community/plugin-rbac/v/1.42.0[@backstage-community/plugin-rbac]` |1.42.0 
-|`./dynamic-plugins/dist/backstage-community-plugin-rbac`
+|Dynamic Home Page  |`https://npmjs.com/package/@red-hat-developer-hub/backstage-plugin-dynamic-home-page/v/1.5.0[@red-hat-developer-hub/backstage-plugin-dynamic-home-page]` |1.5.0 
+|`./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-dynamic-home-page`
 
 
-|Regex  |`https://npmjs.com/package/@backstage-community/plugin-scaffolder-backend-module-regex/v/2.7.0[@backstage-community/plugin-scaffolder-backend-module-regex]` |2.7.0 
-|`./dynamic-plugins/dist/backstage-community-plugin-scaffolder-backend-module-regex-dynamic`
+|Global Floating Action B  |`https://npmjs.com/package/@red-hat-developer-hub/backstage-plugin-global-floating-action-button/v/1.2.0[@red-hat-developer-hub/backstage-plugin-global-floating-action-button]` |1.2.0 
+|`./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-global-floating-action-button`
 
 
-|Signals  |`https://npmjs.com/package/@backstage/plugin-signals-backend/v/0.3.4[@backstage/plugin-signals-backend]` |0.3.4 
-|`./dynamic-plugins/dist/backstage-plugin-signals-backend-dynamic`
+|Global Header  |`https://npmjs.com/package/@red-hat-developer-hub/backstage-plugin-global-header/v/1.13.0[@red-hat-developer-hub/backstage-plugin-global-header]` |1.13.0 
+|`./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-global-header`
 
 
-|TechDocs  |`https://npmjs.com/package/@backstage/plugin-techdocs/v/1.12.6[@backstage/plugin-techdocs]` |1.12.6 
-|`./dynamic-plugins/dist/backstage-plugin-techdocs`
+|Adoption Insights  |`https://npmjs.com/package/@red-hat-developer-hub/backstage-plugin-adoption-insights/v/0.2.1[@red-hat-developer-hub/backstage-plugin-adoption-insights]` |0.2.1 
+|`./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-adoption-insights`
 
 
-|TechDocs  |`https://npmjs.com/package/@backstage/plugin-techdocs-backend/v/2.0.2[@backstage/plugin-techdocs-backend]` |2.0.2 
-|`./dynamic-plugins/dist/backstage-plugin-techdocs-backend-dynamic`
+|Argo CD  |`https://npmjs.com/package/@roadiehq/backstage-plugin-argo-cd-backend/v/4.3.1[@roadiehq/backstage-plugin-argo-cd-backend]` |4.3.1 
+|`./dynamic-plugins/dist/roadiehq-backstage-plugin-argo-cd-backend-dynamic`
 
+`ARGOCD_AUTH_TOKEN`
 
-|TechDocs Module Addons Contrib  |`https://npmjs.com/package/@backstage/plugin-techdocs-module-addons-contrib/v/1.1.24[@backstage/plugin-techdocs-module-addons-contrib]` |1.1.24 
-|`./dynamic-plugins/dist/backstage-plugin-techdocs-module-addons-contrib`
+`ARGOCD_AUTH_TOKEN2`
 
+`ARGOCD_INSTANCE1_URL`
 
-|Tekton  |`https://npmjs.com/package/@backstage-community/plugin-tekton/v/3.26.2[@backstage-community/plugin-tekton]` |3.26.2 
-|`./dynamic-plugins/dist/backstage-community-plugin-tekton`
+`ARGOCD_INSTANCE2_URL`
 
+`ARGOCD_PASSWORD`
 
-|Topology  |`https://npmjs.com/package/@backstage-community/plugin-topology/v/2.2.2[@backstage-community/plugin-topology]` |2.2.2 
-|`./dynamic-plugins/dist/backstage-community-plugin-topology`
+`ARGOCD_USERNAME`
 
 
 |===
diff --git a/modules/dynamic-plugins/ref-rh-tech-preview-plugins.adoc b/modules/dynamic-plugins/ref-rh-tech-preview-plugins.adoc
index 8089821fea..e2e324e2c9 100644
--- a/modules/dynamic-plugins/ref-rh-tech-preview-plugins.adoc
+++ b/modules/dynamic-plugins/ref-rh-tech-preview-plugins.adoc
@@ -3,7 +3,7 @@
 
 = {company-name} Technology Preview plugins
 
-{company-name} provides Technology Preview support for the following 56 plugins:
+{company-name} provides Technology Preview support for the following 57 plugins:
 
 [%header,cols=4*]
 |===
@@ -11,221 +11,205 @@
 |3scale  |`https://npmjs.com/package/@backstage-community/plugin-3scale-backend/v/3.6.1[@backstage-community/plugin-3scale-backend]` |3.6.1 
 |`./dynamic-plugins/dist/backstage-community-plugin-3scale-backend-dynamic`
 
-`THREESCALE_BASE_URL`
-
 `THREESCALE_ACCESS_TOKEN`
 
+`THREESCALE_BASE_URL`
+
 
 |ACR  |`https://npmjs.com/package/@backstage-community/plugin-acr/v/1.15.1[@backstage-community/plugin-acr]` |1.15.1 
 |`./dynamic-plugins/dist/backstage-community-plugin-acr`
 
 
-|Adoption Insights  |`https://npmjs.com/package/@red-hat-developer-hub/backstage-plugin-adoption-insights-backend/v/0.2.2[@red-hat-developer-hub/backstage-plugin-adoption-insights-backend]` |0.2.2 
-|`./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-adoption-insights-backend-dynamic`
+|Azure Devops  |`https://npmjs.com/package/@backstage-community/plugin-azure-devops/v/0.16.1[@backstage-community/plugin-azure-devops]` |0.16.1 
+|`./dynamic-plugins/dist/backstage-community-plugin-azure-devops`
 
 
-|Analytics Module Adoption Insights  |`https://npmjs.com/package/@red-hat-developer-hub/backstage-plugin-analytics-module-adoption-insights/v/0.2.0[@red-hat-developer-hub/backstage-plugin-analytics-module-adoption-insights]` |0.2.0 
-|`./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-analytics-module-adoption-insights-dynamic`
+|Azure Devops  |`https://npmjs.com/package/@backstage-community/plugin-azure-devops-backend/v/0.17.1[@backstage-community/plugin-azure-devops-backend]` |0.17.1 
+|`./dynamic-plugins/dist/backstage-community-plugin-azure-devops-backend-dynamic`
 
+`AZURE_ORG`
 
-|Argo CD  |`https://npmjs.com/package/@roadiehq/scaffolder-backend-argocd/v/1.6.0[@roadiehq/scaffolder-backend-argocd]` |1.6.0 
-|`./dynamic-plugins/dist/roadiehq-scaffolder-backend-argocd-dynamic`
+`AZURE_TOKEN`
 
-`ARGOCD_USERNAME`
 
-`ARGOCD_PASSWORD`
+|Pingidentity  |`https://npmjs.com/package/@backstage-community/plugin-catalog-backend-module-pingidentity/v/0.5.0[@backstage-community/plugin-catalog-backend-module-pingidentity]` |0.5.0 
+|`./dynamic-plugins/dist/backstage-community-plugin-catalog-backend-module-pingidentity-dynamic`
 
-`ARGOCD_INSTANCE1_URL`
 
-`ARGOCD_AUTH_TOKEN`
+|Scaffolder Re  |`https://npmjs.com/package/@backstage-community/plugin-catalog-backend-module-scaffolder-relation-processor/v/2.5.0[@backstage-community/plugin-catalog-backend-module-scaffolder-relation-processor]` |2.5.0 
+|`./dynamic-plugins/dist/backstage-community-plugin-catalog-backend-module-scaffolder-relation-processor-dynamic`
 
-`ARGOCD_INSTANCE2_URL`
 
-`ARGOCD_AUTH_TOKEN2`
+|Dynatrace  |`https://npmjs.com/package/@backstage-community/plugin-dynatrace/v/10.6.0[@backstage-community/plugin-dynatrace]` |10.6.0 
+|`./dynamic-plugins/dist/backstage-community-plugin-dynatrace`
 
 
-|Argo CD (Red Hat)  |`https://npmjs.com/package/@backstage-community/plugin-redhat-argocd/v/1.21.2[@backstage-community/plugin-redhat-argocd]` |1.21.2 
-|`./dynamic-plugins/dist/backstage-community-plugin-redhat-argocd`
+|GitHub Actions  |`https://npmjs.com/package/@backstage-community/plugin-github-actions/v/0.11.1[@backstage-community/plugin-github-actions]` |0.11.1 
+|`./dynamic-plugins/dist/backstage-community-plugin-github-actions`
 
 
-|Azure  |`https://npmjs.com/package/@backstage/plugin-scaffolder-backend-module-azure/v/0.2.9[@backstage/plugin-scaffolder-backend-module-azure]` |0.2.9 
-|`./dynamic-plugins/dist/backstage-plugin-scaffolder-backend-module-azure-dynamic`
+|GitHub Issues  |`https://npmjs.com/package/@backstage-community/plugin-github-issues/v/0.10.0[@backstage-community/plugin-github-issues]` |0.10.0 
+|`./dynamic-plugins/dist/backstage-community-plugin-github-issues`
 
 
-|Azure Devops  |`https://npmjs.com/package/@backstage-community/plugin-azure-devops/v/0.16.1[@backstage-community/plugin-azure-devops]` |0.16.1 
-|`./dynamic-plugins/dist/backstage-community-plugin-azure-devops`
+|Jenkins  |`https://npmjs.com/package/@backstage-community/plugin-jenkins/v/0.20.0[@backstage-community/plugin-jenkins]` |0.20.0 
+|`./dynamic-plugins/dist/backstage-community-plugin-jenkins`
 
 
-|Azure Devops  |`https://npmjs.com/package/@backstage-community/plugin-azure-devops-backend/v/0.17.1[@backstage-community/plugin-azure-devops-backend]` |0.17.1 
-|`./dynamic-plugins/dist/backstage-community-plugin-azure-devops-backend-dynamic`
+|Jenkins  |`https://npmjs.com/package/@backstage-community/plugin-jenkins-backend/v/0.15.0[@backstage-community/plugin-jenkins-backend]` |0.15.0 
+|`./dynamic-plugins/dist/backstage-community-plugin-jenkins-backend-dynamic`
 
-`AZURE_TOKEN`
+`JENKINS_TOKEN`
 
-`AZURE_ORG`
+`JENKINS_URL`
 
+`JENKINS_USERNAME`
 
-|Azure Repositories  |`https://npmjs.com/package/@parfuemerie-douglas/scaffolder-backend-module-azure-repositories/v/0.3.0[@parfuemerie-douglas/scaffolder-backend-module-azure-repositories]` |0.3.0 
-|`./dynamic-plugins/dist/parfuemerie-douglas-scaffolder-backend-module-azure-repositories-dynamic`
 
+|JFrog Artifactory  |`https://npmjs.com/package/@backstage-community/plugin-jfrog-artifactory/v/1.15.3[@backstage-community/plugin-jfrog-artifactory]` |1.15.3 
+|`./dynamic-plugins/dist/backstage-community-plugin-jfrog-artifactory`
 
-|Bitbucket Cloud  |`https://npmjs.com/package/@backstage/plugin-catalog-backend-module-bitbucket-cloud/v/0.4.8[@backstage/plugin-catalog-backend-module-bitbucket-cloud]` |0.4.8 
-|`./dynamic-plugins/dist/backstage-plugin-catalog-backend-module-bitbucket-cloud-dynamic`
 
-`BITBUCKET_WORKSPACE`
+|Lighthouse  |`https://npmjs.com/package/@backstage-community/plugin-lighthouse/v/0.10.0[@backstage-community/plugin-lighthouse]` |0.10.0 
+|`./dynamic-plugins/dist/backstage-community-plugin-lighthouse`
 
 
-|Bitbucket Cloud  |`https://npmjs.com/package/@backstage/plugin-scaffolder-backend-module-bitbucket-cloud/v/0.2.9[@backstage/plugin-scaffolder-backend-module-bitbucket-cloud]` |0.2.9 
-|`./dynamic-plugins/dist/backstage-plugin-scaffolder-backend-module-bitbucket-cloud-dynamic`
+|Nexus Repository Manager  |`https://npmjs.com/package/@backstage-community/plugin-nexus-repository-manager/v/1.14.1[@backstage-community/plugin-nexus-repository-manager]` |1.14.1 
+|`./dynamic-plugins/dist/backstage-community-plugin-nexus-repository-manager`
 
 
-|Bitbucket Server  |`https://npmjs.com/package/@backstage/plugin-catalog-backend-module-bitbucket-server/v/0.4.1[@backstage/plugin-catalog-backend-module-bitbucket-server]` |0.4.1 
-|`./dynamic-plugins/dist/backstage-plugin-catalog-backend-module-bitbucket-server-dynamic`
+|Argo CD (Red Hat)  |`https://npmjs.com/package/@backstage-community/plugin-redhat-argocd/v/1.21.2[@backstage-community/plugin-redhat-argocd]` |1.21.2 
+|`./dynamic-plugins/dist/backstage-community-plugin-redhat-argocd`
 
-`BITBUCKET_HOST`
 
+|ServiceNow  |`https://npmjs.com/package/@backstage-community/plugin-scaffolder-backend-module-servicenow/v/2.7.0[@backstage-community/plugin-scaffolder-backend-module-servicenow]` |2.7.0 
+|`./dynamic-plugins/dist/backstage-community-plugin-scaffolder-backend-module-servicenow-dynamic`
 
-|Bitbucket Server  |`https://npmjs.com/package/@backstage/plugin-scaffolder-backend-module-bitbucket-server/v/0.2.9[@backstage/plugin-scaffolder-backend-module-bitbucket-server]` |0.2.9 
-|`./dynamic-plugins/dist/backstage-plugin-scaffolder-backend-module-bitbucket-server-dynamic`
+`SERVICENOW_BASE_URL`
 
+`SERVICENOW_PASSWORD`
 
-|Bulk Import  |`https://npmjs.com/package/@red-hat-developer-hub/backstage-plugin-bulk-import/v/1.13.3[@red-hat-developer-hub/backstage-plugin-bulk-import]` |1.13.3 
-|`./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-bulk-import`
+`SERVICENOW_USERNAME`
 
 
-|Bulk Import  |`https://npmjs.com/package/@red-hat-developer-hub/backstage-plugin-bulk-import-backend/v/6.1.3[@red-hat-developer-hub/backstage-plugin-bulk-import-backend]` |6.1.3 
-|`./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-bulk-import-backend-dynamic`
+|SonarQube  |`https://npmjs.com/package/@backstage-community/plugin-scaffolder-backend-module-sonarqube/v/2.7.1[@backstage-community/plugin-scaffolder-backend-module-sonarqube]` |2.7.1 
+|`./dynamic-plugins/dist/backstage-community-plugin-scaffolder-backend-module-sonarqube-dynamic`
 
 
-|Datadog  |`https://npmjs.com/package/@roadiehq/backstage-plugin-datadog/v/2.4.3[@roadiehq/backstage-plugin-datadog]` |2.4.3 
-|`./dynamic-plugins/dist/roadiehq-backstage-plugin-datadog`
+|SonarQube  |`https://npmjs.com/package/@backstage-community/plugin-sonarqube/v/0.13.0[@backstage-community/plugin-sonarqube]` |0.13.0 
+|`./dynamic-plugins/dist/backstage-community-plugin-sonarqube`
 
 
-|Dynatrace  |`https://npmjs.com/package/@backstage-community/plugin-dynatrace/v/10.6.0[@backstage-community/plugin-dynatrace]` |10.6.0 
-|`./dynamic-plugins/dist/backstage-community-plugin-dynatrace`
+|SonarQube  |`https://npmjs.com/package/@backstage-community/plugin-sonarqube-backend/v/0.9.2[@backstage-community/plugin-sonarqube-backend]` |0.9.2 
+|`./dynamic-plugins/dist/backstage-community-plugin-sonarqube-backend-dynamic`
 
+`SONARQUBE_TOKEN`
 
-|Gerrit  |`https://npmjs.com/package/@backstage/plugin-scaffolder-backend-module-gerrit/v/0.2.9[@backstage/plugin-scaffolder-backend-module-gerrit]` |0.2.9 
-|`./dynamic-plugins/dist/backstage-plugin-scaffolder-backend-module-gerrit-dynamic`
+`SONARQUBE_URL`
 
 
-|GitHub Actions  |`https://npmjs.com/package/@backstage-community/plugin-github-actions/v/0.11.1[@backstage-community/plugin-github-actions]` |0.11.1 
-|`./dynamic-plugins/dist/backstage-community-plugin-github-actions`
+|Tech Radar  |`https://npmjs.com/package/@backstage-community/plugin-tech-radar/v/1.7.1[@backstage-community/plugin-tech-radar]` |1.7.1 
+|`./dynamic-plugins/dist/backstage-community-plugin-tech-radar`
 
 
-|GitHub Insights  |`https://npmjs.com/package/@roadiehq/backstage-plugin-github-insights/v/3.1.4[@roadiehq/backstage-plugin-github-insights]` |3.1.4 
-|`./dynamic-plugins/dist/roadiehq-backstage-plugin-github-insights`
+|Tech Radar  |`https://npmjs.com/package/@backstage-community/plugin-tech-radar-backend/v/1.6.0[@backstage-community/plugin-tech-radar-backend]` |1.6.0 
+|`./dynamic-plugins/dist/backstage-community-plugin-tech-radar-backend-dynamic`
 
+`TECH_RADAR_DATA_URL`
 
-|GitHub Issues  |`https://npmjs.com/package/@backstage-community/plugin-github-issues/v/0.10.0[@backstage-community/plugin-github-issues]` |0.10.0 
-|`./dynamic-plugins/dist/backstage-community-plugin-github-issues`
 
+|Bitbucket Cloud  |`https://npmjs.com/package/@backstage/plugin-catalog-backend-module-bitbucket-cloud/v/0.4.8[@backstage/plugin-catalog-backend-module-bitbucket-cloud]` |0.4.8 
+|`./dynamic-plugins/dist/backstage-plugin-catalog-backend-module-bitbucket-cloud-dynamic`
 
-|GitHub Pull Requests  |`https://npmjs.com/package/@roadiehq/backstage-plugin-github-pull-requests/v/3.4.2[@roadiehq/backstage-plugin-github-pull-requests]` |3.4.2 
-|`./dynamic-plugins/dist/roadiehq-backstage-plugin-github-pull-requests`
+`BITBUCKET_WORKSPACE`
 
 
-|GitLab  |`https://npmjs.com/package/@immobiliarelabs/backstage-plugin-gitlab/v/6.12.0[@immobiliarelabs/backstage-plugin-gitlab]` |6.12.0 
-|`./dynamic-plugins/dist/immobiliarelabs-backstage-plugin-gitlab`
+|Bitbucket Server  |`https://npmjs.com/package/@backstage/plugin-catalog-backend-module-bitbucket-server/v/0.4.1[@backstage/plugin-catalog-backend-module-bitbucket-server]` |0.4.1 
+|`./dynamic-plugins/dist/backstage-plugin-catalog-backend-module-bitbucket-server-dynamic`
+
+`BITBUCKET_HOST`
 
 
 |GitLab  |`https://npmjs.com/package/@backstage/plugin-catalog-backend-module-gitlab/v/0.6.6[@backstage/plugin-catalog-backend-module-gitlab]` |0.6.6 
 |`./dynamic-plugins/dist/backstage-plugin-catalog-backend-module-gitlab-dynamic`
 
 
-|GitLab  |`https://npmjs.com/package/@immobiliarelabs/backstage-plugin-gitlab-backend/v/6.12.0[@immobiliarelabs/backstage-plugin-gitlab-backend]` |6.12.0 
-|`./dynamic-plugins/dist/immobiliarelabs-backstage-plugin-gitlab-backend-dynamic`
-
-`GITLAB_HOST`
-
-`GITLAB_TOKEN`
-
-
-|GitLab  |`https://npmjs.com/package/@backstage/plugin-scaffolder-backend-module-gitlab/v/0.9.1[@backstage/plugin-scaffolder-backend-module-gitlab]` |0.9.1 
-|`./dynamic-plugins/dist/backstage-plugin-scaffolder-backend-module-gitlab-dynamic`
-
-
 |GitLab Org  |`https://npmjs.com/package/@backstage/plugin-catalog-backend-module-gitlab-org/v/0.2.9[@backstage/plugin-catalog-backend-module-gitlab-org]` |0.2.9 
 |`./dynamic-plugins/dist/backstage-plugin-catalog-backend-module-gitlab-org-dynamic`
 
 
-|Http Request  |`https://npmjs.com/package/@roadiehq/scaffolder-backend-module-http-request/v/5.3.3[@roadiehq/scaffolder-backend-module-http-request]` |5.3.3 
-|`./dynamic-plugins/dist/roadiehq-scaffolder-backend-module-http-request-dynamic`
+|Ldap  |`https://npmjs.com/package/@backstage/plugin-catalog-backend-module-ldap/v/0.11.5[@backstage/plugin-catalog-backend-module-ldap]` |0.11.5 
+|`./dynamic-plugins/dist/backstage-plugin-catalog-backend-module-ldap-dynamic`
 
 
-|Jenkins  |`https://npmjs.com/package/@backstage-community/plugin-jenkins/v/0.20.0[@backstage-community/plugin-jenkins]` |0.20.0 
-|`./dynamic-plugins/dist/backstage-community-plugin-jenkins`
-
-
-|Jenkins  |`https://npmjs.com/package/@backstage-community/plugin-jenkins-backend/v/0.15.0[@backstage-community/plugin-jenkins-backend]` |0.15.0 
-|`./dynamic-plugins/dist/backstage-community-plugin-jenkins-backend-dynamic`
-
-`JENKINS_URL`
+|MS Graph  |`https://npmjs.com/package/@backstage/plugin-catalog-backend-module-msgraph/v/0.7.0[@backstage/plugin-catalog-backend-module-msgraph]` |0.7.0 
+|`./dynamic-plugins/dist/backstage-plugin-catalog-backend-module-msgraph-dynamic`
 
-`JENKINS_USERNAME`
+`MICROSOFT_CLIENT_ID`
 
-`JENKINS_TOKEN`
+`MICROSOFT_CLIENT_SECRET`
 
+`MICROSOFT_TENANT_ID`
 
-|JFrog Artifactory  |`https://npmjs.com/package/@backstage-community/plugin-jfrog-artifactory/v/1.15.3[@backstage-community/plugin-jfrog-artifactory]` |1.15.3 
-|`./dynamic-plugins/dist/backstage-community-plugin-jfrog-artifactory`
 
+|Kubernetes  |`https://npmjs.com/package/@backstage/plugin-kubernetes/v/0.12.7[@backstage/plugin-kubernetes]` |0.12.7 
+|`./dynamic-plugins/dist/backstage-plugin-kubernetes`
 
-|Jira  |`https://npmjs.com/package/@roadiehq/backstage-plugin-jira/v/2.9.0[@roadiehq/backstage-plugin-jira]` |2.9.0 
-|`./dynamic-plugins/dist/roadiehq-backstage-plugin-jira`
 
+|Notifications  |`https://npmjs.com/package/@backstage/plugin-notifications/v/0.5.5[@backstage/plugin-notifications]` |0.5.5 
+|`./dynamic-plugins/dist/backstage-plugin-notifications`
 
-|Kubernetes  |`https://npmjs.com/package/@backstage/plugin-kubernetes/v/0.12.7[@backstage/plugin-kubernetes]` |0.12.7 
-|`./dynamic-plugins/dist/backstage-plugin-kubernetes`
 
+|Notifications  |`https://npmjs.com/package/@backstage/plugin-notifications-backend/v/0.5.6[@backstage/plugin-notifications-backend]` |0.5.6 
+|`./dynamic-plugins/dist/backstage-plugin-notifications-backend-dynamic`
 
-|Lighthouse  |`https://npmjs.com/package/@backstage-community/plugin-lighthouse/v/0.10.0[@backstage-community/plugin-lighthouse]` |0.10.0 
-|`./dynamic-plugins/dist/backstage-community-plugin-lighthouse`
 
+|Notifications Module Email  |`https://npmjs.com/package/@backstage/plugin-notifications-backend-module-email/v/0.3.9[@backstage/plugin-notifications-backend-module-email]` |0.3.9 
+|`./dynamic-plugins/dist/backstage-plugin-notifications-backend-module-email-dynamic`
 
-|Marketplace  |`https://npmjs.com/package/@red-hat-developer-hub/backstage-plugin-marketplace/v/0.7.0[@red-hat-developer-hub/backstage-plugin-marketplace]` |0.7.0 
-|`./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-marketplace`
+`EMAIL_HOSTNAME`
 
+`EMAIL_PASSWORD`
 
-|Marketplace  |`https://npmjs.com/package/@red-hat-developer-hub/backstage-plugin-catalog-backend-module-marketplace/v/0.3.3[@red-hat-developer-hub/backstage-plugin-catalog-backend-module-marketplace]` |0.3.3 
-|`./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-catalog-backend-module-marketplace-dynamic`
+`EMAIL_SENDER`
 
+`EMAIL_USERNAME`
 
-|Marketplace  |`https://npmjs.com/package/@red-hat-developer-hub/backstage-plugin-marketplace-backend/v/0.6.0[@red-hat-developer-hub/backstage-plugin-marketplace-backend]` |0.6.0 
-|`./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-marketplace-backend-dynamic`
 
+|Azure  |`https://npmjs.com/package/@backstage/plugin-scaffolder-backend-module-azure/v/0.2.9[@backstage/plugin-scaffolder-backend-module-azure]` |0.2.9 
+|`./dynamic-plugins/dist/backstage-plugin-scaffolder-backend-module-azure-dynamic`
 
-|MS Graph  |`https://npmjs.com/package/@backstage/plugin-catalog-backend-module-msgraph/v/0.7.0[@backstage/plugin-catalog-backend-module-msgraph]` |0.7.0 
-|`./dynamic-plugins/dist/backstage-plugin-catalog-backend-module-msgraph-dynamic`
 
-`MICROSOFT_TENANT_ID`
+|Bitbucket Cloud  |`https://npmjs.com/package/@backstage/plugin-scaffolder-backend-module-bitbucket-cloud/v/0.2.9[@backstage/plugin-scaffolder-backend-module-bitbucket-cloud]` |0.2.9 
+|`./dynamic-plugins/dist/backstage-plugin-scaffolder-backend-module-bitbucket-cloud-dynamic`
 
-`MICROSOFT_CLIENT_ID`
 
-`MICROSOFT_CLIENT_SECRET`
+|Bitbucket Server  |`https://npmjs.com/package/@backstage/plugin-scaffolder-backend-module-bitbucket-server/v/0.2.9[@backstage/plugin-scaffolder-backend-module-bitbucket-server]` |0.2.9 
+|`./dynamic-plugins/dist/backstage-plugin-scaffolder-backend-module-bitbucket-server-dynamic`
 
 
-|Nexus Repository Manager  |`https://npmjs.com/package/@backstage-community/plugin-nexus-repository-manager/v/1.14.1[@backstage-community/plugin-nexus-repository-manager]` |1.14.1 
-|`./dynamic-plugins/dist/backstage-community-plugin-nexus-repository-manager`
+|Gerrit  |`https://npmjs.com/package/@backstage/plugin-scaffolder-backend-module-gerrit/v/0.2.9[@backstage/plugin-scaffolder-backend-module-gerrit]` |0.2.9 
+|`./dynamic-plugins/dist/backstage-plugin-scaffolder-backend-module-gerrit-dynamic`
 
 
-|Notifications  |`https://npmjs.com/package/@backstage/plugin-notifications/v/0.5.5[@backstage/plugin-notifications]` |0.5.5 
-|`./dynamic-plugins/dist/backstage-plugin-notifications`
+|GitLab  |`https://npmjs.com/package/@backstage/plugin-scaffolder-backend-module-gitlab/v/0.9.1[@backstage/plugin-scaffolder-backend-module-gitlab]` |0.9.1 
+|`./dynamic-plugins/dist/backstage-plugin-scaffolder-backend-module-gitlab-dynamic`
 
 
-|Notifications  |`https://npmjs.com/package/@backstage/plugin-notifications-backend/v/0.5.6[@backstage/plugin-notifications-backend]` |0.5.6 
-|`./dynamic-plugins/dist/backstage-plugin-notifications-backend-dynamic`
+|Signals  |`https://npmjs.com/package/@backstage/plugin-signals/v/0.0.19[@backstage/plugin-signals]` |0.0.19 
+|`./dynamic-plugins/dist/backstage-plugin-signals`
 
 
-|Notifications Module Email  |`https://npmjs.com/package/@backstage/plugin-notifications-backend-module-email/v/0.3.9[@backstage/plugin-notifications-backend-module-email]` |0.3.9 
-|`./dynamic-plugins/dist/backstage-plugin-notifications-backend-module-email-dynamic`
+|GitLab  |`https://npmjs.com/package/@immobiliarelabs/backstage-plugin-gitlab/v/6.12.1[@immobiliarelabs/backstage-plugin-gitlab]` |6.12.1 
+|`./dynamic-plugins/dist/immobiliarelabs-backstage-plugin-gitlab`
 
-`EMAIL_HOSTNAME`
 
-`EMAIL_USERNAME`
+|GitLab  |`https://npmjs.com/package/@immobiliarelabs/backstage-plugin-gitlab-backend/v/6.12.0[@immobiliarelabs/backstage-plugin-gitlab-backend]` |6.12.0 
+|`./dynamic-plugins/dist/immobiliarelabs-backstage-plugin-gitlab-backend-dynamic`
 
-`EMAIL_PASSWORD`
+`GITLAB_HOST`
 
-`EMAIL_SENDER`
+`GITLAB_TOKEN`
 
 
 |PagerDuty  |`https://npmjs.com/package/@pagerduty/backstage-plugin/v/0.15.5[@pagerduty/backstage-plugin]` |0.15.5 
@@ -244,56 +228,76 @@
 `PAGERDUTY_SUBDOMAIN`
 
 
-|Pingidentity  |`https://npmjs.com/package/@backstage-community/plugin-catalog-backend-module-pingidentity/v/0.5.0[@backstage-community/plugin-catalog-backend-module-pingidentity]` |0.5.0 
-|`./dynamic-plugins/dist/backstage-community-plugin-catalog-backend-module-pingidentity-dynamic`
+|Azure Repositorie  |`https://npmjs.com/package/@parfuemerie-douglas/scaffolder-backend-module-azure-repositories/v/0.3.0[@parfuemerie-douglas/scaffolder-backend-module-azure-repositories]` |0.3.0 
+|`./dynamic-plugins/dist/parfuemerie-douglas-scaffolder-backend-module-azure-repositories-dynamic`
 
 
-|Scaffolder Relation Processor  |`https://npmjs.com/package/@backstage-community/plugin-catalog-backend-module-scaffolder-relation-processor/v/2.5.0[@backstage-community/plugin-catalog-backend-module-scaffolder-relation-processor]` |2.5.0 
-|`./dynamic-plugins/dist/backstage-community-plugin-catalog-backend-module-scaffolder-relation-processor-dynamic`
+|Bulk Import  |`https://npmjs.com/package/@red-hat-developer-hub/backstage-plugin-bulk-import/v/1.13.4[@red-hat-developer-hub/backstage-plugin-bulk-import]` |1.13.4 
+|`./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-bulk-import`
 
 
-|Security Insights  |`https://npmjs.com/package/@roadiehq/backstage-plugin-security-insights/v/3.1.3[@roadiehq/backstage-plugin-security-insights]` |3.1.3 
-|`./dynamic-plugins/dist/roadiehq-backstage-plugin-security-insights`
+|Bulk Import  |`https://npmjs.com/package/@red-hat-developer-hub/backstage-plugin-bulk-import-backend/v/6.1.7[@red-hat-developer-hub/backstage-plugin-bulk-import-backend]` |6.1.7 
+|`./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-bulk-import-backend-dynamic`
 
 
-|ServiceNow  |`https://npmjs.com/package/@backstage-community/plugin-scaffolder-backend-module-servicenow/v/2.7.0[@backstage-community/plugin-scaffolder-backend-module-servicenow]` |2.7.0 
-|`./dynamic-plugins/dist/backstage-community-plugin-scaffolder-backend-module-servicenow-dynamic`
+|M  |`https://npmjs.com/package/@red-hat-developer-hub/backstage-plugin-catalog-backend-module-marketplace/v/0.4.4[@red-hat-developer-hub/backstage-plugin-catalog-backend-module-marketplace]` |0.4.4 
+|`./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-catalog-backend-module-marketplace-dynamic`
 
-`SERVICENOW_BASE_URL`
 
-`SERVICENOW_USERNAME`
+|Marketplace  |`https://npmjs.com/package/@red-hat-developer-hub/backstage-plugin-marketplace/v/0.8.5[@red-hat-developer-hub/backstage-plugin-marketplace]` |0.8.5 
+|`./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-marketplace`
 
-`SERVICENOW_PASSWORD`
 
+|Marketplace  |`https://npmjs.com/package/@red-hat-developer-hub/backstage-plugin-marketplace-backend/v/0.7.3[@red-hat-developer-hub/backstage-plugin-marketplace-backend]` |0.7.3 
+|`./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-marketplace-backend-dynamic`
 
-|Signals  |`https://npmjs.com/package/@backstage/plugin-signals/v/0.0.19[@backstage/plugin-signals]` |0.0.19 
-|`./dynamic-plugins/dist/backstage-plugin-signals`
 
+|Adoption Insights  |`https://npmjs.com/package/@red-hat-developer-hub/backstage-plugin-adoption-insights-backend/v/0.2.1[@red-hat-developer-hub/backstage-plugin-adoption-insights-backend]` |0.2.1 
+|`./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-adoption-insights-backend-dynamic`
 
-|SonarQube  |`https://npmjs.com/package/@backstage-community/plugin-sonarqube/v/0.13.0[@backstage-community/plugin-sonarqube]` |0.13.0 
-|`./dynamic-plugins/dist/backstage-community-plugin-sonarqube`
 
+|Analytics Module Adoption Insights  |`https://npmjs.com/package/@red-hat-developer-hub/backstage-plugin-analytics-module-adoption-insights/v/0.2.0[@red-hat-developer-hub/backstage-plugin-analytics-module-adoption-insights]` |0.2.0 
+|`./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-analytics-module-adoption-insights-dynamic`
 
-|SonarQube  |`https://npmjs.com/package/@backstage-community/plugin-sonarqube-backend/v/0.9.2[@backstage-community/plugin-sonarqube-backend]` |0.9.2 
-|`./dynamic-plugins/dist/backstage-community-plugin-sonarqube-backend-dynamic`
 
-`SONARQUBE_URL`
+|Datadog  |`https://npmjs.com/package/@roadiehq/backstage-plugin-datadog/v/2.4.3[@roadiehq/backstage-plugin-datadog]` |2.4.3 
+|`./dynamic-plugins/dist/roadiehq-backstage-plugin-datadog`
 
-`SONARQUBE_TOKEN`
 
+|GitHub Insights  |`https://npmjs.com/package/@roadiehq/backstage-plugin-github-insights/v/3.1.4[@roadiehq/backstage-plugin-github-insights]` |3.1.4 
+|`./dynamic-plugins/dist/roadiehq-backstage-plugin-github-insights`
 
-|SonarQube  |`https://npmjs.com/package/@backstage-community/plugin-scaffolder-backend-module-sonarqube/v/2.7.1[@backstage-community/plugin-scaffolder-backend-module-sonarqube]` |2.7.1 
-|`./dynamic-plugins/dist/backstage-community-plugin-scaffolder-backend-module-sonarqube-dynamic`
 
+|GitHub Pull Requests  |`https://npmjs.com/package/@roadiehq/backstage-plugin-github-pull-requests/v/3.4.2[@roadiehq/backstage-plugin-github-pull-requests]` |3.4.2 
+|`./dynamic-plugins/dist/roadiehq-backstage-plugin-github-pull-requests`
 
-|Tech Radar  |`https://npmjs.com/package/@backstage-community/plugin-tech-radar/v/1.7.0[@backstage-community/plugin-tech-radar]` |1.7.0 
-|`./dynamic-plugins/dist/backstage-community-plugin-tech-radar`
 
+|Jira  |`https://npmjs.com/package/@roadiehq/backstage-plugin-jira/v/2.9.0[@roadiehq/backstage-plugin-jira]` |2.9.0 
+|`./dynamic-plugins/dist/roadiehq-backstage-plugin-jira`
 
-|Tech Radar  |`https://npmjs.com/package/@backstage-community/plugin-tech-radar-backend/v/1.6.0[@backstage-community/plugin-tech-radar-backend]` |1.6.0 
-|`./dynamic-plugins/dist/backstage-community-plugin-tech-radar-backend-dynamic`
 
-`TECH_RADAR_DATA_URL`
+|Security Insights  |`https://npmjs.com/package/@roadiehq/backstage-plugin-security-insights/v/3.1.3[@roadiehq/backstage-plugin-security-insights]` |3.1.3 
+|`./dynamic-plugins/dist/roadiehq-backstage-plugin-security-insights`
+
+
+|Argo CD  |`https://npmjs.com/package/@roadiehq/scaffolder-backend-argocd/v/1.6.0[@roadiehq/scaffolder-backend-argocd]` |1.6.0 
+|`./dynamic-plugins/dist/roadiehq-scaffolder-backend-argocd-dynamic`
+
+`ARGOCD_AUTH_TOKEN`
+
+`ARGOCD_AUTH_TOKEN2`
+
+`ARGOCD_INSTANCE1_URL`
+
+`ARGOCD_INSTANCE2_URL`
+
+`ARGOCD_PASSWORD`
+
+`ARGOCD_USERNAME`
+
+
+|Http Request  |`https://npmjs.com/package/@roadiehq/scaffolder-backend-module-http-request/v/5.3.4[@roadiehq/scaffolder-backend-module-http-request]` |5.3.4 
+|`./dynamic-plugins/dist/roadiehq-scaffolder-backend-module-http-request-dynamic`
 
 
 |Utils  |`https://npmjs.com/package/@roadiehq/scaffolder-backend-module-utils/v/3.5.0[@roadiehq/scaffolder-backend-module-utils]` |3.5.0 
diff --git a/modules/dynamic-plugins/rhdh-supported-plugins.csv b/modules/dynamic-plugins/rhdh-supported-plugins.csv
index 214912a4f5..386cdeaa26 100644
--- a/modules/dynamic-plugins/rhdh-supported-plugins.csv
+++ b/modules/dynamic-plugins/rhdh-supported-plugins.csv
@@ -1,80 +1,79 @@
-"Name","Plugin","Role","Version","Support Level","Path","Required Variables","Default"
-"Adoption Insights ","@red-hat-developer-hub/backstage-plugin-adoption-insights","Frontend","0.2.1","Production","./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-adoption-insights",";","Enabled"
-"Analytics Provider Segment ","@backstage-community/plugin-analytics-provider-segment","Frontend","1.16.0","Production","./dynamic-plugins/dist/backstage-community-plugin-analytics-provider-segment","`SEGMENT_WRITE_KEY`;`SEGMENT_TEST_MODE`;","Enabled"
-"Argo CD ","@roadiehq/backstage-plugin-argo-cd-backend","Backend","4.3.1","Production","./dynamic-plugins/dist/roadiehq-backstage-plugin-argo-cd-backend-dynamic","`ARGOCD_USERNAME`;`ARGOCD_PASSWORD`;`ARGOCD_INSTANCE1_URL`;`ARGOCD_AUTH_TOKEN`;`ARGOCD_INSTANCE2_URL`;`ARGOCD_AUTH_TOKEN2`;","Disabled"
-"Dynamic Home Page ","@red-hat-developer-hub/backstage-plugin-dynamic-home-page","Frontend","1.5.0","Production","./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-dynamic-home-page",";","Enabled"
-"GitHub ","@backstage/plugin-catalog-backend-module-github","Backend","0.9.0","Production","./dynamic-plugins/dist/backstage-plugin-catalog-backend-module-github-dynamic","`GITHUB_ORG`;","Disabled"
-"GitHub ","@backstage/plugin-scaffolder-backend-module-github","Backend","0.7.1","Production","./dynamic-plugins/dist/backstage-plugin-scaffolder-backend-module-github-dynamic",";","Disabled"
-"GitHub Org ","@backstage/plugin-catalog-backend-module-github-org","Backend","0.3.10","Production","./dynamic-plugins/dist/backstage-plugin-catalog-backend-module-github-org-dynamic","`GITHUB_URL`;`GITHUB_ORG`;","Disabled"
-"Global Floating Action Button ","@red-hat-developer-hub/backstage-plugin-global-floating-action-button","Frontend","1.2.1","Production","./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-global-floating-action-button",";","Enabled"
-"Global Header ","@red-hat-developer-hub/backstage-plugin-global-header","Frontend","1.14.0","Production","./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-global-header",";","Enabled"
-"Keycloak ","@backstage-community/plugin-catalog-backend-module-keycloak","Backend","3.12.1","Production","./dynamic-plugins/dist/backstage-community-plugin-catalog-backend-module-keycloak-dynamic","`KEYCLOAK_BASE_URL`;`KEYCLOAK_LOGIN_REALM`;`KEYCLOAK_REALM`;`KEYCLOAK_CLIENT_ID`;`KEYCLOAK_CLIENT_SECRET`;","Disabled"
-"Kubernetes ","@backstage/plugin-kubernetes-backend","Backend","0.19.6","Production","./dynamic-plugins/dist/backstage-plugin-kubernetes-backend-dynamic","`K8S_CLUSTER_NAME`;`K8S_CLUSTER_URL`;`K8S_CLUSTER_TOKEN`;","Disabled"
-"Kubernetes ","@backstage-community/plugin-scaffolder-backend-module-kubernetes","Backend","2.8.1","Production","./dynamic-plugins/dist/backstage-community-plugin-scaffolder-backend-module-kubernetes-dynamic",";","Disabled"
-"Ldap ","@backstage/plugin-catalog-backend-module-ldap","Backend","0.11.5","Production","./dynamic-plugins/dist/backstage-plugin-catalog-backend-module-ldap-dynamic","`LDAP_TARGET_URL`;`LDAP_BIND_DN`;`LDAP_BIND_SECRET`;`LDAP_USERS_DN`;`LDAP_GROUPS_DN`;","Disabled"
-"OCM ","@backstage-community/plugin-ocm","Frontend","5.6.0","Production","./dynamic-plugins/dist/backstage-community-plugin-ocm",";","Disabled"
-"OCM ","@backstage-community/plugin-ocm-backend","Backend","5.7.0","Production","./dynamic-plugins/dist/backstage-community-plugin-ocm-backend-dynamic","`OCM_HUB_NAME`;`OCM_HUB_URL`;`OCM_SA_TOKEN`;","Disabled"
-"Quay ","@backstage-community/plugin-quay","Frontend","1.21.1","Production","./dynamic-plugins/dist/backstage-community-plugin-quay",";","Disabled"
-"Quay ","@backstage-community/plugin-scaffolder-backend-module-quay","Backend","2.9.1","Production","./dynamic-plugins/dist/backstage-community-plugin-scaffolder-backend-module-quay-dynamic",";","Enabled"
-"Quickstart ","@red-hat-developer-hub/backstage-plugin-quickstart","Frontend","1.1.0","Production","./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-quickstart",";","Enabled"
-"RBAC ","@backstage-community/plugin-rbac","Frontend","1.42.0","Production","./dynamic-plugins/dist/backstage-community-plugin-rbac",";","Disabled"
-"Regex ","@backstage-community/plugin-scaffolder-backend-module-regex","Backend","2.7.0","Production","./dynamic-plugins/dist/backstage-community-plugin-scaffolder-backend-module-regex-dynamic",";","Enabled"
-"Signals ","@backstage/plugin-signals-backend","Backend","0.3.4","Production","./dynamic-plugins/dist/backstage-plugin-signals-backend-dynamic",";","Disabled"
-"Tekton ","@backstage-community/plugin-tekton","Frontend","3.26.2","Production","./dynamic-plugins/dist/backstage-community-plugin-tekton",";","Disabled"
-"Topology ","@backstage-community/plugin-topology","Frontend","2.2.2","Production","./dynamic-plugins/dist/backstage-community-plugin-topology",";","Disabled"
-"3scale ","@backstage-community/plugin-3scale-backend","Backend","3.6.1","Red Hat Tech Preview","./dynamic-plugins/dist/backstage-community-plugin-3scale-backend-dynamic","`THREESCALE_BASE_URL`;`THREESCALE_ACCESS_TOKEN`;","Disabled"
-"ACR ","@backstage-community/plugin-acr","Frontend","1.15.1","Red Hat Tech Preview","./dynamic-plugins/dist/backstage-community-plugin-acr",";","Disabled"
-"Adoption Insights ","@red-hat-developer-hub/backstage-plugin-adoption-insights-backend","Backend","0.2.2","Red Hat Tech Preview","./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-adoption-insights-backend-dynamic",";","Enabled"
-"Analytics Module Adoption Insights ","@red-hat-developer-hub/backstage-plugin-analytics-module-adoption-insights","Frontend","0.2.0","Red Hat Tech Preview","./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-analytics-module-adoption-insights-dynamic",";","Enabled"
-"Argo CD ","@roadiehq/scaffolder-backend-argocd","Backend","1.6.0","Red Hat Tech Preview","./dynamic-plugins/dist/roadiehq-scaffolder-backend-argocd-dynamic","`ARGOCD_USERNAME`;`ARGOCD_PASSWORD`;`ARGOCD_INSTANCE1_URL`;`ARGOCD_AUTH_TOKEN`;`ARGOCD_INSTANCE2_URL`;`ARGOCD_AUTH_TOKEN2`;","Disabled"
-"Argo CD (Red Hat) ","@backstage-community/plugin-redhat-argocd","Frontend","1.21.2","Red Hat Tech Preview","./dynamic-plugins/dist/backstage-community-plugin-redhat-argocd",";","Disabled"
-"Azure ","@backstage/plugin-scaffolder-backend-module-azure","Backend","0.2.9","Red Hat Tech Preview","./dynamic-plugins/dist/backstage-plugin-scaffolder-backend-module-azure-dynamic",";","Disabled"
-"Azure Devops ","@backstage-community/plugin-azure-devops","Frontend","0.16.1","Red Hat Tech Preview","./dynamic-plugins/dist/backstage-community-plugin-azure-devops",";","Disabled"
-"Azure Devops ","@backstage-community/plugin-azure-devops-backend","Backend","0.17.1","Red Hat Tech Preview","./dynamic-plugins/dist/backstage-community-plugin-azure-devops-backend-dynamic","`AZURE_TOKEN`;`AZURE_ORG`;","Disabled"
-"Azure Repositories ","@parfuemerie-douglas/scaffolder-backend-module-azure-repositories","Backend","0.3.0","Red Hat Tech Preview","./dynamic-plugins/dist/parfuemerie-douglas-scaffolder-backend-module-azure-repositories-dynamic",";","Disabled"
-"Bitbucket Cloud ","@backstage/plugin-catalog-backend-module-bitbucket-cloud","Backend","0.4.8","Red Hat Tech Preview","./dynamic-plugins/dist/backstage-plugin-catalog-backend-module-bitbucket-cloud-dynamic","`BITBUCKET_WORKSPACE`;","Disabled"
-"Bitbucket Cloud ","@backstage/plugin-scaffolder-backend-module-bitbucket-cloud","Backend","0.2.9","Red Hat Tech Preview","./dynamic-plugins/dist/backstage-plugin-scaffolder-backend-module-bitbucket-cloud-dynamic",";","Disabled"
-"Bitbucket Server ","@backstage/plugin-catalog-backend-module-bitbucket-server","Backend","0.4.1","Red Hat Tech Preview","./dynamic-plugins/dist/backstage-plugin-catalog-backend-module-bitbucket-server-dynamic","`BITBUCKET_HOST`;","Disabled"
-"Bitbucket Server ","@backstage/plugin-scaffolder-backend-module-bitbucket-server","Backend","0.2.9","Red Hat Tech Preview","./dynamic-plugins/dist/backstage-plugin-scaffolder-backend-module-bitbucket-server-dynamic",";","Disabled"
-"Bulk Import ","@red-hat-developer-hub/backstage-plugin-bulk-import","Frontend","1.13.3","Red Hat Tech Preview","./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-bulk-import",";","Disabled"
-"Bulk Import ","@red-hat-developer-hub/backstage-plugin-bulk-import-backend","Backend","6.1.3","Red Hat Tech Preview","./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-bulk-import-backend-dynamic",";","Disabled"
-"Datadog ","@roadiehq/backstage-plugin-datadog","Frontend","2.4.3","Red Hat Tech Preview","./dynamic-plugins/dist/roadiehq-backstage-plugin-datadog",";","Disabled"
-"Dynatrace ","@backstage-community/plugin-dynatrace","Frontend","10.6.0","Red Hat Tech Preview","./dynamic-plugins/dist/backstage-community-plugin-dynatrace",";","Disabled"
-"Gerrit ","@backstage/plugin-scaffolder-backend-module-gerrit","Backend","0.2.9","Red Hat Tech Preview","./dynamic-plugins/dist/backstage-plugin-scaffolder-backend-module-gerrit-dynamic",";","Disabled"
-"GitHub Actions ","@backstage-community/plugin-github-actions","Frontend","0.11.1","Red Hat Tech Preview","./dynamic-plugins/dist/backstage-community-plugin-github-actions",";","Disabled"
-"GitHub Insights ","@roadiehq/backstage-plugin-github-insights","Frontend","3.1.4","Red Hat Tech Preview","./dynamic-plugins/dist/roadiehq-backstage-plugin-github-insights",";","Disabled"
-"GitHub Issues ","@backstage-community/plugin-github-issues","Frontend","0.10.0","Red Hat Tech Preview","./dynamic-plugins/dist/backstage-community-plugin-github-issues",";","Disabled"
-"GitHub Pull Requests ","@roadiehq/backstage-plugin-github-pull-requests","Frontend","3.4.2","Red Hat Tech Preview","./dynamic-plugins/dist/roadiehq-backstage-plugin-github-pull-requests",";","Disabled"
-"GitLab ","@immobiliarelabs/backstage-plugin-gitlab","Frontend","6.12.0","Red Hat Tech Preview","./dynamic-plugins/dist/immobiliarelabs-backstage-plugin-gitlab",";","Disabled"
-"GitLab ","@backstage/plugin-catalog-backend-module-gitlab","Backend","0.6.6","Red Hat Tech Preview","./dynamic-plugins/dist/backstage-plugin-catalog-backend-module-gitlab-dynamic",";","Disabled"
-"GitLab ","@immobiliarelabs/backstage-plugin-gitlab-backend","Backend","6.12.0","Red Hat Tech Preview","./dynamic-plugins/dist/immobiliarelabs-backstage-plugin-gitlab-backend-dynamic","`GITLAB_HOST`;`GITLAB_TOKEN`;","Disabled"
-"GitLab ","@backstage/plugin-scaffolder-backend-module-gitlab","Backend","0.9.1","Red Hat Tech Preview","./dynamic-plugins/dist/backstage-plugin-scaffolder-backend-module-gitlab-dynamic",";","Disabled"
-"GitLab Org ","@backstage/plugin-catalog-backend-module-gitlab-org","Backend","0.2.9","Red Hat Tech Preview","./dynamic-plugins/dist/backstage-plugin-catalog-backend-module-gitlab-org-dynamic",";","Disabled"
-"Http Request ","@roadiehq/scaffolder-backend-module-http-request","Backend","5.3.3","Red Hat Tech Preview","./dynamic-plugins/dist/roadiehq-scaffolder-backend-module-http-request-dynamic",";","Disabled"
-"Jenkins ","@backstage-community/plugin-jenkins","Frontend","0.20.0","Red Hat Tech Preview","./dynamic-plugins/dist/backstage-community-plugin-jenkins",";","Disabled"
-"Jenkins ","@backstage-community/plugin-jenkins-backend","Backend","0.15.0","Red Hat Tech Preview","./dynamic-plugins/dist/backstage-community-plugin-jenkins-backend-dynamic","`JENKINS_URL`;`JENKINS_USERNAME`;`JENKINS_TOKEN`;","Disabled"
-"JFrog Artifactory ","@backstage-community/plugin-jfrog-artifactory","Frontend","1.15.3","Red Hat Tech Preview","./dynamic-plugins/dist/backstage-community-plugin-jfrog-artifactory",";","Disabled"
-"Jira ","@roadiehq/backstage-plugin-jira","Frontend","2.9.0","Red Hat Tech Preview","./dynamic-plugins/dist/roadiehq-backstage-plugin-jira",";","Disabled"
-"Kubernetes ","@backstage/plugin-kubernetes","Frontend","0.12.7","Red Hat Tech Preview","./dynamic-plugins/dist/backstage-plugin-kubernetes",";","Disabled"
-"Lighthouse ","@backstage-community/plugin-lighthouse","Frontend","0.10.0","Red Hat Tech Preview","./dynamic-plugins/dist/backstage-community-plugin-lighthouse",";","Disabled"
-"Marketplace ","@red-hat-developer-hub/backstage-plugin-marketplace","Frontend","0.7.0","Red Hat Tech Preview","./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-marketplace",";","Enabled"
-"Marketplace ","@red-hat-developer-hub/backstage-plugin-catalog-backend-module-marketplace","Backend","0.3.3","Red Hat Tech Preview","./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-catalog-backend-module-marketplace-dynamic",";","Enabled"
-"Marketplace ","@red-hat-developer-hub/backstage-plugin-marketplace-backend","Backend","0.6.0","Red Hat Tech Preview","./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-marketplace-backend-dynamic",";","Enabled"
-"MS Graph ","@backstage/plugin-catalog-backend-module-msgraph","Backend","0.7.0","Red Hat Tech Preview","./dynamic-plugins/dist/backstage-plugin-catalog-backend-module-msgraph-dynamic","`MICROSOFT_TENANT_ID`;`MICROSOFT_CLIENT_ID`;`MICROSOFT_CLIENT_SECRET`;","Disabled"
-"Nexus Repository Manager ","@backstage-community/plugin-nexus-repository-manager","Frontend","1.14.1","Red Hat Tech Preview","./dynamic-plugins/dist/backstage-community-plugin-nexus-repository-manager",";","Disabled"
-"Notifications ","@backstage/plugin-notifications","Frontend","0.5.5","Red Hat Tech Preview","./dynamic-plugins/dist/backstage-plugin-notifications",";","Disabled"
-"Notifications ","@backstage/plugin-notifications-backend","Backend","0.5.6","Red Hat Tech Preview","./dynamic-plugins/dist/backstage-plugin-notifications-backend-dynamic",";","Disabled"
-"Notifications Module Email ","@backstage/plugin-notifications-backend-module-email","Backend","0.3.9","Red Hat Tech Preview","./dynamic-plugins/dist/backstage-plugin-notifications-backend-module-email-dynamic","`EMAIL_HOSTNAME`;`EMAIL_USERNAME`;`EMAIL_PASSWORD`;`EMAIL_SENDER`;","Disabled"
-"PagerDuty ","@pagerduty/backstage-plugin","Frontend","0.15.5","Red Hat Tech Preview","./dynamic-plugins/dist/pagerduty-backstage-plugin",";","Disabled"
-"PagerDuty ","@pagerduty/backstage-plugin-backend","Backend","0.9.6","Red Hat Tech Preview","./dynamic-plugins/dist/pagerduty-backstage-plugin-backend-dynamic","`PAGERDUTY_API_BASE`;`PAGERDUTY_CLIENT_ID`;`PAGERDUTY_CLIENT_SECRET`;`PAGERDUTY_SUBDOMAIN`;","Disabled"
-"Pingidentity ","@backstage-community/plugin-catalog-backend-module-pingidentity","Backend","0.5.0","Red Hat Tech Preview","./dynamic-plugins/dist/backstage-community-plugin-catalog-backend-module-pingidentity-dynamic",";","Disabled"
-"Scaffolder Relation Processor ","@backstage-community/plugin-catalog-backend-module-scaffolder-relation-processor","Backend","2.5.0","Red Hat Tech Preview","./dynamic-plugins/dist/backstage-community-plugin-catalog-backend-module-scaffolder-relation-processor-dynamic",";","Disabled"
-"Security Insights ","@roadiehq/backstage-plugin-security-insights","Frontend","3.1.3","Red Hat Tech Preview","./dynamic-plugins/dist/roadiehq-backstage-plugin-security-insights",";","Disabled"
-"ServiceNow ","@backstage-community/plugin-scaffolder-backend-module-servicenow","Backend","2.7.0","Red Hat Tech Preview","./dynamic-plugins/dist/backstage-community-plugin-scaffolder-backend-module-servicenow-dynamic","`SERVICENOW_BASE_URL`;`SERVICENOW_USERNAME`;`SERVICENOW_PASSWORD`;","Disabled"
-"Signals ","@backstage/plugin-signals","Frontend","0.0.19","Red Hat Tech Preview","./dynamic-plugins/dist/backstage-plugin-signals",";","Disabled"
-"SonarQube ","@backstage-community/plugin-sonarqube","Frontend","0.13.0","Red Hat Tech Preview","./dynamic-plugins/dist/backstage-community-plugin-sonarqube",";","Disabled"
-"SonarQube ","@backstage-community/plugin-sonarqube-backend","Backend","0.9.2","Red Hat Tech Preview","./dynamic-plugins/dist/backstage-community-plugin-sonarqube-backend-dynamic","`SONARQUBE_URL`;`SONARQUBE_TOKEN`;","Disabled"
-"SonarQube ","@backstage-community/plugin-scaffolder-backend-module-sonarqube","Backend","2.7.1","Red Hat Tech Preview","./dynamic-plugins/dist/backstage-community-plugin-scaffolder-backend-module-sonarqube-dynamic",";","Disabled"
-"Tech Radar ","@backstage-community/plugin-tech-radar","Frontend","1.7.0","Red Hat Tech Preview","./dynamic-plugins/dist/backstage-community-plugin-tech-radar",";","Disabled"
-"Tech Radar ","@backstage-community/plugin-tech-radar-backend","Backend","1.6.0","Red Hat Tech Preview","./dynamic-plugins/dist/backstage-community-plugin-tech-radar-backend-dynamic","`TECH_RADAR_DATA_URL`;","Disabled"
-"Utils ","@roadiehq/scaffolder-backend-module-utils","Backend","3.5.0","Red Hat Tech Preview","./dynamic-plugins/dist/roadiehq-scaffolder-backend-module-utils-dynamic",";","Disabled"
+"Name","Plugin","Role","Version","Support Level","Lifecycle","Path","Required Variables","Default"
+"3scale ","@backstage-community/plugin-3scale-backend","Backend","3.6.1","Red Hat Tech Preview","active","./dynamic-plugins/dist/backstage-community-plugin-3scale-backend-dynamic","`THREESCALE_ACCESS_TOKEN`;`THREESCALE_BASE_URL`;","Disabled"
+"ACR ","@backstage-community/plugin-acr","Frontend","1.15.1","Red Hat Tech Preview","active","./dynamic-plugins/dist/backstage-community-plugin-acr",";","Disabled"
+"Analytics Provider Segment ","@backstage-community/plugin-analytics-provider-segment","Frontend","1.16.0","Production","active","./dynamic-plugins/dist/backstage-community-plugin-analytics-provider-segment","`SEGMENT_TEST_MODE`;`SEGMENT_WRITE_KEY`;","Enabled"
+"Azure Devops ","@backstage-community/plugin-azure-devops","Frontend","0.16.1","Red Hat Tech Preview","active","./dynamic-plugins/dist/backstage-community-plugin-azure-devops",";","Disabled"
+"Azure Devops ","@backstage-community/plugin-azure-devops-backend","Backend","0.17.1","Red Hat Tech Preview","active","./dynamic-plugins/dist/backstage-community-plugin-azure-devops-backend-dynamic","`AZURE_ORG`;`AZURE_TOKEN`;","Disabled"
+"Keycloak ","@backstage-community/plugin-catalog-backend-module-keycloak","Backend","3.12.1","Production","active","./dynamic-plugins/dist/backstage-community-plugin-catalog-backend-module-keycloak-dynamic","`KEYCLOAK_BASE_URL`;`KEYCLOAK_CLIENT_ID`;`KEYCLOAK_CLIENT_SECRET`;`KEYCLOAK_LOGIN_REALM`;`KEYCLOAK_REALM`;","Disabled"
+"Pingidentity ","@backstage-community/plugin-catalog-backend-module-pingidentity","Backend","0.5.0","Red Hat Tech Preview","active","./dynamic-plugins/dist/backstage-community-plugin-catalog-backend-module-pingidentity-dynamic",";","Disabled"
+"Scaffolder Re ","@backstage-community/plugin-catalog-backend-module-scaffolder-relation-processor","Backend","2.5.0","Red Hat Tech Preview","active","./dynamic-plugins/dist/backstage-community-plugin-catalog-backend-module-scaffolder-relation-processor-dynamic",";","Disabled"
+"Dynatrace ","@backstage-community/plugin-dynatrace","Frontend","10.6.0","Red Hat Tech Preview","active","./dynamic-plugins/dist/backstage-community-plugin-dynatrace",";","Disabled"
+"GitHub Actions ","@backstage-community/plugin-github-actions","Frontend","0.11.1","Red Hat Tech Preview","active","./dynamic-plugins/dist/backstage-community-plugin-github-actions",";","Disabled"
+"GitHub Issues ","@backstage-community/plugin-github-issues","Frontend","0.10.0","Red Hat Tech Preview","active","./dynamic-plugins/dist/backstage-community-plugin-github-issues",";","Disabled"
+"Jenkins ","@backstage-community/plugin-jenkins","Frontend","0.20.0","Red Hat Tech Preview","active","./dynamic-plugins/dist/backstage-community-plugin-jenkins",";","Disabled"
+"Jenkins ","@backstage-community/plugin-jenkins-backend","Backend","0.15.0","Red Hat Tech Preview","active","./dynamic-plugins/dist/backstage-community-plugin-jenkins-backend-dynamic","`JENKINS_TOKEN`;`JENKINS_URL`;`JENKINS_USERNAME`;","Disabled"
+"JFrog Artifactory ","@backstage-community/plugin-jfrog-artifactory","Frontend","1.15.3","Red Hat Tech Preview","active","./dynamic-plugins/dist/backstage-community-plugin-jfrog-artifactory",";","Disabled"
+"Lighthouse ","@backstage-community/plugin-lighthouse","Frontend","0.10.0","Red Hat Tech Preview","active","./dynamic-plugins/dist/backstage-community-plugin-lighthouse",";","Disabled"
+"Nexus Repository Manager ","@backstage-community/plugin-nexus-repository-manager","Frontend","1.14.1","Red Hat Tech Preview","active","./dynamic-plugins/dist/backstage-community-plugin-nexus-repository-manager",";","Disabled"
+"OCM ","@backstage-community/plugin-ocm","Frontend","5.6.0","Production","active","./dynamic-plugins/dist/backstage-community-plugin-ocm",";","Disabled"
+"OCM ","@backstage-community/plugin-ocm-backend","Backend","5.7.0","Production","active","./dynamic-plugins/dist/backstage-community-plugin-ocm-backend-dynamic","`OCM_HUB_NAME`;`OCM_HUB_URL`;`OCM_SA_TOKEN`;","Disabled"
+"Quay ","@backstage-community/plugin-quay","Frontend","1.21.1","Production","active","./dynamic-plugins/dist/backstage-community-plugin-quay",";","Disabled"
+"RBAC ","@backstage-community/plugin-rbac","Frontend","1.42.0","Production","active","./dynamic-plugins/dist/backstage-community-plugin-rbac",";","Disabled"
+"Argo CD (Red Hat) ","@backstage-community/plugin-redhat-argocd","Frontend","1.21.2","Red Hat Tech Preview","active","./dynamic-plugins/dist/backstage-community-plugin-redhat-argocd",";","Disabled"
+"Kubernetes ","@backstage-community/plugin-scaffolder-backend-module-kubernetes","Backend","2.8.1","Production","active","./dynamic-plugins/dist/backstage-community-plugin-scaffolder-backend-module-kubernetes-dynamic",";","Disabled"
+"Quay ","@backstage-community/plugin-scaffolder-backend-module-quay","Backend","2.9.1","Production","active","./dynamic-plugins/dist/backstage-community-plugin-scaffolder-backend-module-quay-dynamic",";","Enabled"
+"Regex ","@backstage-community/plugin-scaffolder-backend-module-regex","Backend","2.7.0","Production","active","./dynamic-plugins/dist/backstage-community-plugin-scaffolder-backend-module-regex-dynamic",";","Enabled"
+"ServiceNow ","@backstage-community/plugin-scaffolder-backend-module-servicenow","Backend","2.7.0","Red Hat Tech Preview","active","./dynamic-plugins/dist/backstage-community-plugin-scaffolder-backend-module-servicenow-dynamic","`SERVICENOW_BASE_URL`;`SERVICENOW_PASSWORD`;`SERVICENOW_USERNAME`;","Disabled"
+"SonarQube ","@backstage-community/plugin-scaffolder-backend-module-sonarqube","Backend","2.7.1","Red Hat Tech Preview","active","./dynamic-plugins/dist/backstage-community-plugin-scaffolder-backend-module-sonarqube-dynamic",";","Disabled"
+"SonarQube ","@backstage-community/plugin-sonarqube","Frontend","0.13.0","Red Hat Tech Preview","active","./dynamic-plugins/dist/backstage-community-plugin-sonarqube",";","Disabled"
+"SonarQube ","@backstage-community/plugin-sonarqube-backend","Backend","0.9.2","Red Hat Tech Preview","active","./dynamic-plugins/dist/backstage-community-plugin-sonarqube-backend-dynamic","`SONARQUBE_TOKEN`;`SONARQUBE_URL`;","Disabled"
+"Tech Radar ","@backstage-community/plugin-tech-radar","Frontend","1.7.1","Red Hat Tech Preview","active","./dynamic-plugins/dist/backstage-community-plugin-tech-radar",";","Disabled"
+"Tech Radar ","@backstage-community/plugin-tech-radar-backend","Backend","1.6.0","Red Hat Tech Preview","active","./dynamic-plugins/dist/backstage-community-plugin-tech-radar-backend-dynamic","`TECH_RADAR_DATA_URL`;","Disabled"
+"Tekton ","@backstage-community/plugin-tekton","Frontend","3.26.2","Production","active","./dynamic-plugins/dist/backstage-community-plugin-tekton",";","Disabled"
+"Topology ","@backstage-community/plugin-topology","Frontend","2.2.2","Production","active","./dynamic-plugins/dist/backstage-community-plugin-topology",";","Disabled"
+"Bitbucket Cloud ","@backstage/plugin-catalog-backend-module-bitbucket-cloud","Backend","0.4.8","Red Hat Tech Preview","active","./dynamic-plugins/dist/backstage-plugin-catalog-backend-module-bitbucket-cloud-dynamic","`BITBUCKET_WORKSPACE`;","Disabled"
+"Bitbucket Server ","@backstage/plugin-catalog-backend-module-bitbucket-server","Backend","0.4.1","Red Hat Tech Preview","active","./dynamic-plugins/dist/backstage-plugin-catalog-backend-module-bitbucket-server-dynamic","`BITBUCKET_HOST`;","Disabled"
+"GitHub ","@backstage/plugin-catalog-backend-module-github","Backend","0.9.0","Production","active","./dynamic-plugins/dist/backstage-plugin-catalog-backend-module-github-dynamic","`GITHUB_ORG`;","Disabled"
+"GitHub Org ","@backstage/plugin-catalog-backend-module-github-org","Backend","0.3.10","Production","active","./dynamic-plugins/dist/backstage-plugin-catalog-backend-module-github-org-dynamic","`GITHUB_ORG`;`GITHUB_URL`;","Disabled"
+"GitLab ","@backstage/plugin-catalog-backend-module-gitlab","Backend","0.6.6","Red Hat Tech Preview","active","./dynamic-plugins/dist/backstage-plugin-catalog-backend-module-gitlab-dynamic",";","Disabled"
+"GitLab Org ","@backstage/plugin-catalog-backend-module-gitlab-org","Backend","0.2.9","Red Hat Tech Preview","active","./dynamic-plugins/dist/backstage-plugin-catalog-backend-module-gitlab-org-dynamic",";","Disabled"
+"Ldap ","@backstage/plugin-catalog-backend-module-ldap","Backend","0.11.5","Red Hat Tech Preview","active","./dynamic-plugins/dist/backstage-plugin-catalog-backend-module-ldap-dynamic",";","Disabled"
+"MS Graph ","@backstage/plugin-catalog-backend-module-msgraph","Backend","0.7.0","Red Hat Tech Preview","active","./dynamic-plugins/dist/backstage-plugin-catalog-backend-module-msgraph-dynamic","`MICROSOFT_CLIENT_ID`;`MICROSOFT_CLIENT_SECRET`;`MICROSOFT_TENANT_ID`;","Disabled"
+"Kubernetes ","@backstage/plugin-kubernetes","Frontend","0.12.7","Red Hat Tech Preview","active","./dynamic-plugins/dist/backstage-plugin-kubernetes",";","Disabled"
+"Kubernetes ","@backstage/plugin-kubernetes-backend","Backend","0.19.6","Production","active","./dynamic-plugins/dist/backstage-plugin-kubernetes-backend-dynamic","`K8S_CLUSTER_NAME`;`K8S_CLUSTER_TOKEN`;`K8S_CLUSTER_URL`;","Disabled"
+"Notifications ","@backstage/plugin-notifications","Frontend","0.5.5","Red Hat Tech Preview","active","./dynamic-plugins/dist/backstage-plugin-notifications",";","Disabled"
+"Notifications ","@backstage/plugin-notifications-backend","Backend","0.5.6","Red Hat Tech Preview","active","./dynamic-plugins/dist/backstage-plugin-notifications-backend-dynamic",";","Disabled"
+"Notifications Module Email ","@backstage/plugin-notifications-backend-module-email","Backend","0.3.9","Red Hat Tech Preview","active","./dynamic-plugins/dist/backstage-plugin-notifications-backend-module-email-dynamic","`EMAIL_HOSTNAME`;`EMAIL_PASSWORD`;`EMAIL_SENDER`;`EMAIL_USERNAME`;","Disabled"
+"Azure ","@backstage/plugin-scaffolder-backend-module-azure","Backend","0.2.9","Red Hat Tech Preview","active","./dynamic-plugins/dist/backstage-plugin-scaffolder-backend-module-azure-dynamic",";","Disabled"
+"Bitbucket Cloud ","@backstage/plugin-scaffolder-backend-module-bitbucket-cloud","Backend","0.2.9","Red Hat Tech Preview","active","./dynamic-plugins/dist/backstage-plugin-scaffolder-backend-module-bitbucket-cloud-dynamic",";","Disabled"
+"Bitbucket Server ","@backstage/plugin-scaffolder-backend-module-bitbucket-server","Backend","0.2.9","Red Hat Tech Preview","active","./dynamic-plugins/dist/backstage-plugin-scaffolder-backend-module-bitbucket-server-dynamic",";","Disabled"
+"Gerrit ","@backstage/plugin-scaffolder-backend-module-gerrit","Backend","0.2.9","Red Hat Tech Preview","active","./dynamic-plugins/dist/backstage-plugin-scaffolder-backend-module-gerrit-dynamic",";","Disabled"
+"GitHub ","@backstage/plugin-scaffolder-backend-module-github","Backend","0.7.1","Production","active","./dynamic-plugins/dist/backstage-plugin-scaffolder-backend-module-github-dynamic",";","Disabled"
+"GitLab ","@backstage/plugin-scaffolder-backend-module-gitlab","Backend","0.9.1","Red Hat Tech Preview","active","./dynamic-plugins/dist/backstage-plugin-scaffolder-backend-module-gitlab-dynamic",";","Disabled"
+"Signals ","@backstage/plugin-signals","Frontend","0.0.19","Red Hat Tech Preview","active","./dynamic-plugins/dist/backstage-plugin-signals",";","Disabled"
+"Signals ","@backstage/plugin-signals-backend","Backend","0.3.4","Production","active","./dynamic-plugins/dist/backstage-plugin-signals-backend-dynamic",";","Disabled"
+"GitLab ","@immobiliarelabs/backstage-plugin-gitlab","Frontend","6.12.1","Red Hat Tech Preview","active","./dynamic-plugins/dist/immobiliarelabs-backstage-plugin-gitlab",";","Disabled"
+"GitLab ","@immobiliarelabs/backstage-plugin-gitlab-backend","Backend","6.12.0","Red Hat Tech Preview","active","./dynamic-plugins/dist/immobiliarelabs-backstage-plugin-gitlab-backend-dynamic","`GITLAB_HOST`;`GITLAB_TOKEN`;","Disabled"
+"PagerDuty ","@pagerduty/backstage-plugin","Frontend","0.15.5","Red Hat Tech Preview","active","./dynamic-plugins/dist/pagerduty-backstage-plugin",";","Disabled"
+"PagerDuty ","@pagerduty/backstage-plugin-backend","Backend","0.9.6","Red Hat Tech Preview","active","./dynamic-plugins/dist/pagerduty-backstage-plugin-backend-dynamic","`PAGERDUTY_API_BASE`;`PAGERDUTY_CLIENT_ID`;`PAGERDUTY_CLIENT_SECRET`;`PAGERDUTY_SUBDOMAIN`;","Disabled"
+"Azure Repositorie ","@parfuemerie-douglas/scaffolder-backend-module-azure-repositories","Backend","0.3.0","Red Hat Tech Preview","active","./dynamic-plugins/dist/parfuemerie-douglas-scaffolder-backend-module-azure-repositories-dynamic",";","Disabled"
+"Bulk Import ","@red-hat-developer-hub/backstage-plugin-bulk-import","Frontend","1.13.4","Red Hat Tech Preview","active","./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-bulk-import",";","Disabled"
+"Bulk Import ","@red-hat-developer-hub/backstage-plugin-bulk-import-backend","Backend","6.1.7","Red Hat Tech Preview","active","./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-bulk-import-backend-dynamic",";","Disabled"
+"M ","@red-hat-developer-hub/backstage-plugin-catalog-backend-module-marketplace","Backend","0.4.4","Red Hat Tech Preview","active","./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-catalog-backend-module-marketplace-dynamic",";","Enabled"
+"Dynamic Home Page ","@red-hat-developer-hub/backstage-plugin-dynamic-home-page","Frontend","1.5.0","Production","active","./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-dynamic-home-page",";","Enabled"
+"Global Floating Action B ","@red-hat-developer-hub/backstage-plugin-global-floating-action-button","Frontend","1.2.0","Production","active","./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-global-floating-action-button",";","Enabled"
+"Global Header ","@red-hat-developer-hub/backstage-plugin-global-header","Frontend","1.13.0","Production","active","./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-global-header",";","Enabled"
+"Marketplace ","@red-hat-developer-hub/backstage-plugin-marketplace","Frontend","0.8.5","Red Hat Tech Preview","active","./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-marketplace",";","Enabled"
+"Marketplace ","@red-hat-developer-hub/backstage-plugin-marketplace-backend","Backend","0.7.3","Red Hat Tech Preview","active","./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-marketplace-backend-dynamic",";","Enabled"
+"Adoption Insights ","@red-hat-developer-hub/backstage-plugin-adoption-insights","Frontend","0.2.1","Production","active","./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-adoption-insights",";","Enabled"
+"Adoption Insights ","@red-hat-developer-hub/backstage-plugin-adoption-insights-backend","Backend","0.2.1","Red Hat Tech Preview","active","./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-adoption-insights-backend-dynamic",";","Enabled"
+"Analytics Module Adoption Insights ","@red-hat-developer-hub/backstage-plugin-analytics-module-adoption-insights","Frontend","0.2.0","Red Hat Tech Preview","active","./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-analytics-module-adoption-insights-dynamic",";","Enabled"
+"Argo CD ","@roadiehq/backstage-plugin-argo-cd-backend","Backend","4.3.1","Production","active","./dynamic-plugins/dist/roadiehq-backstage-plugin-argo-cd-backend-dynamic","`ARGOCD_AUTH_TOKEN`;`ARGOCD_AUTH_TOKEN2`;`ARGOCD_INSTANCE1_URL`;`ARGOCD_INSTANCE2_URL`;`ARGOCD_PASSWORD`;`ARGOCD_USERNAME`;","Disabled"
+"Datadog ","@roadiehq/backstage-plugin-datadog","Frontend","2.4.3","Red Hat Tech Preview","active","./dynamic-plugins/dist/roadiehq-backstage-plugin-datadog",";","Disabled"
+"GitHub Insights ","@roadiehq/backstage-plugin-github-insights","Frontend","3.1.4","Red Hat Tech Preview","active","./dynamic-plugins/dist/roadiehq-backstage-plugin-github-insights",";","Disabled"
+"GitHub Pull Requests ","@roadiehq/backstage-plugin-github-pull-requests","Frontend","3.4.2","Red Hat Tech Preview","active","./dynamic-plugins/dist/roadiehq-backstage-plugin-github-pull-requests",";","Disabled"
+"Jira ","@roadiehq/backstage-plugin-jira","Frontend","2.9.0","Red Hat Tech Preview","active","./dynamic-plugins/dist/roadiehq-backstage-plugin-jira",";","Disabled"
+"Security Insights ","@roadiehq/backstage-plugin-security-insights","Frontend","3.1.3","Red Hat Tech Preview","active","./dynamic-plugins/dist/roadiehq-backstage-plugin-security-insights",";","Disabled"
+"Argo CD ","@roadiehq/scaffolder-backend-argocd","Backend","1.6.0","Red Hat Tech Preview","active","./dynamic-plugins/dist/roadiehq-scaffolder-backend-argocd-dynamic","`ARGOCD_AUTH_TOKEN`;`ARGOCD_AUTH_TOKEN2`;`ARGOCD_INSTANCE1_URL`;`ARGOCD_INSTANCE2_URL`;`ARGOCD_PASSWORD`;`ARGOCD_USERNAME`;","Disabled"
+"Http Request ","@roadiehq/scaffolder-backend-module-http-request","Backend","5.3.4","Red Hat Tech Preview","active","./dynamic-plugins/dist/roadiehq-scaffolder-backend-module-http-request-dynamic",";","Disabled"
+"Utils ","@roadiehq/scaffolder-backend-module-utils","Backend","3.5.0","Red Hat Tech Preview","active","./dynamic-plugins/dist/roadiehq-scaffolder-backend-module-utils-dynamic",";","Disabled"
diff --git a/modules/dynamic-plugins/rhdh-supported-plugins.sh b/modules/dynamic-plugins/rhdh-supported-plugins.sh
index 6840b104bc..07b3485066 100755
--- a/modules/dynamic-plugins/rhdh-supported-plugins.sh
+++ b/modules/dynamic-plugins/rhdh-supported-plugins.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # script to generate rhdh-supported-plugins.adoc from content in
-# https://github.com/redhat-developer/rhdh/tree/main/dynamic-plugins/wrappers/*/json
+# https://github.com/redhat-developer/rhdh/tree/main/catalog-entities/marketplace/packages/
 
 SCRIPT_DIR=$(cd "$(dirname "$0")" || exit; pwd)
 
@@ -67,7 +67,7 @@ titlecase() {
         case $f in
             aap) echo -n "Ansible Automation Platform (AAP) ";;
             # UPPERCASE these exceptions
-            acr|cd|ocm|rbac) echo -n "${f^^} ";;
+            acr|cd|ocm|rbac) echo -n "$(echo "$f" | tr '[:lower:]' '[:upper:]') ";;
             # MixedCase exceptions
             argocd) echo -n "Argo CD ";;
             github) echo -n "GitHub ";;
@@ -79,7 +79,11 @@ titlecase() {
             sonarqube) echo -n "SonarQube ";;
             techdocs) echo -n "TechDocs ";;
             # Uppercase the first letter
-            *) echo -n "${f^} " ;;
+            *) 
+                first_char=$(echo "$f" | cut -c1 | tr '[:lower:]' '[:upper:]')
+                rest_chars=$(echo "$f" | cut -c2-)
+                echo -n "${first_char}${rest_chars} "
+                ;;
         esac;
     done; echo;
 }
@@ -97,35 +101,39 @@ cat $pluginVersFile | sort -uV > $pluginVersFile.out; mv -f $pluginVersFile.out
 
 rm -fr /tmp/warnings.txt
 
-# create arrays of adoc and csv content
-declare -A adoc1
-declare -A adoc2
-declare -A adoc3
-declare -A csv
+# create temporary files instead of associative arrays
+TEMP_DIR="/tmp/rhdh-processing"
+mkdir -p "$TEMP_DIR"
+rm -f "$TEMP_DIR"/*.tmp
 
-# process 1 folders of json files
-jsons=$(find /tmp/rhdh/dynamic-plugins/wrappers/ -maxdepth 2 -name package.json | sort -V)
+# process YAML files from catalog-entities/marketplace/packages/
+yamls=$(find /tmp/rhdh/catalog-entities/marketplace/packages/ -maxdepth 1 -name "*.yaml" | sort -V)
 c=0
 tot=0
-for j in $jsons; do
+for y in $yamls; do
+    [[ $(basename "$y") == "all.yaml" ]] && continue
     (( tot++ )) || true
 done
 
 # string listing the enabled-by-default plugins to add to con-preinstalled-dynamic-plugins.template.adoc
 ENABLED_PLUGINS="/tmp/ENABLED_PLUGINS.txt"; rm -f $ENABLED_PLUGINS; touch $ENABLED_PLUGINS
 
-for j in $jsons; do
+for y in $yamls; do
+    [[ $(basename "$y") == "all.yaml" ]] && continue
     (( c++ )) || true
-    echo -e "${green}[$c/$tot] Processing $j${norm}"
+    echo -e "${green}[$c/$tot] Processing $y${norm}"
     Required_Variables=""
     Required_Variables_=""
 
-    # extract content
-    Name=$(jq -r '.name' "$j")
-
-    # backstage-plugin-catalog-backend-module-bitbucket-cloud => @backstage/plugin-catalog-backend-module-bitbucket-cloud
-    Plugin="${Name}"
-    if [[ $Plugin != "@"* ]]; then # don't update janus-idp/backstage-plugins plugin names
+    # extract content from YAML
+    Name=$(yq -r '.metadata.name' "$y")
+    Plugin_Title=$(yq -r '.metadata.title' "$y")
+    
+    # Use .spec.packageName, or if not set use .metadata.name
+    Plugin=$(yq -r '.spec.packageName // .metadata.name' "$y")
+    
+    # If Plugin is still not a proper npm package name, try to construct it
+    if [[ $Plugin != "@"* ]] && [[ $Plugin == "$Name" ]]; then 
         Plugin="$(echo "${Plugin}" | sed -r -e 's/([^-]+)-(.+)/\@\1\/\2/' \
             -e 's|janus/idp-|janus-idp/|' \
             -e 's|red/hat-developer-hub-|red-hat-developer-hub/|' \
@@ -133,41 +141,57 @@ for j in $jsons; do
             -e 's|parfuemerie/douglas-|parfuemerie-douglas/|')"
     fi
 
-    # "dynamic-plugins/wrappers/backstage-plugin-catalog-backend-module-bitbucket-cloud" ==> ./dynamic-plugins/dist/backstage-plugin-catalog-backend-module-bitbucket-cloud-dynamic
-    Path=$(jq -r '.repository.directory' "$j")
-    if [[ $Path == *"/wrappers/"* ]]; then
-        Path="./${Path/wrappers/dist}-dynamic"
-    else
+    # Extract lifecycle and path from YAML spec
+    Lifecycle=$(yq -r '.spec.lifecycle // "unknown"' "$y")
+    
+    # Use the actual dynamicArtifact path from YAML
+    Path=$(yq -r '.spec.dynamicArtifact // ""' "$y")
+    
+    # Fallback to constructed path if not found
+    if [[ ! $Path || $Path == "null" ]]; then
         Path="$(echo "${Plugin/@/}" | tr "/" "-")"
         Path="./dynamic-plugins/dist/${Path}-dynamic"
+        # remove dupe suffixes
+        Path="${Path/-dynamic-dynamic/-dynamic}"
     fi
-    # remove dupe suffixes
-    Path="${Path/-dynamic-dynamic/-dynamic}"
 
-    # echo "Path = $Path"
+    # Filter 1: Only dynamic plugin artifacts under dist root (frontend or backend)
+    # Accept both patterns:
+    #  - Frontend: ./dynamic-plugins/dist/<name>
+    #  - Backend:  ./dynamic-plugins/dist/<name>-dynamic
+    #  this change was made since FE plugins were not being included in the .csv file
+    [[ $Path == ./dynamic-plugins/dist/* ]] || continue
+    
+    # Filter 2: Exclude oci:// paths
+    [[ $Path == "oci://"* ]] && continue
+    
+    # Filter 3: Exclude @redhat packages
+    [[ $Plugin == "@redhat"* ]] && continue
+
     # shellcheck disable=SC2016
     found_in_default_config1=$(yq -r --arg Path "${Path%-dynamic}" '.plugins[] | select(.package == $Path)' /tmp/rhdh/dynamic-plugins.default.yaml)
     # shellcheck disable=SC2016
     found_in_default_config2=$(yq -r --arg Path "${Path}"           '.plugins[] | select(.package == $Path)' /tmp/rhdh/dynamic-plugins.default.yaml)
-    # echo "[DEBUG] default configs:"
-    # echo "   $found_in_default_config2" | jq -r '.package'
-    # echo "   $found_in_default_config1" | jq -r '.package'
-    # echo "   /wrappers/ == $j"
-
+    
     Path2=$(echo "$found_in_default_config2" | jq -r '.package') # with -dynamic suffix
     if [[ $Path2 ]]; then
         Path=$Path2
-        # echo "[DEBUG] check path - $Name :: got $Path2"
     else
         Path=$(echo "$found_in_default_config1" | jq -r '.package') # without -dynamic suffix
-        # echo "[DEBUG] check path - $Name :: got $Path"
     fi
-    if [[ ! $Path ]]; then
+    
+    # For marketplace YAML files, skip the default config check for inclusion
+    if [[ "$y" == *"catalog-entities/marketplace/packages/"* ]]; then
+        # Process marketplace packages regardless of default config
+        if [[ $QUIET -eq 0 ]]; then echo "Processing marketplace package: $Name"; fi
+    elif [[ ! $Path ]]; then
         continue
-    elif [[ $Path ]] || [[ "$j" == *"/wrappers/"* ]]; then
-        # RHIDP-3203 just use the .package value from /tmp/rhdh/dynamic-plugins.default.yaml as the Path
-        Role=$(jq -r '.backstage.role' "$j")
-        VersionJQ=$(jq -r '.version' "$j")
+    fi
+    
+    if [[ $Path ]] || [[ "$y" == *"catalog-entities/marketplace/packages/"* ]]; then
+        # Extract role and version from YAML - updated paths
+        Role=$(yq -r '.spec.backstage.role // "unknown"' "$y")
+        VersionJQ=$(yq -r '.spec.version // "0.0.0"' "$y")
         # check this version against other references to the plugin in
         # * dynamic-plugins/imports/package.json#.peerDependencies or .dependencies
         # * packages/app/package.json#.dependencies
@@ -198,14 +222,16 @@ for j in $jsons; do
             # echo | tee -a /tmp/warnings.txt
         fi
 
-        # default to community unless it's a RH-authored plugin
+        # Extract support level from YAML metadata - updated to use actual YAML structure
         Support_Level="Community Support"
-        keywords=$(jq -r '.keywords' "$j")
-        author=$(jq -r '.author' "$j")
-        if [[ $author == "Red Hat" ]]; then
-            if [[ $keywords == *"support:production"* ]]; then
+        # Check for Red Hat authorship and support level
+        author=$(yq -r '.spec.author // "unknown"' "$y")
+        support=$(yq -r '.spec.support // "unknown"' "$y")
+        
+        if [[ $author == "Red Hat"* ]]; then
+            if [[ $support == "production"* ]]; then
                 Support_Level="Production"
-            elif [[ $keywords == *"support:tech-preview"* ]]; then
+            elif [[ $support == "tech-preview"* ]]; then
                 Support_Level="Red Hat Tech Preview"
             fi
         fi
@@ -235,21 +261,22 @@ for j in $jsons; do
             fi
         fi
 
-        # compute Required_Variables from dynamic-plugins.default.yaml - look for all caps params
-        # shellcheck disable=SC2016
-        Required_Variables="$(yq -r --arg Path "${Path/-dynamic/}" '.plugins[] | select(.package == $Path)' /tmp/rhdh/dynamic-plugins.default.yaml | grep "\${" | sed -r -e 's/.+: "\$\{(.+)\}".*/\1/')"
-        if [[ ! $Required_Variables ]]; then Required_Variables="$(yq -r --arg Path "${Path}" '.plugins[] | select(.package == $Path)' /tmp/rhdh/dynamic-plugins.default.yaml | grep "\${" | sed -r -e 's/.+: "\$\{(.+)\}".*/\1/')"; fi
-        for RV in $Required_Variables; do
-            this_RV="$(echo "${RV}" | tr -d "\$\{\}\"")"
-            Required_Variables_="${Required_Variables_}\`$this_RV\`\n\n"
-        done
-        Required_Variables="${Required_Variables_}"
+        # compute Required_Variables from appConfigExamples in YAML
+        Required_Variables=""
+        appConfig=$(yq -r '.spec.appConfigExamples[0].content // empty' "$y" 2>/dev/null)
+        if [[ -n "$appConfig" && "$appConfig" != "null" ]]; then
+            # Extract ${VARIABLE_NAME} patterns
+            vars=$(echo "$appConfig" | grep -o '\${[^}]*}' | sed 's/\${//g' | sed 's/}//g' | sort -u)
+            for var in $vars; do
+                Required_Variables="${Required_Variables}\`$var\`\n\n"
+            done
+        fi
         Required_Variables_CSV=$(echo -e "$Required_Variables" | tr -s "\n" ";")
         # not currently used due to policy and support concern with upstream content linked from downstream doc
         # URL="https://www.npmjs.com/package/$Plugin"
 
-        # echo -n "Converting $Name"
-        Name="$(echo "${Name}" | sed -r \
+        # get a human-readable name from yaml.name
+        ProcessedName="$(echo "${Name}" | sed -r \
             -e "s@(pagerduty)-.+@\1@g" \
             -e "s@.+(-plugin-scaffolder-backend-module|backstage-scaffolder-backend-module)-(.+)@\2@g" \
             -e "s@.+(-plugin-catalog-module|-plugin-catalog-backend-module)-(.+)@\2@g" \
@@ -260,13 +287,12 @@ for j in $jsons; do
             -e "s@(.+)(-backstage-plugin)@\1@g" \
             -e "s@-backend@@g" \
         )"
-        Name="$(echo "${Name}" | sed -r -e "s/redhat-(.+)/\1-\(Red-Hat\)/")"
-        PrettyName="$(titlecase "${Name//-/ }")"
-        # echo " to $Name and $PrettyName"
+        ProcessedName="$(echo "${ProcessedName}" | sed -r -e "s/redhat-(.+)/\1-\(Red-Hat\)/")"
+        PrettyName="$(titlecase "${ProcessedName//-/ }")"
 
         # useful console output
         if [[ $QUIET -eq 0 ]]; then
-          for col in Name PrettyName Role Plugin Version Support_Level Path Required_Variables Default; do
+          for col in Name PrettyName Role Plugin Version Support_Level Lifecycle Path Required_Variables Default; do
               echo " * $col = ${!col}"
           done
         fi
@@ -277,17 +303,22 @@ for j in $jsons; do
 
         # TODO include missing data fields for Provider and Description - see https://issues.redhat.com/browse/RHIDP-3496 and https://issues.redhat.com/browse/RHIDP-3440
 
+        # Use temporary files to allow sorting later
+        key="$Name-$RoleSort-$Role-$Plugin"
+        adoc_content="|$PrettyName |\`https://npmjs.com/package/$Plugin/v/$Version[$Plugin]\` |$Version \n|\`$Path\`\n\n$Required_Variables"
+        csv_content="\"$PrettyName\",\"$Plugin\",\"$Role\",\"$Version\",\"$Support_Level\",\"$Lifecycle\",\"$Path\",\"${Required_Variables_CSV}\",\"$Default\""
+        
         # split into three tables based on support level
         if [[ ${Support_Level} == "Production" ]]; then
-            adoc1["$Name-$RoleSort-$Role-$Plugin"]="|$PrettyName |\`https://npmjs.com/package/$Plugin/v/$Version[$Plugin]\` |$Version \n|\`$Path\`\n\n$Required_Variables"
+            echo "$key|$adoc_content" >> "$TEMP_DIR/adoc.production.tmp"
         elif [[ ${Support_Level} == "Red Hat Tech Preview" ]]; then
-            adoc2["$Name-$RoleSort-$Role-$Plugin"]="|$PrettyName |\`https://npmjs.com/package/$Plugin/v/$Version[$Plugin]\` |$Version \n|\`$Path\`\n\n$Required_Variables"
+            echo "$key|$adoc_content" >> "$TEMP_DIR/adoc.tech-preview.tmp"
         else
-            adoc3["$Name-$RoleSort-$Role-$Plugin"]="|$PrettyName |\`https://npmjs.com/package/$Plugin/v/$Version[$Plugin]\` |$Version \n|\`$Path\`\n\n$Required_Variables"
+            echo "$key|$adoc_content" >> "$TEMP_DIR/adoc.community.tmp"
         fi
 
-        # NOTE: csv is not split into separate tables at this point
-        csv["$Name-$RoleSort-$Role-$Plugin"]="\"$PrettyName\",\"$Plugin\",\"$Role\",\"$Version\",\"$Support_Level\",\"$Path\",\"${Required_Variables_CSV}\",\"$Default\""
+        # NOTE: csv is not split into separate tables at this point - updated to include lifecycle
+        echo "$key|$csv_content" >> "$TEMP_DIR/csv.tmp"
     else
         (( tot-- )) || true
         echo -e "${blue}        Skip: not in rhdh/dynamic-plugins.default.yaml !${norm}"
@@ -301,52 +332,66 @@ if [[ $QUIET -eq 0 ]]; then
 fi
 
 # create .csv file with header
-echo -e "\"Name\",\"Plugin\",\"Role\",\"Version\",\"Support Level\",\"Path\",\"Required Variables\",\"Default\"" > "${0/.sh/.csv}"
+echo -e "\"Name\",\"Plugin\",\"Role\",\"Version\",\"Support Level\",\"Lifecycle\",\"Path\",\"Required Variables\",\"Default\"" > "${0/.sh/.csv}"
 
 num_plugins=()
-# append to .csv and .adocN files
-rm -f "${0/.sh/.adoc1}"
-sorted=(); while IFS= read -rd '' key; do sorted+=( "$key" ); done < <(printf '%s\0' "${!adoc1[@]}" | sort -z)
-if [[ $sorted ]] ;then
-  for key in "${sorted[@]}"; do
-      (( c = c + 1 ))
-      if [[ $QUIET -eq 0 ]]; then echo " * [$c] $key [ supported-plugins ] = ${csv[$key]}"; fi
-      echo -e "${adoc1[$key]}" >> "${0/.sh/.ref-rh-supported-plugins}"
-      # RHIDP-4196 omit techdocs plugins from the .csv
-      if [[ $key != *"techdocs"* ]]; then
-        echo -e "${csv[$key]}" >>  "${0/.sh/.csv}"
-      else
-        if [[ $QUIET -eq 0 ]]; then echo -e "${blue}   [WARN] Omit plugin $key from .csv file${norm}"; fi
-      fi
-  done
+# Process temporary files
+# 1) Production
+temp_file="$TEMP_DIR/adoc.production.tmp"
+out_file="${0/.sh/.ref-rh-supported-plugins}"
+rm -f "$out_file"
+count=0
+if [[ -f "$temp_file" ]]; then
+    sort "$temp_file" | while IFS='|' read -r key content; do
+        (( count = count + 1 ))
+        if [[ $QUIET -eq 0 ]]; then echo " * [$count] $key [ ${out_file##*/} ]"; fi
+        echo -e "$content" >> "$out_file"
+    done
+    count=$(wc -l < "$temp_file")
+fi
+num_plugins+=($count)
+
+# 2) Tech Preview
+temp_file="$TEMP_DIR/adoc.tech-preview.tmp"
+out_file="${0/.sh/.ref-rh-tech-preview-plugins}"
+rm -f "$out_file"
+count=0
+if [[ -f "$temp_file" ]]; then
+    sort "$temp_file" | while IFS='|' read -r key content; do
+        (( count = count + 1 ))
+        if [[ $QUIET -eq 0 ]]; then echo " * [$count] $key [ ${out_file##*/} ]"; fi
+        echo -e "$content" >> "$out_file"
+    done
+    count=$(wc -l < "$temp_file")
 fi
-num_plugins+=(${#adoc1[@]})
-
-rm -f "${0/.sh/.adoc2}"
-sorted=(); while IFS= read -rd '' key; do sorted+=( "$key" ); done < <(printf '%s\0' "${!adoc2[@]}" | sort -z)
-# shellcheck disable=SC2128
-if [[ $sorted ]] ;then
-    for key in "${sorted[@]}"; do
-      (( c = c + 1 ))
-      if [[ $QUIET -eq 0 ]]; then echo " * [$c] $key [ tech-preview-plugins ] = ${csv[$key]}"; fi
-      echo -e "${adoc2[$key]}" >> "${0/.sh/.ref-rh-tech-preview-plugins}";
-      echo -e "${csv[$key]}" >>  "${0/.sh/.csv}"
+num_plugins+=($count)
+
+# 3) Community
+temp_file="$TEMP_DIR/adoc.community.tmp"
+out_file="${0/.sh/.ref-community-plugins}"
+rm -f "$out_file"
+count=0
+if [[ -f "$temp_file" ]]; then
+    sort "$temp_file" | while IFS='|' read -r key content; do
+        (( count = count + 1 ))
+        if [[ $QUIET -eq 0 ]]; then echo " * [$count] $key [ ${out_file##*/} ]"; fi
+        echo -e "$content" >> "$out_file"
     done
+    count=$(wc -l < "$temp_file")
 fi
-num_plugins+=(${#adoc2[@]})
-
-rm -f "${0/.sh/.adoc3}"
-sorted=(); while IFS= read -rd '' key; do sorted+=( "$key" ); done < <(printf '%s\0' "${!adoc3[@]}" | sort -z)
-# shellcheck disable=SC2128
-if [[ $sorted ]] ;then
-    for key in "${sorted[@]}"; do
-      (( c = c + 1 ))
-      if [[ $QUIET -eq 0 ]]; then echo " * [$c] $key [ community-plugins ] = ${csv[$key]}"; fi
-      echo -e "${adoc3[$key]}" >> "${0/.sh/.ref-community-plugins}";
-      echo -e "${csv[$key]}" >>  "${0/.sh/.csv}"
+num_plugins+=($count)
+
+# Process CSV
+if [[ -f "$TEMP_DIR/csv.tmp" ]]; then
+    sort "$TEMP_DIR/csv.tmp" | while IFS='|' read -r key content; do
+        # RHIDP-4196 omit techdocs plugins from the .csv
+        if [[ $key != *"techdocs"* ]]; then
+            echo -e "$content" >> "${0/.sh/.csv}"
+        else
+            if [[ $QUIET -eq 0 ]]; then echo -e "${blue}   [WARN] Omit plugin $key from .csv file${norm}"; fi
+        fi
     done
 fi
-num_plugins+=(${#adoc3[@]})
 
 if [[ $QUIET -eq 0 ]]; then echo; fi
 
@@ -389,9 +434,10 @@ if [[ -f "${ENABLED_PLUGINS}.errors" ]]; then echo;cat "${ENABLED_PLUGINS}.error
 
 # cleanup
 rm -f "$ENABLED_PLUGINS" "${ENABLED_PLUGINS}.errors"
+rm -rf "$TEMP_DIR"
 # rm -fr /tmp/rhdh
 
-warnings=$(grep -c "WARN" "/tmp/warnings.txt")
+warnings=$(grep -c "WARN" "/tmp/warnings.txt" 2>/dev/null || echo "0")
 if [[ $warnings -gt 0 ]]; then
     echo; echo -e "${blue}[WARN] $warnings warnings collected in /tmp/warnings.txt ! Consider upgrading upstream project to newer plugin versions !${norm}"
 fi