diff --git a/.github/workflows/release-pullrequest-AKS-installer-chart.yaml b/.github/workflows/release-pullrequest-AKS-installer-chart.yaml
index 25eebab..80fd65a 100644
--- a/.github/workflows/release-pullrequest-AKS-installer-chart.yaml
+++ b/.github/workflows/release-pullrequest-AKS-installer-chart.yaml
@@ -84,6 +84,9 @@ jobs:
       - name: Replace APP_VERSION in ./${{ env.MODULE }}-chart/Chart.yaml
         run: sed -i 's/APP_VERSION/${{ env.APP_VERSION }}/g' ./${{ env.MODULE }}-chart/Chart.yaml
 
+      - name: Replace CHART_VERSION in ./${{ env.MODULE }}-pre-upgrade-chart/Chart.yaml
+        run: sed -i 's/CHART_VERSION/${{ env.CHART_VERSION }}/g' ./${{ env.MODULE }}-pre-upgrade-chart/Chart.yaml
+
       - name: Set up Helm
         uses: azure/setup-helm@v4.1.0
 
@@ -165,7 +168,7 @@ jobs:
             agentPoolProfiles:
               - name: systempool
                 count: 2
-                vmSize: Standard_DS2_v2
+                vmSize: Standard_D4s_v3
                 mode: System
             operatorSpec:
               secrets:
@@ -204,6 +207,10 @@ jobs:
         run: |
           kubectl get crd \
             --kubeconfig=managedcluster-$K8S_VERSION_NODOT-kubeconfig.yaml
+    
+      - name: Build local dependencies charts
+        run: |
+          helm dependency build ./${{ env.MODULE }}-chart
 
       - name: Install ${{ env.MODULE }} chart
         run: |
diff --git a/.github/workflows/release-pullrequest-OpenShift-installer-chart.yaml b/.github/workflows/release-pullrequest-OpenShift-installer-chart.yaml
index 445e6ff..3233f68 100644
--- a/.github/workflows/release-pullrequest-OpenShift-installer-chart.yaml
+++ b/.github/workflows/release-pullrequest-OpenShift-installer-chart.yaml
@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        k8s_version: [ "4.16.30" ]
+        k8s_version: [ "4.19.20" ]
 
     steps:
       - name: Authenticate with GitHub App
@@ -84,6 +84,9 @@ jobs:
       - name: Replace APP_VERSION in ./${{ env.MODULE }}-chart/Chart.yaml
         run: sed -i 's/APP_VERSION/${{ env.APP_VERSION }}/g' ./${{ env.MODULE }}-chart/Chart.yaml
 
+      - name: Replace CHART_VERSION in ./${{ env.MODULE }}-pre-upgrade-chart/Chart.yaml
+        run: sed -i 's/CHART_VERSION/${{ env.CHART_VERSION }}/g' ./${{ env.MODULE }}-pre-upgrade-chart/Chart.yaml
+
       - name: Set up Helm
         uses: azure/setup-helm@v4.1.0
 
@@ -349,6 +352,10 @@ jobs:
           kubectl get crd \
             --kubeconfig=openshiftcluster-$K8S_VERSION_NODOT-kubeconfig.yaml --insecure-skip-tls-verify=true
 
+      - name: Build local dependencies charts
+        run: |
+          helm dependency build ./${{ env.MODULE }}-chart
+
       - name: Install ${{ env.MODULE }} chart
         run: |
           helm install ${{ env.MODULE }} ./${{ env.MODULE }}-chart \
diff --git a/.github/workflows/release-pullrequest-kind-installer-chart-upgrade.yaml b/.github/workflows/release-pullrequest-kind-installer-chart-upgrade.yaml
index 07c233c..1c5d030 100644
--- a/.github/workflows/release-pullrequest-kind-installer-chart-upgrade.yaml
+++ b/.github/workflows/release-pullrequest-kind-installer-chart-upgrade.yaml
@@ -84,6 +84,9 @@ jobs:
 
       - name: Replace APP_VERSION in ./${{ env.MODULE }}-chart/Chart.yaml
         run: sed -i 's/APP_VERSION/${{ env.APP_VERSION }}/g' ./${{ env.MODULE }}-chart/Chart.yaml
+      
+      - name: Replace CHART_VERSION in ./${{ env.MODULE }}-pre-upgrade-chart/Chart.yaml
+        run: sed -i 's/CHART_VERSION/${{ env.CHART_VERSION }}/g' ./${{ env.MODULE }}-pre-upgrade-chart/Chart.yaml
 
       - name: Set up Helm
         uses: azure/setup-helm@v4.1.0
@@ -103,6 +106,10 @@ jobs:
           helm repo update krateo
           helm install ${{ env.MODULE }}-crd krateo/${{ env.MODULE }}-crd --create-namespace -n krateo-system --wait --timeout=120s
 
+      - name: Build local dependencies charts
+        run: |
+          helm dependency build ./${{ env.MODULE }}-chart
+
       - name: Install ${{ env.MODULE }} previous chart
         run: |
           helm install ${{ env.MODULE }} krateo/${{ env.MODULE }} --create-namespace -n krateo-system --wait
diff --git a/.github/workflows/release-pullrequest-kind-installer-chart.yaml b/.github/workflows/release-pullrequest-kind-installer-chart.yaml
index 4d492e0..810f68b 100644
--- a/.github/workflows/release-pullrequest-kind-installer-chart.yaml
+++ b/.github/workflows/release-pullrequest-kind-installer-chart.yaml
@@ -106,18 +106,9 @@ jobs:
           helm repo update krateo
           helm install ${{ env.MODULE }}-crd krateo/${{ env.MODULE }}-crd --create-namespace -n krateo-system --wait --timeout=120s
 
-      - name: Package local dependency
+      - name: Build local dependencies charts
         run: |
-          # 1. Create the charts/ directory inside your main chart
-          mkdir -p ./${{ env.MODULE }}-chart/charts
-          
-          # 2. Package the pre-upgrade chart from its local folder
-          # Assuming the folder is in the root of the workspace
-          # We place the resulting .tgz directly into the main chart's 'charts' folder
-          helm package ./${{ env.MODULE }}-pre-upgrade-chart --destination ./${{ env.MODULE }}-chart/charts/
-          
-          # 3. List files to verify the .tgz is there (for debugging)
-          ls -R ./${{ env.MODULE }}-chart/charts/
+          helm dependency build ./${{ env.MODULE }}-chart
 
       - name: Install ${{ env.MODULE }} chart
         run: |
diff --git a/.github/workflows/release-tag-kind-installer-chart.yaml b/.github/workflows/release-tag-kind-installer-chart.yaml
index 3da3889..5b8ba00 100644
--- a/.github/workflows/release-tag-kind-installer-chart.yaml
+++ b/.github/workflows/release-tag-kind-installer-chart.yaml
@@ -81,6 +81,9 @@ jobs:
       - name: Replace APP_VERSION in ./${{ env.MODULE }}-chart/Chart.yaml
         run: sed -i 's/APP_VERSION/${{ env.APP_VERSION }}/g' ./${{ env.MODULE }}-chart/Chart.yaml
 
+      - name: Replace CHART_VERSION in ./${{ env.MODULE }}-pre-upgrade-chart/Chart.yaml
+        run: sed -i 's/CHART_VERSION/${{ env.CHART_VERSION }}/g' ./${{ env.MODULE }}-pre-upgrade-chart/Chart.yaml
+
       - name: Set up Helm
         uses: azure/setup-helm@v4.1.0
 
@@ -99,6 +102,10 @@ jobs:
           helm repo update krateo
           helm install ${{ env.MODULE }}-crd krateo/${{ env.MODULE }}-crd --create-namespace -n krateo-system --wait --timeout=120s
 
+      - name: Build local dependencies charts
+        run: |
+          helm dependency build ./${{ env.MODULE }}-chart
+
       - name: Install ${{ env.MODULE }} chart
         run: |
           helm install ${{ env.MODULE }} ./${{ env.MODULE }}-chart --create-namespace -n krateo-system --wait
diff --git a/installer-chart/Chart.yaml b/installer-chart/Chart.yaml
index d6eded8..5b4bd15 100644
--- a/installer-chart/Chart.yaml
+++ b/installer-chart/Chart.yaml
@@ -32,4 +32,4 @@ sources:
 dependencies:
 - name: installer-pre-upgrade
   version: CHART_VERSION
-  repository: "https://charts.krateo.io"
\ No newline at end of file
+  repository: file://../installer-pre-upgrade-chart
\ No newline at end of file