From 27edbcf622f10784938f6dd97407d7749627b4e5 Mon Sep 17 00:00:00 2001
From: Drew Minnear <dminnear@redhat.com>
Date: Fri, 7 Nov 2025 11:19:59 -0500
Subject: [PATCH] use patternizer to remove common

---
 Makefile                                      |  28 +-
 Makefile-common                               |  54 ++++
 common/.ansible-lint                          |  21 --
 common/.github/dependabot.yml                 |   9 -
 common/.github/linters/.gitleaks.toml         |   4 -
 common/.github/linters/.markdown-lint.yml     |   6 -
 common/.github/workflows/pattern-sh-ci.yml    |  53 ----
 common/.github/workflows/superlinter.yml      |  42 ---
 common/.gitignore                             |  13 -
 common/.gitleaks.toml                         |   1 -
 common/Changes.md                             | 158 ----------
 common/LICENSE                                | 202 -------------
 common/Makefile                               | 275 ------------------
 common/README.md                              |  51 ----
 common/requirements.yml                       |   4 -
 common/scripts/argocd-login.sh                |  34 ---
 common/scripts/deploy-pattern.sh              |  27 --
 common/scripts/determine-main-clustergroup.sh |  16 -
 common/scripts/determine-pattern-name.sh      |  15 -
 .../scripts/determine-secretstore-backend.sh  |  15 -
 common/scripts/display-secrets-info.sh        |  28 --
 common/scripts/load-k8s-secrets.sh            |  18 --
 common/scripts/make-common-subtree.sh         |  76 -----
 common/scripts/manage-secret-app.sh           |  53 ----
 common/scripts/manage-secret-namespace.sh     |  28 --
 common/scripts/pattern-util.sh                | 114 --------
 common/scripts/preview-all.sh                 |  25 --
 common/scripts/preview.sh                     | 118 --------
 common/scripts/process-secrets.sh             |  19 --
 common/scripts/set-secret-backend.sh          |   5 -
 common/scripts/validate-names-length.sh       |  65 -----
 common/scripts/vault-utils.sh                 |  30 --
 common/scripts/write-token-kubeconfig.sh      |  18 --
 pattern.sh                                    | 118 +++++++-
 34 files changed, 175 insertions(+), 1568 deletions(-)
 create mode 100644 Makefile-common
 delete mode 100644 common/.ansible-lint
 delete mode 100644 common/.github/dependabot.yml
 delete mode 100644 common/.github/linters/.gitleaks.toml
 delete mode 100644 common/.github/linters/.markdown-lint.yml
 delete mode 100644 common/.github/workflows/pattern-sh-ci.yml
 delete mode 100644 common/.github/workflows/superlinter.yml
 delete mode 100644 common/.gitignore
 delete mode 120000 common/.gitleaks.toml
 delete mode 100644 common/Changes.md
 delete mode 100644 common/LICENSE
 delete mode 100644 common/Makefile
 delete mode 100644 common/README.md
 delete mode 100644 common/requirements.yml
 delete mode 100755 common/scripts/argocd-login.sh
 delete mode 100755 common/scripts/deploy-pattern.sh
 delete mode 100755 common/scripts/determine-main-clustergroup.sh
 delete mode 100755 common/scripts/determine-pattern-name.sh
 delete mode 100755 common/scripts/determine-secretstore-backend.sh
 delete mode 100755 common/scripts/display-secrets-info.sh
 delete mode 100755 common/scripts/load-k8s-secrets.sh
 delete mode 100755 common/scripts/make-common-subtree.sh
 delete mode 100755 common/scripts/manage-secret-app.sh
 delete mode 100755 common/scripts/manage-secret-namespace.sh
 delete mode 100755 common/scripts/pattern-util.sh
 delete mode 100755 common/scripts/preview-all.sh
 delete mode 100755 common/scripts/preview.sh
 delete mode 100755 common/scripts/process-secrets.sh
 delete mode 100755 common/scripts/set-secret-backend.sh
 delete mode 100755 common/scripts/validate-names-length.sh
 delete mode 100755 common/scripts/vault-utils.sh
 delete mode 100755 common/scripts/write-token-kubeconfig.sh
 mode change 120000 => 100755 pattern.sh

diff --git a/Makefile b/Makefile
index 39d07b755..b6b36c353 100644
--- a/Makefile
+++ b/Makefile
@@ -1,25 +1,5 @@
-.PHONY: default
-default: help
+# Generated by patternizer
+# This Makefile includes the common pattern targets from Makefile-common
+# You can add custom targets above or below the include line
 
-.PHONY: help
-##@ Pattern tasks
-
-# No need to add a comment here as help is described in common/
-help:
-	@make -f common/Makefile MAKEFILE_LIST="Makefile common/Makefile" help
-
-%:
-	make -f common/Makefile $*
-
-.PHONY: install
-install: operator-deploy post-install ## installs the pattern and loads the secrets
-	@echo "Installed"
-
-.PHONY: post-install
-post-install: ## Post-install tasks
-	make load-secrets
-	@echo "Done"
-
-.PHONY: test
-test:
-	@make -f common/Makefile PATTERN_OPTS="-f values-global.yaml -f values-hub.yaml" test
+include Makefile-common
diff --git a/Makefile-common b/Makefile-common
new file mode 100644
index 000000000..537ca8836
--- /dev/null
+++ b/Makefile-common
@@ -0,0 +1,54 @@
+MAKEFLAGS += --no-print-directory
+ANSIBLE_STDOUT_CALLBACK ?= null # null silences all ansible output. Override this with default, minimal, oneline, etc. when debugging.
+ANSIBLE_RUN := ANSIBLE_STDOUT_CALLBACK=$(ANSIBLE_STDOUT_CALLBACK) ansible-playbook $(EXTRA_PLAYBOOK_OPTS)
+DOCS_URL := https://validatedpatterns.io/blog/2025-08-29-new-common-makefile-structure/
+
+.PHONY: help
+help: ## Print this help message
+	@echo "For a complete guide to these targets and the available overrides, please visit $(DOCS_URL)"
+	@awk 'BEGIN {FS = ":.*##"; printf "\nUsage:\n  make \033[36m<target>\033[0m\n"} /^(\s|[a-zA-Z_0-9-])+:.*?##/ { printf "  \033[36m%-35s\033[0m %s\n", $$1, $$2 } /^##@/ { printf "\n\033[1m%s\033[0m\n", substr($$0, 5) } ' $(MAKEFILE_LIST)
+
+##@ Pattern Install Tasks
+.PHONY: show
+show: ## Shows the template that would be applied by the `make install` target
+	@$(ANSIBLE_RUN) rhvp.cluster_utils.show
+
+.PHONY: operator-deploy
+operator-deploy operator-upgrade: ## Installs/updates the pattern on a cluster (DOES NOT load secrets)
+	@$(ANSIBLE_RUN) rhvp.cluster_utils.operator_deploy
+
+.PHONY: install
+install: pattern-install ## Installs the pattern onto a cluster (Loads secrets as well if configured)
+
+.PHONY: uninstall ## Prints a notice that patterns cannot currently be uninstalled
+uninstall:
+	@echo "Uninstall is not possible at the moment so this target is empty. We are working to implement it as well as we can."
+
+.PHONY: pattern-install
+pattern-install:
+	@$(ANSIBLE_RUN) rhvp.cluster_utils.install
+
+.PHONY: load-secrets
+load-secrets: ## Loads secrets onto the cluster (unless explicitly disabled in values-global.yaml)
+	@$(ANSIBLE_RUN) rhvp.cluster_utils.load_secrets
+
+##@ Validation Tasks
+.PHONY: validate-prereq
+validate-prereq: ## verify pre-requisites
+	@$(ANSIBLE_RUN) rhvp.cluster_utils.validate_prereq
+
+.PHONY: validate-origin
+validate-origin: ## verify the git origin is available
+	@$(ANSIBLE_RUN) rhvp.cluster_utils.validate_origin
+
+.PHONY: validate-cluster
+validate-cluster: ## Do some cluster validations before installing
+	@$(ANSIBLE_RUN) rhvp.cluster_utils.validate_cluster
+
+.PHONY: validate-schema
+validate-schema: ## validates values files against schema in common/clustergroup
+	@$(ANSIBLE_RUN) rhvp.cluster_utils.validate_schema
+
+.PHONY: argo-healthcheck
+argo-healthcheck: ## Checks if all argo applications are synced
+	@$(ANSIBLE_RUN) rhvp.cluster_utils.argo_healthcheck
diff --git a/common/.ansible-lint b/common/.ansible-lint
deleted file mode 100644
index 0522976e8..000000000
--- a/common/.ansible-lint
+++ /dev/null
@@ -1,21 +0,0 @@
-# Vim filetype=yaml
----
-offline: false
-skip_list:
-  - name[template] # Allow Jinja templating inside task and play names
-  - template-instead-of-copy # Templated files should use template instead of copy
-  - yaml[line-length] # too long lines
-  - yaml[indentation] # Forcing lists to be always indented by 2 chars is silly IMO
-  - var-naming[no-role-prefix] # This would be too much churn for very little gain
-  - no-changed-when
-  - var-naming[no-role-prefix] # There are too many changes now and it would be too risky
-
-# ansible-lint gh workflow cannot find ansible.cfg hence fails to import vault_utils role
-exclude_paths:
-  - ./ansible/playbooks/vault/vault.yaml
-  - ./ansible/playbooks/iib-ci/iib-ci.yaml
-  - ./ansible/playbooks/k8s_secrets/k8s_secrets.yml
-  - ./ansible/playbooks/process_secrets/process_secrets.yml
-  - ./ansible/playbooks/write-token-kubeconfig/write-token-kubeconfig.yml
-  - ./ansible/playbooks/process_secrets/display_secrets_info.yml
-  - ./ansible/roles/vault_utils/tests/test.yml
diff --git a/common/.github/dependabot.yml b/common/.github/dependabot.yml
deleted file mode 100644
index a175e6664..000000000
--- a/common/.github/dependabot.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-version: 2
-updates:
-  # Check for updates to GitHub Actions every week
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "weekly"
-
diff --git a/common/.github/linters/.gitleaks.toml b/common/.github/linters/.gitleaks.toml
deleted file mode 100644
index 9ad743472..000000000
--- a/common/.github/linters/.gitleaks.toml
+++ /dev/null
@@ -1,4 +0,0 @@
-[whitelist]
-# As of v4, gitleaks only matches against filename, not path in the
-# files directive.  Leaving content for backwards compatibility.
-files = [ ]
diff --git a/common/.github/linters/.markdown-lint.yml b/common/.github/linters/.markdown-lint.yml
deleted file mode 100644
index a0bc47d1c..000000000
--- a/common/.github/linters/.markdown-lint.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "default": true,
-    "MD003": false,
-    "MD013": false,
-    "MD033": false
-}
\ No newline at end of file
diff --git a/common/.github/workflows/pattern-sh-ci.yml b/common/.github/workflows/pattern-sh-ci.yml
deleted file mode 100644
index 39f2ca862..000000000
--- a/common/.github/workflows/pattern-sh-ci.yml
+++ /dev/null
@@ -1,53 +0,0 @@
-name: Run Bash Script on Multiple Distributions
-
-on:
-  push:
-    paths:
-      - "scripts/**"
-      - "Makefile"
-    branches:
-      - main
-  pull_request:
-    paths:
-      - "scripts/**"
-      - "Makefile"
-
-jobs:
-  run-script:
-    name: Run Bash Script
-    strategy:
-      matrix:
-        # Fedora is not an option yet
-        os: [ubuntu-latest, ubuntu-22.04, ubuntu-24.04-arm]
-    runs-on: ${{ matrix.os }}
-    permissions:
-      contents: read
-
-    steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v5
-        with:
-          persist-credentials: false
-
-      # Currently we do not do MacOSX as it is not free, maybe in the future
-      # - name: Install Podman on macOS
-      #   if: contains(matrix.os, 'macos')
-      #   run: |
-      #     brew install podman
-      #     podman machine init
-      #     podman machine start
-
-      - name: Verify Podman Installation
-        run: podman --version
-
-      - name: Clone MCG and update common
-        run: |
-          git clone --depth 1 https://github.com/validatedpatterns/multicloud-gitops mcg
-          cp -r scripts/ mcg/common/scripts
-          cp Makefile mcg/common
-
-      - name: Run pattern.sh script
-        run: |
-          cd mcg
-          ./pattern.sh make validate-origin
-          ./pattern.sh make show
diff --git a/common/.github/workflows/superlinter.yml b/common/.github/workflows/superlinter.yml
deleted file mode 100644
index 86df18479..000000000
--- a/common/.github/workflows/superlinter.yml
+++ /dev/null
@@ -1,42 +0,0 @@
----
-name: Super linter
-
-on: [push, pull_request]
-
-jobs:
-  build:
-    # Name the Job
-    name: Super linter
-    # Set the agent to run on
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-
-    steps:
-      - name: Checkout Code
-        uses: actions/checkout@v5
-        with:
-          # Full git history is needed to get a proper list of changed files within `super-linter`
-          fetch-depth: 0
-          persist-credentials: false
-
-      ################################
-      # Run Linter against code base #
-      ################################
-      - name: Lint Code Base
-        uses: super-linter/super-linter/slim@ffde3b2b33b745cb612d787f669ef9442b1339a6 # v8.1.0
-        env:
-          VALIDATE_ALL_CODEBASE: true
-          DEFAULT_BRANCH: main
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          # These are the validation we disable atm
-          VALIDATE_ANSIBLE: false
-          VALIDATE_BASH: false
-          VALIDATE_CHECKOV: false
-          VALIDATE_JSCPD: false
-          VALIDATE_JSON_PRETTIER: false
-          VALIDATE_MARKDOWN_PRETTIER: false
-          VALIDATE_PYTHON_PYLINT: false
-          VALIDATE_SHELL_SHFMT: false
-          VALIDATE_YAML: false
-          VALIDATE_YAML_PRETTIER: false
diff --git a/common/.gitignore b/common/.gitignore
deleted file mode 100644
index 454efc9e2..000000000
--- a/common/.gitignore
+++ /dev/null
@@ -1,13 +0,0 @@
-__pycache__/
-*.py[cod]
-*~
-*.swp
-*.swo
-values-secret.yaml
-.*.expected.yaml
-.vscode
-pattern-vault.init
-pattern-vault.init.bak
-super-linter.log
-golang-external-secrets/Chart.lock
-hashicorp-vault/Chart.lock
diff --git a/common/.gitleaks.toml b/common/.gitleaks.toml
deleted file mode 120000
index c05303b9e..000000000
--- a/common/.gitleaks.toml
+++ /dev/null
@@ -1 +0,0 @@
-.github/linters/.gitleaks.toml
\ No newline at end of file
diff --git a/common/Changes.md b/common/Changes.md
deleted file mode 100644
index ae85cbc4b..000000000
--- a/common/Changes.md
+++ /dev/null
@@ -1,158 +0,0 @@
-# Changes
-
-## Sep 24, 2024
-
-- Ansible has been moved out of the common code tree, you must use a clustergroup chart that is >= 0.9.1
-
-## Sep 6, 2024
-
-- Most charts have been removed from the tree. To get the charts you now have to point to them
-
-## Sep 25, 2023
-
-- Upgraded ESO to v0.9.5
-
-## Aug 17, 2023
-
-- Introduced support for multisource applications via .chart + .chartVersion
-
-## Jul 8, 2023
-
-- Introduced a default of 20 for sync failures retries in argo applications (global override via global.options.applicationRetryLimit
-  and per-app override via .syncPolicy)
-
-## May 22, 2023
-
-- Upgraded ESO to 0.8.2
-- *Important* we now use the newly blessed sso config for argo. This means that gitops < 1.8 are *unsupported*
-
-## May 18, 2023
-
-- Introduce a EXTRA_HELM_OPTS env variable that will be passed to the helm invocations
-
-## April 21, 2023
-
-- Added labels and annotation support to namespaces.yaml template
-
-## Apr 11, 2023
-
-- Apply the ACM ocp-gitops-policy everywhere but the hub
-
-## Apr 7, 2023
-
-- Moved to gitops-1.8 channel by default (stable is unmaintained and will be dropped starting with ocp-4.13)
-
-## March 20, 2023
-
-- Upgraded ESO to 0.8.1
-
-## February 9, 2023
-
-- Add support for /values-<platform>.yaml and for /values-<platform>-<clusterversion>.yaml
-
-## January 29, 2023
-
-- Stop extracting the HUB's CA via an imperative job running on the imported cluster.
-  Just use ACM to push the HUB's CA out to the managed clusters.
-
-## January 23, 2023
-
-- Add initial support for running ESO on ACM-imported clusters
-
-## January 18, 2023
-
-- Add validate-schema target
-
-## January 13, 2023
-
-- Simplify the secrets paths when using argo hosted sites
-
-## January 10, 2023
-
-- vaultPrefixes is now optional in the v2 secret spec and defaults to ["hub"]
-
-## December 9, 2022
-
-- Dropped insecureUnsealVaultInsideCluster (and file_unseal) entirely. Now
-  vault is always unsealed via a cronjob in the cluster. It is recommended to
-  store the imperative/vaultkeys secret offline securely and then delete it.
-
-## December 8, 2022
-
-- Removed the legacy installation targets:
-  `deploy upgrade legacy-deploy legacy-upgrade`
-  Patterns must now use the operator-based installation
-
-## November 29, 2022
-
-- Upgraded vault-helm to 0.23.0
-- Enable vault-ssl by default
-
-## November 22, 2022
-
-- Implemented a new format for the values-secret.yaml. Example can be found in examples/ folder
-- Now the order of values-secret file lookup is the following:
-  1. ~/values-secret-<patternname>.yaml
-  1. ~/values-secret.yaml
-  1. <patterngitrepo>/values-secret.yaml.template
-- Add support for Ansible vault encrypted values-secret files. You can now encrypt your values-secret file
-  at rest with `ansible-vault encrypt ~/values-secret.yaml`. When running `make load-secrets` if an encrypted
-  file is encountered the user will be prompted automatically for the password to decrypt it.
-
-## November 6, 2022
-
-- Add support for /values-<CloudPlatform>-<clusterGroup>.yaml (e.g. /values-AWS-group-one.yaml)
-
-## October 28, 2022
-
-- Updated vault helm chart to v0.22.1 and vault containers to 1.12.0
-
-## October 25, 2022
-
-- Updated External Secrets Operator to v0.6.0
-- Moved to -UBI based ESO containers
-
-## October 13, 2022
-
-- Added global.clusterVersion as a new helm variable which represents the OCP
-  Major.Minor cluster version. By default now a user can add a
-  values-<ocpversion>-<clustergroup>.yaml file to have specific cluster version
-  overrides (e.g. values-4.10-hub.yaml). Will need Validated Patterns Operator >= 0.0.6
-  when deploying with the operator. Note: When using the ArgoCD Hub and spoke model,
-  you cannot have spokes with a different version of OCP than the hub.
-
-## October 4, 2022
-
-- Extended the values-secret.yaml file to support multiple vault paths and re-wrote
-  the push_secrets feature as python module plugin. This requires the following line
-  in a pattern's ansible.cfg's '[defaults]' stanza:
-
-  `library=~/.ansible/plugins/modules:./ansible/plugins/modules:./common/ansible/plugins/modules:/usr/share/ansible/plugins/modules`
-
-## October 3, 2022
-
-- Restore the ability to install a non-default site: `make TARGET_SITE=mysite install`
-
-- Revised tests (new output and filenames, requires adding new result files to Git)
-
-- ACM 2.6 required for ACM-based managed sites
-
-- Introduced global.clusterDomain template variable (without the `apps.` prefix)
-
-- Removed the ability to send specific charts to another cluster, use hosted argo sites instead
-
-- Added the ability to have the hub host `values-{site}.yaml` for spoke clusters.
-
-  The following example would deploy the namespaces, subscriptions, and
-  applications defined in `values-group-one.yaml` to the `perth` cluster
-  directly from ArgoCD on the hub.
-
-  ```yaml
-  managedClusterGroups:
-  - name: group-one
-    hostedArgoSites:
-    - name: perth
-      domain: perth1.beekhof.net
-      bearerKeyPath: secret/data/hub/cluster_perth
-      caKeyPath: secret/data/hub/cluster_perth_ca
-  ```
diff --git a/common/LICENSE b/common/LICENSE
deleted file mode 100644
index d64569567..000000000
--- a/common/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/common/Makefile b/common/Makefile
deleted file mode 100644
index 4c48a42b7..000000000
--- a/common/Makefile
+++ /dev/null
@@ -1,275 +0,0 @@
-PATTERN_NAME ?= $(shell yq .global.pattern values-global.yaml)
-
-ifeq ($(PATTERN_NAME),)
-$(error Pattern name MUST be set in values-global.yaml with the value .global.pattern)
-endif
-ifeq ($(PATTERN_NAME),null)
-$(error Pattern name MUST be set in values-global.yaml with the value .global.pattern)
-endif
-
-ifneq ($(origin TARGET_SITE), undefined)
-  TARGET_SITE_OPT=--set main.clusterGroupName=$(TARGET_SITE)
-endif
-
-# This variable can be set in order to pass additional helm arguments from the
-# the command line. I.e. we can set things without having to tweak values files
-EXTRA_HELM_OPTS ?=
-
-# This variable can be set in order to pass additional ansible-playbook arguments from the
-# the command line. I.e. we can set -vvv for more verbose logging
-EXTRA_PLAYBOOK_OPTS ?=
-
-# INDEX_IMAGES=registry-proxy.engineering.redhat.com/rh-osbs/iib:394248
-# or
-# INDEX_IMAGES=registry-proxy.engineering.redhat.com/rh-osbs/iib:394248,registry-proxy.engineering.redhat.com/rh-osbs/iib:394249
-INDEX_IMAGES ?=
-
-# git branch --show-current is also available as of git 2.22, but we will use this for compatibility
-TARGET_BRANCH ?= $(shell git rev-parse --abbrev-ref HEAD)
-
-#default to the branch remote
-TARGET_ORIGIN ?= $(shell git config branch.$(TARGET_BRANCH).remote)
-
-# The URL for the configured origin (could be HTTP/HTTPS/SSH)
-TARGET_REPO_RAW := $(shell git ls-remote --get-url --symref $(TARGET_ORIGIN))
-
-UUID_FILE ?= ~/.config/validated-patterns/pattern-uuid
-UUID_HELM_OPTS ?=
-
-# --set values always take precedence over the contents of -f
-ifneq ("$(wildcard $(UUID_FILE))","")
-	UUID := $(shell cat $(UUID_FILE))
-	UUID_HELM_OPTS := --set main.analyticsUUID=$(UUID)
-endif
-
-# Set the secret name *and* its namespace when deploying from private repositories
-# The format of said secret is documented here: https://argo-cd.readthedocs.io/en/stable/operator-manual/declarative-setup/#repositories
-TOKEN_SECRET ?=
-TOKEN_NAMESPACE ?= openshift-operators
-
-# Set this to true if you want to skip any origin validation
-# if TOKEN_SECRET is set to something then we skip the validation as well
-DISABLE_VALIDATE_ORIGIN ?= false
-ifeq ($(DISABLE_VALIDATE_ORIGIN),true)
-  VALIDATE_ORIGIN :=
-else ifneq ($(TOKEN_SECRET),)
-  VALIDATE_ORIGIN :=
-else
-  VALIDATE_ORIGIN := validate-origin
-endif
-
-
-ifeq ($(TOKEN_SECRET),)
-  # SSH agents are not created for public repos (repos with no secret token) by the patterns operator so we convert to HTTPS
-  TARGET_REPO := $(shell echo "$(TARGET_REPO_RAW)" | sed 's/^git@\(.*\):\(.*\)/https:\/\/\1\/\2/')
-  SECRET_OPTS :=
-else
-  TARGET_REPO := $(TARGET_REPO_RAW)
-  SECRET_OPTS := --set main.tokenSecret=$(TOKEN_SECRET) --set main.tokenSecretNamespace=$(TOKEN_NAMESPACE)
-endif
-
-HELM_OPTS := -f values-global.yaml \
-             --set main.git.repoURL="$(TARGET_REPO)" \
-             --set main.git.revision=$(TARGET_BRANCH) \
-             $(SECRET_OPTS) \
-             $(TARGET_SITE_OPT) \
-             $(UUID_HELM_OPTS) \
-             $(EXTRA_HELM_OPTS)
-
-# Helm does the right thing and fetches all the tags and detects the newest one
-PATTERN_INSTALL_CHART ?= oci://quay.io/validatedpatterns/pattern-install
-
-##@ Pattern Common Tasks
-
-.PHONY: help
-help: ## This help message
-	@echo "Pattern: $(PATTERN_NAME)"
-	@awk 'BEGIN {FS = ":.*##"; printf "\nUsage:\n  make \033[36m<target>\033[0m\n"} /^(\s|[a-zA-Z_0-9-])+:.*?##/ { printf "  \033[36m%-35s\033[0m %s\n", $$1, $$2 } /^##@/ { printf "\n\033[1m%s\033[0m\n", substr($$0, 5) } ' $(MAKEFILE_LIST)
-
-#  Makefiles in the individual patterns should call these targets explicitly
-#  e.g. from industrial-edge: make -f common/Makefile show
-.PHONY: show
-show: ## show the starting template without installing it
-	helm template $(PATTERN_INSTALL_CHART) --name-template $(PATTERN_NAME) $(HELM_OPTS)
-
-preview-all: ## (EXPERIMENTAL) Previews all applications on hub and managed clusters
-	@echo "NOTE: This is just a tentative approximation of rendering all hub and managed clusters templates"
-	@common/scripts/preview-all.sh $(TARGET_REPO) $(TARGET_BRANCH)
-
-preview-%:
-	$(eval CLUSTERGROUP ?= $(shell yq ".main.clusterGroupName" values-global.yaml))
-	@common/scripts/preview.sh $(CLUSTERGROUP) $* $(TARGET_REPO) $(TARGET_BRANCH)
-
-.PHONY: operator-deploy
-operator-deploy operator-upgrade: validate-prereq $(VALIDATE_ORIGIN) validate-cluster ## runs helm install
-	@common/scripts/deploy-pattern.sh $(PATTERN_NAME) $(PATTERN_INSTALL_CHART) $(HELM_OPTS)
-
-.PHONY: uninstall
-uninstall: ## runs helm uninstall
-	$(eval CSV := $(shell oc get subscriptions -n openshift-operators openshift-gitops-operator -ojsonpath={.status.currentCSV}))
-	helm uninstall $(PATTERN_NAME)
-	@oc delete csv -n openshift-operators $(CSV)
-
-.PHONY: load-secrets
-load-secrets: ## loads the secrets into the backend determined by values-global setting
-	common/scripts/process-secrets.sh $(PATTERN_NAME)
-
-.PHONY: legacy-load-secrets
-legacy-load-secrets: ## loads the secrets into vault (only)
-	common/scripts/vault-utils.sh push_secrets $(PATTERN_NAME)
-
-.PHONY: secrets-backend-vault
-secrets-backend-vault: ## Edits values files to use default Vault+ESO secrets config
-	common/scripts/set-secret-backend.sh vault
-	common/scripts/manage-secret-app.sh vault present
-	common/scripts/manage-secret-app.sh golang-external-secrets present
-	common/scripts/manage-secret-namespace.sh validated-patterns-secrets absent
-	@git diff --exit-code || echo "Secrets backend set to vault, please review changes, commit, and push to activate in the pattern"
-
-.PHONY: secrets-backend-kubernetes
-secrets-backend-kubernetes: ## Edits values file to use Kubernetes+ESO secrets config
-	common/scripts/set-secret-backend.sh kubernetes
-	common/scripts/manage-secret-namespace.sh validated-patterns-secrets present
-	common/scripts/manage-secret-app.sh vault absent
-	common/scripts/manage-secret-app.sh golang-external-secrets present
-	@git diff --exit-code || echo "Secrets backend set to kubernetes, please review changes, commit, and push to activate in the pattern"
-
-.PHONY: secrets-backend-none
-secrets-backend-none: ## Edits values files to remove secrets manager + ESO
-	common/scripts/set-secret-backend.sh none
-	common/scripts/manage-secret-app.sh vault absent
-	common/scripts/manage-secret-app.sh golang-external-secrets absent
-	common/scripts/manage-secret-namespace.sh validated-patterns-secrets absent
-	@git diff --exit-code || echo "Secrets backend set to none, please review changes, commit, and push to activate in the pattern"
-
-.PHONY: load-iib
-load-iib: ## CI target to install Index Image Bundles
-	@set -e; if [ x$(INDEX_IMAGES) != x ]; then \
-		ansible-playbook $(EXTRA_PLAYBOOK_OPTS) rhvp.cluster_utils.iib_ci; \
-	else \
-		echo "No INDEX_IMAGES defined. Bailing out"; \
-		exit 1; \
-	fi
-
-.PHONY: token-kubeconfig
-token-kubeconfig: ## Create a local ~/.kube/config with password (not usually needed)
-	common/scripts/write-token-kubeconfig.sh
-
-##@ Validation Tasks
-
-# If the main repoUpstreamURL field is set, then we need to check against
-# that and not target_repo
-.PHONY: validate-origin
-validate-origin: ## verify the git origin is available
-	@echo "Checking repository:"
-	$(eval UPSTREAMURL := $(shell yq -r '.main.git.repoUpstreamURL // (.main.git.repoUpstreamURL = "")' values-global.yaml))
-	@if [ -z "$(UPSTREAMURL)" ]; then\
-		echo -n "  $(TARGET_REPO) - branch '$(TARGET_BRANCH)': ";\
-		git ls-remote --exit-code --heads $(TARGET_REPO) $(TARGET_BRANCH) >/dev/null &&\
-			echo "OK" || (echo "NOT FOUND"; exit 1);\
-	else\
-		echo "Upstream URL set to: $(UPSTREAMURL)";\
-		echo -n "  $(UPSTREAMURL) - branch '$(TARGET_BRANCH)': ";\
-		git ls-remote --exit-code --heads $(UPSTREAMURL) $(TARGET_BRANCH) >/dev/null &&\
-			echo "OK" || (echo "NOT FOUND"; exit 1);\
-	fi
-
-.PHONY: validate-cluster
-validate-cluster: ## Do some cluster validations before installing
-	@echo "Checking cluster:"
-	@echo -n "  cluster-info: "
-	@oc cluster-info >/dev/null && echo "OK" || (echo "Error"; exit 1)
-	@echo -n "  storageclass: "
-	@if [ `oc get storageclass -o go-template='{{printf "%d\n" (len .items)}}'` -eq 0 ]; then\
-		echo "WARNING: No storageclass found";\
-	else\
-		echo "OK";\
-	fi
-
-
-.PHONY: validate-schema
-validate-schema: ## validates values files against schema in common/clustergroup
-	$(eval VAL_PARAMS := $(shell for i in ./values-*.yaml; do echo -n "$${i} "; done))
-	@echo -n "Validating clustergroup schema of: "
-	@set -e; for i in $(VAL_PARAMS); do echo -n " $$i"; helm template oci://quay.io/validatedpatterns/clustergroup $(HELM_OPTS) -f "$${i}" >/dev/null; done
-	@echo
-
-.PHONY: validate-prereq
-validate-prereq: ## verify pre-requisites
-	@common/scripts/validate-names-length.sh
-	@if [ ! -f /run/.containerenv ]; then\
-	  echo "Checking prerequisites:";\
-	  echo -n "  Check for python-kubernetes: ";\
-	  if ! ansible -m ansible.builtin.command -a "{{ ansible_python_interpreter }} -c 'import kubernetes'" localhost > /dev/null 2>&1; then echo "Not found"; exit 1; fi;\
-	  echo "OK";\
-	  echo -n "  Check for kubernetes.core collection: ";\
-	  if ! ansible-galaxy collection list | grep kubernetes.core > /dev/null 2>&1; then echo "Not found"; exit 1; fi;\
-	  echo "OK";\
-	else\
-		if [ -f values-global.yaml ]; then\
-			OUT=`yq -r '.main.multiSourceConfig.enabled // (.main.multiSourceConfig.enabled = "false")' values-global.yaml`;\
-			if [ "$${OUT,,}" = "false" ]; then\
-				echo "You must set \".main.multiSourceConfig.enabled: true\" in your 'values-global.yaml' file";\
-				echo "because your common subfolder is the slimmed down version with no helm charts in it";\
-				exit 1;\
-			fi;\
-		fi;\
-	fi
-
-.PHONY: argo-healthcheck
-argo-healthcheck: ## Checks if all argo applications are synced
-	@echo "Checking argo applications"
-	$(eval APPS := $(shell oc get applications.argoproj.io -A -o jsonpath='{range .items[*]}{@.metadata.namespace}{","}{@.metadata.name}{"\n"}{end}'))
-	@NOTOK=0; \
-	for i in $(APPS); do\
-		n=`echo "$${i}" | cut -f1 -d,`;\
-		a=`echo "$${i}" | cut -f2 -d,`;\
-		STATUS=`oc get -n "$${n}" applications.argoproj.io/"$${a}" -o jsonpath='{.status.sync.status}'`;\
-		if [[ $$STATUS != "Synced" ]]; then\
-			NOTOK=$$(( $${NOTOK} + 1));\
-		fi;\
-		HEALTH=`oc get -n "$${n}" applications.argoproj.io/"$${a}" -o jsonpath='{.status.health.status}'`;\
-		if [[ $$HEALTH != "Healthy" ]]; then\
-			NOTOK=$$(( $${NOTOK} + 1));\
-		fi;\
-		echo "$${n} $${a} -> Sync: $${STATUS} - Health: $${HEALTH}";\
-	done;\
-	if [ $${NOTOK} -gt 0 ]; then\
-	    echo "Some applications are not synced or are unhealthy";\
-	    exit 1;\
-	fi
-
-
-##@ Test and Linters Tasks
-
-.PHONY: qe-tests
-qe-tests: ## Runs the tests that QE runs
-	@set -e; if [ -f ./tests/interop/run_tests.sh ]; then \
-		pushd ./tests/interop; ./run_tests.sh; popd; \
-	else \
-		echo "No ./tests/interop/run_tests.sh found skipping"; \
-	fi
-
-.PHONY: super-linter
-super-linter: ## Runs super linter locally
-	rm -rf .mypy_cache
-	podman run -e RUN_LOCAL=true -e USE_FIND_ALGORITHM=true	\
-					-e VALIDATE_ANSIBLE=false \
-					-e VALIDATE_BASH=false \
-					-e VALIDATE_CHECKOV=false \
-					-e VALIDATE_DOCKERFILE_HADOLINT=false \
-					-e VALIDATE_JSCPD=false \
-					-e VALIDATE_JSON_PRETTIER=false \
-					-e VALIDATE_MARKDOWN_PRETTIER=false \
-					-e VALIDATE_PYTHON_PYLINT=false \
-					-e VALIDATE_SHELL_SHFMT=false \
-					-e VALIDATE_YAML=false \
-					-e VALIDATE_YAML_PRETTIER=false \
-					$(DISABLE_LINTERS) \
-					-v $(PWD):/tmp/lint:rw,z \
-					-w /tmp/lint \
-					ghcr.io/super-linter/super-linter@sha256:6c71bd17ab38ceb7acb5b93ef72f5c2288b5456a5c82693ded3ee8bb501bba7f # slim-v8.1.0
-
-.PHONY: deploy upgrade legacy-deploy legacy-upgrade
-deploy upgrade legacy-deploy legacy-upgrade:
-	@echo "UNSUPPORTED TARGET: please switch to 'operator-deploy'"; exit 1
diff --git a/common/README.md b/common/README.md
deleted file mode 100644
index a2e16cd52..000000000
--- a/common/README.md
+++ /dev/null
@@ -1,51 +0,0 @@
-# Validated Patterns common/ repository
-
-[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
-
-## Note
-
-This is the `main` branch of common and it assumes that the pattern is fully
-multisource (meaning that any used charts from VP is actually referenced from
-either a helm chart repository or quay repository). I.e. there are no helm
-charts contained in this branch of common and there is no Ansible code neither.
-
-The helm charts now live in separate repositories under the VP
-[organization](https://github.com/validatedpatterns) on GitHub. The repositories are:
-
-- clustergroup-chart
-- pattern-install-chart
-- hashicorp-vault-chart
-- golang-external-secrets-chart
-- acm-chart
-- letsencrypt-chart
-
-The Ansible bits live in this [repository](https://github.com/validatedpatterns/rhvp.cluster_utils)
-
-In order to be able to use this "slimmed-down" main branch of common you *must*
-use a 0.9.\* clustergroup-chart that. Add the following to your `values-global.yaml`:
-
-```yaml
-main:
-  multiSourceConfig:
-    enabled: true
-    clusterGroupChartVersion: 0.9.*
-```
-
-## Start Here
-
-This repository is never used as standalone. It is usually imported in each pattern as a subtree.
-In order to import the common subtree the very first time you can use the script
-[make_common_subtree.sh](scripts/make-common-subtree.sh).
-
-In order to update your common subtree inside your pattern repository you can either use
-`https://github.com/validatedpatterns/utilities/blob/main/scripts/update-common-everywhere.sh` or
-do it manually with the following commands:
-
-```sh
-git remote add -f common-upstream https://github.com/validatedpatterns/common.git
-git merge -s subtree -Xtheirs -Xsubtree=common common-upstream/main
-```
-
-## Secrets
-
-There are two different secret formats parsed by the Ansible bits. Both are documented [in the vault role](https://github.com/validatedpatterns/rhvp.cluster_utils/blob/main/roles/vault_utils/README.md)
diff --git a/common/requirements.yml b/common/requirements.yml
deleted file mode 100644
index cb11ca24b..000000000
--- a/common/requirements.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-# Define Ansible collection requirements here
-collections:
-  - name: git+https://github.com/validatedpatterns/rhvp.cluster_utils.git,v1
diff --git a/common/scripts/argocd-login.sh b/common/scripts/argocd-login.sh
deleted file mode 100755
index 99512c57c..000000000
--- a/common/scripts/argocd-login.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/usr/bin/env bash
-
-## Login to validated patterns argocd instances
-
-# Detect Argo CD namespaces
-ARGOCD_NAMESPACES=$(oc get argoCD -A -o jsonpath='{.items[*].metadata.namespace}')
-if [ -z "$ARGOCD_NAMESPACES" ]; then
-    echo "Error: No Argo CD instances found in the cluster."
-    exit 1
-fi
-
-# Split the namespaces into an array
-NAMESPACES=($ARGOCD_NAMESPACES)
-
-# Check if there are at least two Argo CD instances
-if [ ${#NAMESPACES[@]} -lt 2 ]; then
-    echo "Error: Less than two Argo CD instances found.  Found instances in namespaces: $ARGOCD_NAMESPACES"
-    exit 1
-fi
-
-
-for NAMESPACE in ${NAMESPACES[@]}; do
-    # get the instance name
-    ARGOCD_INSTANCE=$(oc get argocd -n "$NAMESPACE" -o jsonpath='{.items[0].metadata.name}') # assume only one per NS
-    SERVER_URL=$(oc get route "$ARGOCD_INSTANCE"-server -n "$NAMESPACE" -o jsonpath='{.status.ingress[0].host}')
-    PASSWORD=$(oc get secret "$ARGOCD_INSTANCE"-cluster -n "$NAMESPACE" -o jsonpath='{.data.admin\.password}' | base64 -d)
-    echo $PASSWORD
-    argocd login --skip-test-tls --insecure --grpc-web "$SERVER_URL" --username "admin" --password "$PASSWORD"
-    if [ "$?" -ne 0 ]; then
-      echo "Login to Argo CD ${SERVER_URL} failed. Exiting."
-      exit 1
-    fi
-    
-done 
diff --git a/common/scripts/deploy-pattern.sh b/common/scripts/deploy-pattern.sh
deleted file mode 100755
index df57e0f06..000000000
--- a/common/scripts/deploy-pattern.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-set -o pipefail
-
-RUNS=20
-WAIT=15
-# Retry five times because the CRD might not be fully installed yet
-echo -n "Installing pattern: "
-for i in $(seq 1 ${RUNS}); do \
-    exec 3>&1 4>&2
-    OUT=$( { helm template --include-crds --name-template $* 2>&4 | oc apply -f- 2>&4 1>&3; } 4>&1 3>&1)
-    ret=$?
-    exec 3>&- 4>&-
-    if [ ${ret} -eq 0 ]; then
-        break;
-    else
-        echo -n "."
-        sleep "${WAIT}"
-    fi
-done
-
-# All the runs failed
-if [ ${i} -eq ${RUNS} ]; then
-    echo "Installation failed [${i}/${RUNS}]. Error:"
-    echo "${OUT}"
-    exit 1
-fi
-echo "Done"
diff --git a/common/scripts/determine-main-clustergroup.sh b/common/scripts/determine-main-clustergroup.sh
deleted file mode 100755
index 6271dbadd..000000000
--- a/common/scripts/determine-main-clustergroup.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-PATTERN_DIR="$1"
-
-if [ -z "$PATTERN_DIR" ]; then
-    PATTERN_DIR="."
-fi
-
-CGNAME=$(yq '.main.clusterGroupName' "$PATTERN_DIR/values-global.yaml")
-
-if [ -z "$CGNAME" ] || [ "$CGNAME" == "null" ]; then
-    echo "Error - cannot detrmine clusterGroupName"
-    exit 1
-fi
-
-echo "$CGNAME"
diff --git a/common/scripts/determine-pattern-name.sh b/common/scripts/determine-pattern-name.sh
deleted file mode 100755
index fb503fe68..000000000
--- a/common/scripts/determine-pattern-name.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-PATTERN_DIR="$1"
-
-if [ -z "$PATTERN_DIR" ]; then
-    PATTERN_DIR="."
-fi
-
-PATNAME=$(yq '.global.pattern' "$PATTERN_DIR/values-global.yaml" 2>/dev/null)
-
-if [ -z "$PATNAME" ] || [ "$PATNAME" == "null" ]; then
-    PATNAME="$(basename "$PWD")"
-fi
-
-echo "$PATNAME"
diff --git a/common/scripts/determine-secretstore-backend.sh b/common/scripts/determine-secretstore-backend.sh
deleted file mode 100755
index ef7847907..000000000
--- a/common/scripts/determine-secretstore-backend.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-PATTERN_DIR="$1"
-
-if [ -z "$PATTERN_DIR" ]; then
-    PATTERN_DIR="."
-fi
-
-BACKEND=$(yq '.global.secretStore.backend' "$PATTERN_DIR/values-global.yaml" 2>/dev/null)
-
-if [ -z "$BACKEND" -o "$BACKEND" == "null" ]; then
-    BACKEND="vault"
-fi
-
-echo "$BACKEND"
diff --git a/common/scripts/display-secrets-info.sh b/common/scripts/display-secrets-info.sh
deleted file mode 100755
index ca0069e2a..000000000
--- a/common/scripts/display-secrets-info.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/env bash
-set -eu
-
-get_abs_filename() {
-  # $1 : relative filename
-  echo "$(cd "$(dirname "$1")" && pwd)/$(basename "$1")"
-}
-
-SCRIPT=$(get_abs_filename "$0")
-SCRIPTPATH=$(dirname "${SCRIPT}")
-COMMONPATH=$(dirname "${SCRIPTPATH}")
-PATTERNPATH=$(dirname "${COMMONPATH}")
-
-if [ "$#" -ge 1 ]; then
-    export VALUES_SECRET=$(get_abs_filename "${1}")
-fi
-
-if [[ "$#" == 2 ]]; then
-    SECRETS_BACKING_STORE="$2"
-else
-    SECRETS_BACKING_STORE="$($SCRIPTPATH/determine-secretstore-backend.sh)"
-fi
-
-PATTERN_NAME=$(basename "`pwd`")
-
-EXTRA_PLAYBOOK_OPTS="${EXTRA_PLAYBOOK_OPTS:-}"
-
-ansible-playbook -e pattern_name="${PATTERN_NAME}" -e pattern_dir="${PATTERNPATH}" -e secrets_backing_store="${SECRETS_BACKING_STORE}" -e hide_sensitive_output=false ${EXTRA_PLAYBOOK_OPTS} "rhvp.cluster_utils.display_secrets_info"
diff --git a/common/scripts/load-k8s-secrets.sh b/common/scripts/load-k8s-secrets.sh
deleted file mode 100755
index 707e51a7b..000000000
--- a/common/scripts/load-k8s-secrets.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-set -eu
-
-get_abs_filename() {
-  # $1 : relative filename
-  echo "$(cd "$(dirname "$1")" && pwd)/$(basename "$1")"
-}
-
-SCRIPT=$(get_abs_filename "$0")
-SCRIPTPATH=$(dirname "${SCRIPT}")
-COMMONPATH=$(dirname "${SCRIPTPATH}")
-PATTERNPATH=$(dirname "${COMMONPATH}")
-
-PATTERN_NAME=${1:-$(basename "`pwd`")}
-
-EXTRA_PLAYBOOK_OPTS="${EXTRA_PLAYBOOK_OPTS:-}"
-
-ansible-playbook -e pattern_name="${PATTERN_NAME}" -e pattern_dir="${PATTERNPATH}" ${EXTRA_PLAYBOOK_OPTS} "rhvp.cluster_utils.k8s_secrets"
diff --git a/common/scripts/make-common-subtree.sh b/common/scripts/make-common-subtree.sh
deleted file mode 100755
index 196a4c8d8..000000000
--- a/common/scripts/make-common-subtree.sh
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/bin/sh
-
-if [ "$1" = "-h" ]; then
-	echo "This script will convert common into a subtree and add a remote to help manage it."
-	echo "The script takes three positional arguments, as follows:"
-	echo
-	echo "$0 <subtree_repo> <subtree_branch> <subtree_remote_name>"
-	echo
-	echo "Run without arguments, the script would run as if these arguments had been passed:"
-	echo "$0 https://github.com/validatedpatterns/common.git main common-upstream"
-	echo
-	echo "Please ensure the git subtree command is available. On RHEL/Fedora, the git subtree command"
-	echo "is in a separate package called git-subtree"
-	exit 1
-fi
-
-if [ -f '/etc/redhat-release' ]; then
-  rpm -qa | grep git-subtree 2>&1
-  if [ ! $? = 0 ]; then
-    echo "you need to install git-subtree"
-    echo "would you like to install it now?"
-    select ANS in yes no
-    do
-      case $ANS in
-        yes)
-          sudo dnf install git-subtree -y
-          break
-          ;;
-        no)
-          exit
-          break
-          ;;
-        *)
-          echo "You must enter yes or no"
-          ;;
-      esac
-    done
-  fi
-fi
-
-if [ "$1" ]; then
-	subtree_repo=$1
-else
-	subtree_repo=https://github.com/validatedpatterns/common.git
-fi
-
-if [ "$2" ]; then
-	subtree_branch=$2
-else
-	subtree_branch=main
-fi
-
-if [ "$3" ]; then
-	subtree_remote=$3
-else
-	subtree_remote=common-upstream
-fi
-
-git diff --quiet || (echo "This script must be run on a clean working tree" && exit 1)
-
-echo "Changing directory to project root"
-cd `git rev-parse --show-toplevel`
-
-echo "Removing existing common and replacing it with subtree from $subtree_repo $subtree_remote"
-rm -rf common
-
-echo "Committing removal of common"
-(git add -A :/ && git commit -m "Removed previous version of common to convert to subtree from $subtree_repo $subtree_branch") || exit 1
-
-echo "Adding (possibly replacing) subtree remote $subtree_remote"
-git remote rm "$subtree_remote"
-git remote add -f "$subtree_remote" "$subtree_repo" || exit 1
-git subtree add --prefix=common "$subtree_remote" "$subtree_branch" || exit 1
-
-echo "Complete.  You may now push these results if you are satisfied"
-exit 0
diff --git a/common/scripts/manage-secret-app.sh b/common/scripts/manage-secret-app.sh
deleted file mode 100755
index 18a986e5a..000000000
--- a/common/scripts/manage-secret-app.sh
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/sh
-
-APP=$1
-STATE=$2
-
-MAIN_CLUSTERGROUP_FILE="./values-$(common/scripts/determine-main-clustergroup.sh).yaml"
-MAIN_CLUSTERGROUP_PROJECT="$(common/scripts/determine-main-clustergroup.sh)"
-
-case "$APP" in
-    "vault")
-        APP_NAME="vault"
-        NAMESPACE="vault"
-        PROJECT="$MAIN_CLUSTERGROUP_PROJECT"
-        CHART_NAME="hashicorp-vault"
-        CHART_VERSION=0.1.*
-
-    ;;
-    "golang-external-secrets")
-        APP_NAME="golang-external-secrets"
-        NAMESPACE="golang-external-secrets"
-        PROJECT="$MAIN_CLUSTERGROUP_PROJECT"
-        CHART_NAME="golang-external-secrets"
-        CHART_VERSION=0.1.*
-
-    ;;
-    *)
-        echo "Error - cannot manage $APP can only manage vault and golang-external-secrets"
-        exit 1
-    ;;
-esac
-
-case "$STATE" in
-    "present")
-        common/scripts/manage-secret-namespace.sh "$NAMESPACE" "$STATE"
-
-        RES=$(yq ".clusterGroup.applications[] | select(.path == \"$CHART_LOCATION\")" "$MAIN_CLUSTERGROUP_FILE" 2>/dev/null)
-        if [ -z "$RES" ]; then
-            echo "Application with chart location $CHART_LOCATION not found, adding"
-            yq -i ".clusterGroup.applications.$APP_NAME = { \"name\": \"$APP_NAME\", \"namespace\": \"$NAMESPACE\", \"project\": \"$PROJECT\", \"chart\": \"$CHART_NAME\",  \"chartVersion\": \"$CHART_VERSION\"}" "$MAIN_CLUSTERGROUP_FILE"
-        fi
-    ;;
-    "absent")
-        common/scripts/manage-secret-namespace.sh "$NAMESPACE" "$STATE"
-        echo "Removing application wth chart location $CHART_LOCATION"
-        yq -i "del(.clusterGroup.applications[] | select(.chart == \"$CHART_NAME\"))" "$MAIN_CLUSTERGROUP_FILE"
-    ;;
-    *)
-        echo "$STATE not supported"
-        exit 1
-    ;;
-esac
-
-exit 0
diff --git a/common/scripts/manage-secret-namespace.sh b/common/scripts/manage-secret-namespace.sh
deleted file mode 100755
index bcb06742c..000000000
--- a/common/scripts/manage-secret-namespace.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-
-NAMESPACE=$1
-STATE=$2
-
-MAIN_CLUSTERGROUP_FILE="./values-$(common/scripts/determine-main-clustergroup.sh).yaml"
-MAIN_CLUSTERGROUP_PROJECT="$(common/scripts/determine-main-clustergroup.sh)"
-
-case "$STATE" in
-    "present")
-
-        RES=$(yq ".clusterGroup.namespaces[] | select(. == \"$NAMESPACE\")" "$MAIN_CLUSTERGROUP_FILE" 2>/dev/null)
-        if [ -z "$RES" ]; then
-            echo "Namespace $NAMESPACE not found, adding"
-            yq -i ".clusterGroup.namespaces += [ \"$NAMESPACE\" ]" "$MAIN_CLUSTERGROUP_FILE"
-        fi
-    ;;
-    "absent")
-        echo "Removing namespace $NAMESPACE"
-        yq -i "del(.clusterGroup.namespaces[] | select(. == \"$NAMESPACE\"))" "$MAIN_CLUSTERGROUP_FILE"
-    ;;
-    *)
-        echo "$STATE not supported"
-        exit 1
-    ;;
-esac
-
-exit 0
diff --git a/common/scripts/pattern-util.sh b/common/scripts/pattern-util.sh
deleted file mode 100755
index 30f8b219c..000000000
--- a/common/scripts/pattern-util.sh
+++ /dev/null
@@ -1,114 +0,0 @@
-#!/bin/bash
-
-function is_available {
-  command -v $1 >/dev/null 2>&1 || { echo >&2 "$1 is required but it's not installed. Aborting."; exit 1; }
-}
-
-function version {
-    echo "$@" | awk -F. '{ printf("%d%03d%03d%03d\n", $1,$2,$3,$4); }'
-}
-
-if [ -z "$PATTERN_UTILITY_CONTAINER" ]; then
-	PATTERN_UTILITY_CONTAINER="quay.io/validatedpatterns/utility-container"
-fi
-# If PATTERN_DISCONNECTED_HOME is set it will be used to populate both PATTERN_UTILITY_CONTAINER
-# and PATTERN_INSTALL_CHART automatically
-if [ -n "${PATTERN_DISCONNECTED_HOME}" ]; then
-    PATTERN_UTILITY_CONTAINER="${PATTERN_DISCONNECTED_HOME}/utility-container"
-    PATTERN_INSTALL_CHART="oci://${PATTERN_DISCONNECTED_HOME}/pattern-install"
-    echo "PATTERN_DISCONNECTED_HOME is set to ${PATTERN_DISCONNECTED_HOME}"
-    echo "Setting the following variables:"
-    echo "  PATTERN_UTILITY_CONTAINER: ${PATTERN_UTILITY_CONTAINER}"
-    echo "  PATTERN_INSTALL_CHART: ${PATTERN_INSTALL_CHART}"
-fi
-
-readonly commands=(podman)
-for cmd in ${commands[@]}; do is_available "$cmd"; done
-
-UNSUPPORTED_PODMAN_VERSIONS="1.6 1.5"
-PODMAN_VERSION_STR=$(podman --version)
-for i in ${UNSUPPORTED_PODMAN_VERSIONS}; do
-	# We add a space
-	if echo "${PODMAN_VERSION_STR}" | grep -q -E "\b${i}"; then
-		echo "Unsupported podman version. We recommend > 4.3.0"
-		podman --version
-		exit 1
-	fi
-done
-
-# podman --version outputs:
-# podman version 4.8.2
-PODMAN_VERSION=$(echo "${PODMAN_VERSION_STR}" | awk '{ print $NF }')
-
-# podman < 4.3.0 do not support keep-id:uid=...
-if [ $(version "${PODMAN_VERSION}") -lt $(version "4.3.0") ]; then
-    PODMAN_ARGS="-v ${HOME}:/root"
-else
-    # We do not rely on bash's $UID and $GID because on MacOSX $GID is not set
-    MYNAME=$(id -n -u)
-    MYUID=$(id -u)
-    MYGID=$(id -g)
-    PODMAN_ARGS="--passwd-entry ${MYNAME}:x:${MYUID}:${MYGID}::/pattern-home:/bin/bash --user ${MYUID}:${MYGID} --userns keep-id:uid=${MYUID},gid=${MYGID}"
-
-fi
-
-if [ -n "$KUBECONFIG" ]; then
-    if [[ ! "${KUBECONFIG}" =~ ^$HOME* ]]; then
-        echo "${KUBECONFIG} is pointing outside of the HOME folder, this will make it unavailable from the container."
-        echo "Please move it somewhere inside your $HOME folder, as that is what gets bind-mounted inside the container"
-        exit 1
-    fi
-fi
-
-# Detect if we use podman machine. If we do not then we bind mount local host ssl folders
-# if we are using podman machine then we do not bind mount anything (for now!)
-REMOTE_PODMAN=$(podman system connection list | tail -n +2 | wc -l)
-if [ $REMOTE_PODMAN -eq 0 ]; then # If we are not using podman machine we check the hosts folders
-    # We check /etc/pki/tls because on ubuntu /etc/pki/fwupd sometimes
-    # exists but not /etc/pki/tls and we do not want to bind mount in such a case
-    # as it would find no certificates at all.
-    if [ -d /etc/pki/tls ]; then
-        PKI_HOST_MOUNT_ARGS="-v /etc/pki:/etc/pki:ro"
-    elif [ -d /etc/ssl ]; then
-        PKI_HOST_MOUNT_ARGS="-v /etc/ssl:/etc/ssl:ro"
-    else
-        PKI_HOST_MOUNT_ARGS="-v /usr/share/ca-certificates:/usr/share/ca-certificates:ro"
-    fi
-else
-    PKI_HOST_MOUNT_ARGS=""
-fi
-
-# Copy Kubeconfig from current environment. The utilities will pick up ~/.kube/config if set so it's not mandatory
-# $HOME is mounted as itself for any files that are referenced with absolute paths
-# $HOME is mounted to /root because the UID in the container is 0 and that's where SSH looks for credentials
-
-podman run -it --rm --pull=newer \
-    --security-opt label=disable \
-    -e EXTRA_HELM_OPTS \
-    -e EXTRA_PLAYBOOK_OPTS \
-    -e TARGET_ORIGIN \
-    -e TARGET_SITE \
-    -e TARGET_BRANCH \
-    -e PATTERN_NAME \
-    -e TOKEN_SECRET \
-    -e TOKEN_NAMESPACE \
-    -e VALUES_SECRET \
-    -e KUBECONFIG \
-    -e PATTERN_INSTALL_CHART \
-    -e PATTERN_DISCONNECTED_HOME \
-    -e DISABLE_VALIDATE_ORIGIN \
-    -e K8S_AUTH_HOST \
-    -e K8S_AUTH_VERIFY_SSL \
-    -e K8S_AUTH_SSL_CA_CERT \
-    -e K8S_AUTH_USERNAME \
-    -e K8S_AUTH_PASSWORD \
-    -e K8S_AUTH_TOKEN \
-    ${PKI_HOST_MOUNT_ARGS} \
-    -v "$(pwd -P)":"$(pwd -P)" \
-    -v "${HOME}":"${HOME}" \
-    -v "${HOME}":/pattern-home \
-    ${PODMAN_ARGS} \
-    ${EXTRA_ARGS} \
-    -w "$(pwd -P)" \
-    "$PATTERN_UTILITY_CONTAINER" \
-    $@
diff --git a/common/scripts/preview-all.sh b/common/scripts/preview-all.sh
deleted file mode 100755
index 4bf593226..000000000
--- a/common/scripts/preview-all.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-
-REPO=$1; shift;
-TARGET_BRANCH=$1; shift
-
-HUB=$( yq ".main.clusterGroupName" values-global.yaml )
-MANAGED_CLUSTERS=$( yq ".clusterGroup.managedClusterGroups.[].name" values-$HUB.yaml )
-ALL_CLUSTERS=( $HUB $MANAGED_CLUSTERS )
-
-CLUSTER_INFO_OUT=$(oc cluster-info 2>&1)
-CLUSTER_INFO_RET=$?
-if [ $CLUSTER_INFO_RET -ne 0 ]; then
-    echo "Could not access the cluster:"
-    echo "${CLUSTER_INFO_OUT}"
-    exit 1
-fi
-
-for cluster in ${ALL_CLUSTERS[@]}; do
-    # We always add clustergroup as it is the entry point and it gets special cased in preview.sh.
-    APPS="clustergroup $( yq ".clusterGroup.applications.[].name" values-$cluster.yaml )"
-    for app in $APPS; do
-        printf "# Parsing application $app from cluster $cluster\n"
-        common/scripts/preview.sh $cluster $app $REPO $TARGET_BRANCH
-    done
-done
diff --git a/common/scripts/preview.sh b/common/scripts/preview.sh
deleted file mode 100755
index 337d34e3e..000000000
--- a/common/scripts/preview.sh
+++ /dev/null
@@ -1,118 +0,0 @@
-#!/bin/bash
-
-# DISCLAIMER
-# 
-# - Parsing of applications needs to be more clever.
-# - There is currently not a mechanism to actually preview against multiple clusters 
-# (i.e. a hub and a remote). All previews will be done against the current.
-# - Make output can be included in the YAML.
-
-SITE=$1; shift
-APPNAME=$1; shift
-GIT_REPO=$1; shift
-GIT_BRANCH=$1; shift
-
-if [ "${APPNAME}" != "clustergroup" ]; then
-  # This covers the following case:
-  # foobar:
-  #   name: foo
-  #   namespace: foo
-  #   project: foo
-  #   path: charts/all/foo
-  # So we retrieve the actual index ("foobar") given the name attribute of the application
-  APP=$(yq ".clusterGroup.applications | with_entries(select(.value.name == \"$APPNAME\")) | keys | .[0]" values-$SITE.yaml)
-  isLocalHelmChart=$(yq ".clusterGroup.applications.$APP.path" values-$SITE.yaml)
-  if [ $isLocalHelmChart != "null" ]; then
-    chart=$(yq ".clusterGroup.applications.$APP.path" values-$SITE.yaml)
-  else
-    helmrepo=$(yq ".clusterGroup.applications.$APP.repoURL" values-$SITE.yaml)
-    helmrepo="${helmrepo:+oci://quay.io/validatedpatterns}"
-    chartversion=$(yq ".clusterGroup.applications.$APP.chartVersion" values-$SITE.yaml)
-    chartname=$(yq ".clusterGroup.applications.$APP.chart" values-$SITE.yaml)
-    chart="${helmrepo}/${chartname} --version ${chartversion}"
-  fi
-  namespace=$(yq ".clusterGroup.applications.$APP.namespace" values-$SITE.yaml)
-else
-  APP=$APPNAME
-  clusterGroupChartVersion=$(yq ".main.multiSourceConfig.clusterGroupChartVersion" values-global.yaml)
-  helmrepo="oci://quay.io/validatedpatterns"
-  chart="${helmrepo}/clustergroup --version ${clusterGroupChartVersion}"
-  namespace="openshift-operators"
-fi
-pattern=$(yq ".global.pattern" values-global.yaml)
-
-# You can override the default lookups by using OCP_{PLATFORM,VERSION,DOMAIN}
-# Note that when using the utility container you need to pass in the above variables
-# by export EXTRA_ARGS="-e OCP_PLATFORM -e OCP_VERSION -e OCP_DOMAIN" before
-# invoking pattern-util.sh
-platform=${OCP_PLATFORM:-$(oc get Infrastructure.config.openshift.io/cluster  -o jsonpath='{.spec.platformSpec.type}')}
-ocpversion=${OCP_VERSION:-$(oc get clusterversion/version -o jsonpath='{.status.desired.version}' | awk -F. '{print $1"."$2}')}
-domain=${OCP_DOMAIN:-$(oc get Ingress.config.openshift.io/cluster -o jsonpath='{.spec.domain}' | sed 's/^apps.//')}
-
-function replaceGlobals() {
-    output=$( echo $1 | sed -e 's/ //g' -e 's/\$//g' -e s@^-@@g  -e s@\'@@g )
-
-    output=$(echo $output | sed "s@{{.Values.global.clusterPlatform}}@${platform}@g")
-    output=$(echo $output | sed "s@{{.Values.global.clusterVersion}}@${ocpversion}@g")
-    output=$(echo $output | sed "s@{{.Values.global.clusterDomain}}@${domain}@g")
-
-    echo $output
-}
-
-function getOverrides() {
-    overrides=''
-    overrides=$( yq ".clusterGroup.applications.$APP.overrides[]" "values-$SITE.yaml" )
-    overrides=$( echo "$overrides" | tr -d '\n' )
-    overrides=$( echo "$overrides" | sed -e 's/name:/ --set/g; s/value: /=/g' )
-    if [ -n "$overrides" ]; then
-        echo "$overrides"
-    fi
-}
-
-
-CLUSTER_OPTS=""
-CLUSTER_OPTS="$CLUSTER_OPTS --set global.pattern=$pattern"
-CLUSTER_OPTS="$CLUSTER_OPTS --set global.repoURL=$GIT_REPO"
-CLUSTER_OPTS="$CLUSTER_OPTS --set main.git.repoURL=$GIT_REPO"
-CLUSTER_OPTS="$CLUSTER_OPTS --set main.git.revision=$GIT_BRANCH"
-CLUSTER_OPTS="$CLUSTER_OPTS --set global.namespace=$namespace"
-CLUSTER_OPTS="$CLUSTER_OPTS --set global.hubClusterDomain=apps.$domain"
-CLUSTER_OPTS="$CLUSTER_OPTS --set global.localClusterDomain=apps.$domain"
-CLUSTER_OPTS="$CLUSTER_OPTS --set global.clusterDomain=$domain"
-CLUSTER_OPTS="$CLUSTER_OPTS --set global.clusterVersion=$ocpversion"
-CLUSTER_OPTS="$CLUSTER_OPTS --set global.clusterPlatform=$platform"
-
-
-sharedValueFiles=$(yq ".clusterGroup.sharedValueFiles" values-$SITE.yaml)
-appValueFiles=$(yq ".clusterGroup.applications.$APP.extraValueFiles" values-$SITE.yaml)
-isKustomize=$(yq ".clusterGroup.applications.$APP.kustomize" values-$SITE.yaml)
-OVERRIDES=$( getOverrides )
-
-VALUE_FILES="-f values-global.yaml -f values-$SITE.yaml"
-IFS=$'\n'
-for line in $sharedValueFiles; do
-    if [ $line != "null" ] && [ -f $line ]; then
-	    file=$(replaceGlobals $line)
-	    VALUE_FILES="$VALUE_FILES -f $PWD$file"
-    fi
-done
-
-for line in $appValueFiles; do
-    if [ $line != "null" ] && [ -f $line ]; then
-	    file=$(replaceGlobals $line)
-	    VALUE_FILES="$VALUE_FILES -f $PWD$file"
-    fi
-done
-
-if [ $isKustomize == "true" ]; then
-    kustomizePath=$(yq ".clusterGroup.applications.$APP.path" values-$SITE.yaml)
-    repoURL=$(yq ".clusterGroup.applications.$APP.repoURL" values-$SITE.yaml)
-    if [[ $repoURL == http* ]] || [[ $repoURL == git@ ]]; then
-         kustomizePath="${repoURL}/${kustomizePath}"
-    fi
-    cmd="oc kustomize ${kustomizePath}"
-    eval "$cmd"
-else
-    cmd="helm template $chart --name-template ${APP} -n ${namespace} ${VALUE_FILES} ${OVERRIDES} ${CLUSTER_OPTS}"
-    eval "$cmd"
-fi
diff --git a/common/scripts/process-secrets.sh b/common/scripts/process-secrets.sh
deleted file mode 100755
index 10288d1f7..000000000
--- a/common/scripts/process-secrets.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-set -eu
-
-get_abs_filename() {
-  # $1 : relative filename
-  echo "$(cd "$(dirname "$1")" && pwd)/$(basename "$1")"
-}
-
-SCRIPT=$(get_abs_filename "$0")
-SCRIPTPATH=$(dirname "${SCRIPT}")
-COMMONPATH=$(dirname "${SCRIPTPATH}")
-PATTERNPATH=$(dirname "${COMMONPATH}")
-
-PATTERN_NAME=${1:-$(basename "`pwd`")}
-SECRETS_BACKING_STORE="$("$SCRIPTPATH/determine-secretstore-backend.sh")"
-
-EXTRA_PLAYBOOK_OPTS="${EXTRA_PLAYBOOK_OPTS:-}"
-
-ansible-playbook -e pattern_name="${PATTERN_NAME}" -e pattern_dir="${PATTERNPATH}" -e secrets_backing_store="${SECRETS_BACKING_STORE}" ${EXTRA_PLAYBOOK_OPTS} "rhvp.cluster_utils.process_secrets"
diff --git a/common/scripts/set-secret-backend.sh b/common/scripts/set-secret-backend.sh
deleted file mode 100755
index e07b15bfb..000000000
--- a/common/scripts/set-secret-backend.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-BACKEND=$1
-
-yq -i ".global.secretStore.backend = \"$BACKEND\"" values-global.yaml
diff --git a/common/scripts/validate-names-length.sh b/common/scripts/validate-names-length.sh
deleted file mode 100755
index 3763832d5..000000000
--- a/common/scripts/validate-names-length.sh
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/usr/bin/env bash
-
-MAX_CALCULATED_LENGTH=47
-
-print_explanation() {
-  echo "--------------------------------------------------------------------------------"
-  echo "Validation Explanation:"
-  echo "This script ensures that generated Kubernetes resource names do not exceed the 63-character limit."
-  echo "A DNS-compatible name is constructed in the 'clustergroup' Helm chart using the following pattern:"
-  echo "  -> {{ .Values.clusterGroup.name }}-gitops-server-{{ .Values.global.pattern }}-{{ .Values.clusterGroup.name }}"
-  echo ""
-  echo "The total length is calculated as:"
-  echo "  (2 * length of 'clusterGroup.name') + length of 'global.pattern' + 15 (for '-gitops-server-') + 1 (for the namespace separator '-')"
-  echo ""
-  echo "To stay under the 63-character limit, the variable part of the name must be less than $MAX_CALCULATED_LENGTH characters:"
-  echo "  (2 * length of 'clusterGroup.name') + length of 'global.pattern' < $MAX_CALCULATED_LENGTH"
-  echo "--------------------------------------------------------------------------------"
-}
-
-if [ ! -f "values-global.yaml" ]; then
-  echo "Error: Global values file 'values-global.yaml' not found."
-  exit 1
-fi
-
-global_pattern=$(yq .global.pattern "values-global.yaml")
-
-if [ "$global_pattern" == "null" ] || [ -z "$global_pattern" ]; then
-  echo "Error: '.global.pattern' not found or is empty in 'values-global.yaml'."
-  exit 1
-fi
-pattern_length=${#global_pattern}
-
-echo "Validating that the pattern and clustergroup names don't exceed DNS limits after the pattern is installed."
-echo ""
-
-validation_failed=false
-
-for file in values-*.yaml; do
-  group_name=$(yq .clusterGroup.name "$file")
-
-  if [ "$group_name" != "null" ] && [ -n "$group_name" ]; then
-    group_name_length=${#group_name}
-    total_length=$(( (2 * group_name_length) + pattern_length ))
-
-    echo "Checking file: $file"
-
-    if [ "$total_length" -ge "$MAX_CALCULATED_LENGTH" ]; then
-      echo "  -> FAILED: Length of clustergroup '$group_name' and pattern '$global_pattern' will exceed DNS limits in clustergroup chart. Please shorten one or both."
-      echo ""
-      validation_failed=true
-    else
-      echo "  -> PASSED: Length of clustergroup '$group_name' and pattern '$global_pattern' are within clustergroup chart limits."
-      echo ""
-    fi
-  fi
-done
-
-if $validation_failed; then
-  echo "One or more cluster group names failed the length validation."
-  print_explanation
-  exit 1
-else
-  echo "All names are within clustergroup chart limits."
-  exit 0
-fi
diff --git a/common/scripts/vault-utils.sh b/common/scripts/vault-utils.sh
deleted file mode 100755
index 2f7664992..000000000
--- a/common/scripts/vault-utils.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/usr/bin/env bash
-set -eu
-
-get_abs_filename() {
-  # $1 : relative filename
-  echo "$(cd "$(dirname "$1")" && pwd)/$(basename "$1")"
-}
-
-SCRIPT=$(get_abs_filename "$0")
-SCRIPTPATH=$(dirname "${SCRIPT}")
-COMMONPATH=$(dirname "${SCRIPTPATH}")
-PATTERNPATH=$(dirname "${COMMONPATH}")
-
-# Parse arguments
-if [ $# -lt 1 ]; then
-  echo "Specify at least the command ($#): $*"
-  exit 1
-fi
-
-TASK="${1}"
-PATTERN_NAME=${2:-$(basename "`pwd`")}
-
-if [ -z ${TASK} ]; then
-	echo "Task is unset"
-	exit 1
-fi
-
-EXTRA_PLAYBOOK_OPTS="${EXTRA_PLAYBOOK_OPTS:-}"
-
-ansible-playbook -t "${TASK}" -e pattern_name="${PATTERN_NAME}" -e pattern_dir="${PATTERNPATH}" ${EXTRA_PLAYBOOK_OPTS} "rhvp.cluster_utils.vault"
diff --git a/common/scripts/write-token-kubeconfig.sh b/common/scripts/write-token-kubeconfig.sh
deleted file mode 100755
index e7913e532..000000000
--- a/common/scripts/write-token-kubeconfig.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-set -eu
-
-OUTPUTFILE=${1:-"~/.kube/config"}
-
-get_abs_filename() {
-  # $1 : relative filename
-  echo "$(cd "$(dirname "$1")" && pwd)/$(basename "$1")"
-}
-
-SCRIPT=$(get_abs_filename "$0")
-SCRIPTPATH=$(dirname "${SCRIPT}")
-COMMONPATH=$(dirname "${SCRIPTPATH}")
-PATTERNPATH=$(dirname "${COMMONPATH}")
-
-EXTRA_PLAYBOOK_OPTS="${EXTRA_PLAYBOOK_OPTS:-}"
-
-ansible-playbook -e pattern_dir="${PATTERNPATH}" -e kubeconfig_file="${OUTPUTFILE}" ${EXTRA_PLAYBOOK_OPTS} "rhvp.cluster_utils.write-token-kubeconfig"
diff --git a/pattern.sh b/pattern.sh
deleted file mode 120000
index 223a55078..000000000
--- a/pattern.sh
+++ /dev/null
@@ -1 +0,0 @@
-./common/scripts/pattern-util.sh
\ No newline at end of file
diff --git a/pattern.sh b/pattern.sh
new file mode 100755
index 000000000..d6daa15e7
--- /dev/null
+++ b/pattern.sh
@@ -0,0 +1,117 @@
+#!/bin/bash
+
+function is_available {
+  command -v $1 >/dev/null 2>&1 || { echo >&2 "$1 is required but it's not installed. Aborting."; exit 1; }
+}
+
+function version {
+    echo "$@" | awk -F. '{ printf("%d%03d%03d%03d\n", $1,$2,$3,$4); }'
+}
+
+if [ -z "$PATTERN_UTILITY_CONTAINER" ]; then
+	PATTERN_UTILITY_CONTAINER="quay.io/validatedpatterns/utility-container"
+fi
+# If PATTERN_DISCONNECTED_HOME is set it will be used to populate both PATTERN_UTILITY_CONTAINER
+# and PATTERN_INSTALL_CHART automatically
+if [ -n "${PATTERN_DISCONNECTED_HOME}" ]; then
+    PATTERN_UTILITY_CONTAINER="${PATTERN_DISCONNECTED_HOME}/utility-container"
+    PATTERN_INSTALL_CHART="oci://${PATTERN_DISCONNECTED_HOME}/pattern-install"
+    echo "PATTERN_DISCONNECTED_HOME is set to ${PATTERN_DISCONNECTED_HOME}"
+    echo "Setting the following variables:"
+    echo "  PATTERN_UTILITY_CONTAINER: ${PATTERN_UTILITY_CONTAINER}"
+    echo "  PATTERN_INSTALL_CHART: ${PATTERN_INSTALL_CHART}"
+fi
+
+readonly commands=(podman)
+for cmd in ${commands[@]}; do is_available "$cmd"; done
+
+UNSUPPORTED_PODMAN_VERSIONS="1.6 1.5"
+PODMAN_VERSION_STR=$(podman --version)
+for i in ${UNSUPPORTED_PODMAN_VERSIONS}; do
+	# We add a space
+	if echo "${PODMAN_VERSION_STR}" | grep -q -E "\b${i}"; then
+		echo "Unsupported podman version. We recommend > 4.3.0"
+		podman --version
+		exit 1
+	fi
+done
+
+# podman --version outputs:
+# podman version 4.8.2
+PODMAN_VERSION=$(echo "${PODMAN_VERSION_STR}" | awk '{ print $NF }')
+
+# podman < 4.3.0 do not support keep-id:uid=...
+if [ $(version "${PODMAN_VERSION}") -lt $(version "4.3.0") ]; then
+    PODMAN_ARGS="-v ${HOME}:/root"
+else
+    # We do not rely on bash's $UID and $GID because on MacOSX $GID is not set
+    MYNAME=$(id -n -u)
+    MYUID=$(id -u)
+    MYGID=$(id -g)
+    PODMAN_ARGS="--passwd-entry ${MYNAME}:x:${MYUID}:${MYGID}::/pattern-home:/bin/bash --user ${MYUID}:${MYGID} --userns keep-id:uid=${MYUID},gid=${MYGID}"
+
+fi
+
+if [ -n "$KUBECONFIG" ]; then
+    if [[ ! "${KUBECONFIG}" =~ ^$HOME* ]]; then
+        echo "${KUBECONFIG} is pointing outside of the HOME folder, this will make it unavailable from the container."
+        echo "Please move it somewhere inside your $HOME folder, as that is what gets bind-mounted inside the container"
+        exit 1
+    fi
+fi
+
+# Detect if we use podman machine. If we do not then we bind mount local host ssl folders
+# if we are using podman machine then we do not bind mount anything (for now!)
+REMOTE_PODMAN=$(podman system connection list | tail -n +2 | wc -l)
+if [ $REMOTE_PODMAN -eq 0 ]; then # If we are not using podman machine we check the hosts folders
+    # We check /etc/pki/tls because on ubuntu /etc/pki/fwupd sometimes
+    # exists but not /etc/pki/tls and we do not want to bind mount in such a case
+    # as it would find no certificates at all.
+    if [ -d /etc/pki/tls ]; then
+        PKI_HOST_MOUNT_ARGS="-v /etc/pki:/etc/pki:ro"
+    elif [ -d /etc/ssl ]; then
+        PKI_HOST_MOUNT_ARGS="-v /etc/ssl:/etc/ssl:ro"
+    else
+        PKI_HOST_MOUNT_ARGS="-v /usr/share/ca-certificates:/usr/share/ca-certificates:ro"
+    fi
+else
+    PKI_HOST_MOUNT_ARGS=""
+fi
+
+# Copy Kubeconfig from current environment. The utilities will pick up ~/.kube/config if set so it's not mandatory
+# $HOME is mounted as itself for any files that are referenced with absolute paths
+# $HOME is mounted to /root because the UID in the container is 0 and that's where SSH looks for credentials
+
+podman run -it --rm --pull=newer \
+    --security-opt label=disable \
+    -e ANSIBLE_STDOUT_CALLBACK \
+    -e DISABLE_VALIDATE_ORIGIN \
+    -e EXTRA_HELM_OPTS \
+    -e EXTRA_PLAYBOOK_OPTS \
+    -e K8S_AUTH_HOST \
+    -e K8S_AUTH_PASSWORD \
+    -e K8S_AUTH_SSL_CA_CERT \
+    -e K8S_AUTH_TOKEN \
+    -e K8S_AUTH_USERNAME \
+    -e K8S_AUTH_VERIFY_SSL \
+    -e KUBECONFIG \
+    -e PATTERN_DIR \
+    -e PATTERN_DISCONNECTED_HOME \
+    -e PATTERN_INSTALL_CHART \
+    -e PATTERN_NAME \
+    -e TARGET_BRANCH \
+    -e TARGET_CLUSTERGROUP \
+    -e TARGET_ORIGIN \
+    -e TOKEN_NAMESPACE \
+    -e TOKEN_SECRET \
+    -e UUID_FILE \
+    -e VALUES_SECRET \
+    ${PKI_HOST_MOUNT_ARGS} \
+    -v "$(pwd -P)":"$(pwd -P)" \
+    -v "${HOME}":"${HOME}" \
+    -v "${HOME}":/pattern-home \
+    ${PODMAN_ARGS} \
+    ${EXTRA_ARGS} \
+    -w "$(pwd -P)" \
+    "$PATTERN_UTILITY_CONTAINER" \
+    $@