diff --git a/.github/workflows/e2e/scripts/hpo/create-project-namespace.sh b/.github/workflows/e2e/scripts/hpo-create-project-namespace.sh
similarity index 89%
rename from .github/workflows/e2e/scripts/hpo/create-project-namespace.sh
rename to .github/workflows/e2e/scripts/hpo-create-project-namespace.sh
index 69084c64..3a4bef32 100755
--- a/.github/workflows/e2e/scripts/hpo/create-project-namespace.sh
+++ b/.github/workflows/e2e/scripts/hpo-create-project-namespace.sh
@@ -1,9 +1,9 @@
 #!/bin/bash
 set -e
 
-source $(dirname $0)/../entry
+source $(dirname $0)/entry
 
-cd $(dirname $0)/../../../../..
+cd $(dirname $0)/../../../..
 
 USE_RANCHER=${USE_RANCHER:-"false"}
 if [ "$USE_RANCHER" = "true" ]; then
diff --git a/.github/workflows/e2e/scripts/hpo/create-projecthelmchart.sh b/.github/workflows/e2e/scripts/hpo-create-projecthelmchart.sh
similarity index 95%
rename from .github/workflows/e2e/scripts/hpo/create-projecthelmchart.sh
rename to .github/workflows/e2e/scripts/hpo-create-projecthelmchart.sh
index f9dcdc10..af1fbbe1 100755
--- a/.github/workflows/e2e/scripts/hpo/create-projecthelmchart.sh
+++ b/.github/workflows/e2e/scripts/hpo-create-projecthelmchart.sh
@@ -1,9 +1,9 @@
 #!/bin/bash
 set -e
 
-source $(dirname $0)/../entry
+source $(dirname $0)/entry
 
-cd $(dirname $0)/../../../../..
+cd $(dirname $0)/../../../..
 
 kubectl apply -f ./examples/helm-project-operator/ci/project-helm-chart.yaml
 sleep ${DEFAULT_SLEEP_TIMEOUT_SECONDS};
diff --git a/.github/workflows/e2e/scripts/hpo/delete-projecthelmchart.sh b/.github/workflows/e2e/scripts/hpo-delete-projecthelmchart.sh
similarity index 91%
rename from .github/workflows/e2e/scripts/hpo/delete-projecthelmchart.sh
rename to .github/workflows/e2e/scripts/hpo-delete-projecthelmchart.sh
index 24cb6f14..bfbb631d 100755
--- a/.github/workflows/e2e/scripts/hpo/delete-projecthelmchart.sh
+++ b/.github/workflows/e2e/scripts/hpo-delete-projecthelmchart.sh
@@ -1,9 +1,9 @@
 #!/bin/bash
 set -e
 
-source $(dirname $0)/../entry
+source $(dirname $0)/entry
 
-cd $(dirname $0)/../../../../..
+cd $(dirname $0)/../../../..
 
 kubectl delete -f ./examples/helm-project-operator/ci/project-helm-chart.yaml
 if kubectl get -n cattle-helm-system job/helm-delete-project-operator-example-chart-dummy --ignore-not-found; then
diff --git a/.github/workflows/e2e/scripts/hpo/install-helm-project-operator.sh b/.github/workflows/e2e/scripts/hpo-install-helm-project-operator.sh
similarity index 96%
rename from .github/workflows/e2e/scripts/hpo/install-helm-project-operator.sh
rename to .github/workflows/e2e/scripts/hpo-install-helm-project-operator.sh
index 395de544..030b68b4 100755
--- a/.github/workflows/e2e/scripts/hpo/install-helm-project-operator.sh
+++ b/.github/workflows/e2e/scripts/hpo-install-helm-project-operator.sh
@@ -1,11 +1,11 @@
 #!/bin/bash
 set -e
 
-source $(dirname $0)/../entry
+source $(dirname $0)/entry
 
-cd $(dirname $0)/../../../../..
+cd $(dirname $0)/../../../..
 
-latest_chart=./charts/helm-project-operator
+latest_chart=./packages/helm-project-operator/charts
 
 case "${KUBERNETES_DISTRIBUTION_TYPE}" in
 "k3s")
diff --git a/.github/workflows/e2e/scripts/hpo/uninstall-helm-project-operator.sh b/.github/workflows/e2e/scripts/hpo-uninstall-helm-project-operator.sh
similarity index 70%
rename from .github/workflows/e2e/scripts/hpo/uninstall-helm-project-operator.sh
rename to .github/workflows/e2e/scripts/hpo-uninstall-helm-project-operator.sh
index 68346e91..ce133162 100755
--- a/.github/workflows/e2e/scripts/hpo/uninstall-helm-project-operator.sh
+++ b/.github/workflows/e2e/scripts/hpo-uninstall-helm-project-operator.sh
@@ -1,9 +1,9 @@
 #!/bin/bash
 set -e
 
-source $(dirname $0)/../entry
+source $(dirname $0)/entry
 
-cd $(dirname $0)/../../../../..
+cd $(dirname $0)/../../../..
 
 helm uninstall --wait -n cattle-helm-system helm-project-operator
 
diff --git a/.github/workflows/e2e/scripts/hpo/validate-helm-project-operator.sh b/.github/workflows/e2e/scripts/hpo-validate-helm-project-operator.sh
similarity index 83%
rename from .github/workflows/e2e/scripts/hpo/validate-helm-project-operator.sh
rename to .github/workflows/e2e/scripts/hpo-validate-helm-project-operator.sh
index d9fc3eba..4baea285 100755
--- a/.github/workflows/e2e/scripts/hpo/validate-helm-project-operator.sh
+++ b/.github/workflows/e2e/scripts/hpo-validate-helm-project-operator.sh
@@ -1,9 +1,9 @@
 #!/bin/bash
 set -e
 
-source $(dirname $0)/../entry
+source $(dirname $0)/entry
 
-cd $(dirname $0)/../../../../..
+cd $(dirname $0)/../../../..
 
 if ! kubectl -n cattle-helm-system rollout status deployment helm-project-operator --timeout="${KUBECTL_WAIT_TIMEOUT}"; then 
     echo "ERROR: Helm Project Operator did not roll out"
diff --git a/.github/workflows/hpo-e2e-ci.yaml b/.github/workflows/hpo-e2e-ci.yaml
index 11ac63d1..9c57855f 100644
--- a/.github/workflows/hpo-e2e-ci.yaml
+++ b/.github/workflows/hpo-e2e-ci.yaml
@@ -85,22 +85,22 @@ jobs:
         with:
           limit-access-to-actor: true
       - name: Install Helm Project Operator
-        run: ./.github/workflows/e2e/scripts/hpo/install-helm-project-operator.sh;
+        run: ./.github/workflows/e2e/scripts/hpo-install-helm-project-operator.sh;
 
       - name: Check if Helm Project Operator is up
-        run: ./.github/workflows/e2e/scripts/hpo/validate-helm-project-operator.sh;
+        run: ./.github/workflows/e2e/scripts/hpo-validate-helm-project-operator.sh;
 
       - name: Check if Project Registration Namespace is auto-created on namespace detection
-        run: ./.github/workflows/e2e/scripts/hpo/create-project-namespace.sh;
+        run: ./.github/workflows/e2e/scripts/hpo-create-project-namespace.sh;
 
       - name: Deploy Example Chart via ProjectHelmChart CR
-        run: ./.github/workflows/e2e/scripts/hpo/create-projecthelmchart.sh;
+        run: ./.github/workflows/e2e/scripts/hpo-create-projecthelmchart.sh;
 
       - name: Delete Example Chart
-        run: ./.github/workflows/e2e/scripts/hpo/delete-projecthelmchart.sh;
+        run: ./.github/workflows/e2e/scripts/hpo-delete-projecthelmchart.sh;
 
       - name: Uninstall Helm Project Operator
-        run: ./.github/workflows/e2e/scripts/hpo/uninstall-helm-project-operator.sh;
+        run: ./.github/workflows/e2e/scripts/hpo-uninstall-helm-project-operator.sh;
 
       - name: Delete k3d cluster
         if: always()
diff --git a/.github/workflows/prom-fed-e2e-ci.yaml b/.github/workflows/prom-fed-e2e-ci.yaml
index f0eda256..0101d168 100644
--- a/.github/workflows/prom-fed-e2e-ci.yaml
+++ b/.github/workflows/prom-fed-e2e-ci.yaml
@@ -139,10 +139,10 @@ jobs:
         run: ./.github/workflows/e2e/scripts/validate-federator.sh;
       -
         name: Check if Project Registration Namespace is auto-created on namespace detection
-        run: ./.github/workflows/e2e/scripts/create-project-namespace.sh;
+        run: ./.github/workflows/e2e/scripts/hpo-create-project-namespace.sh;
       -
         name: Create Project Monitoring Stack via ProjectHelmChart CR
-        run: DEFAULT_SLEEP_TIMEOUT_SECONDS=20 ./.github/workflows/e2e/scripts/create-projecthelmchart.sh;
+        run: DEFAULT_SLEEP_TIMEOUT_SECONDS=20 ./.github/workflows/e2e/scripts/hpo-create-projecthelmchart.sh;
       -
         name: Check if the Project Prometheus Stack is up
         run: ./.github/workflows/e2e/scripts/validate-project-monitoring.sh;
@@ -172,7 +172,7 @@ jobs:
         run: ./.github/workflows/e2e/scripts/validate-project-alertmanager.sh;
       -
         name: Delete Project Prometheus Stack
-        run: ./.github/workflows/e2e/scripts/delete-projecthelmchart.sh;
+        run: ./.github/workflows/e2e/scripts/hpo-delete-projecthelmchart.sh;
       - 
         name: Uninstall Prometheus Federator
         run: ./.github/workflows/e2e/scripts/uninstall-federator.sh;