diff --git a/.github/configs/ct-install.yaml b/.github/configs/ct-install.yaml
index df00bb1e..d1b3cd36 100644
--- a/.github/configs/ct-install.yaml
+++ b/.github/configs/ct-install.yaml
@@ -2,9 +2,8 @@
 # Don't add the 'debug' attribute, otherwise the workflow won't work anymore
 # Only Used for the CT Install Stage
 remote: origin
-target-branch: main
-chart-dirs:
-  - charts
+charts:
+- charts/argo-cd
 chart-repos:
   - dandydeveloper=https://dandydeveloper.github.io/charts/
 helm-extra-args: "--timeout 600s"  
diff --git a/.github/configs/ct-lint.yaml b/.github/configs/ct-lint.yaml
index 1e66067a..9af3431d 100644
--- a/.github/configs/ct-lint.yaml
+++ b/.github/configs/ct-lint.yaml
@@ -2,9 +2,8 @@
 # Don't add the 'debug' attribute, otherwise the workflow won't work anymore
 # Only Used for the CT Lint Stage
 remote: origin
-target-branch: main
-chart-dirs:
-  - charts
+charts:
+- charts/argo-cd
 chart-repos:
   - dandydeveloper=https://dandydeveloper.github.io/charts/
 helm-extra-args: "--timeout 600s"  
diff --git a/.github/workflows/lint-and-test.yml b/.github/workflows/lint-and-test.yml
index 605c9f9e..5a7e2596 100644
--- a/.github/workflows/lint-and-test.yml
+++ b/.github/workflows/lint-and-test.yml
@@ -35,14 +35,14 @@ jobs:
         id: list-changed
         run: |
           ## If executed with debug this won't work anymore.
-          changed=$(ct --config ./.github/configs/ct-lint.yaml list-changed)
+          changed=$(ct --config ./.github/configs/ct-lint.yaml --target-branch ${{ github.base_ref }} list-changed)
           charts=$(echo "$changed" | tr '\n' ' ' | xargs)
           if [[ -n "$changed" ]]; then
             echo "::set-output name=changed::true"
             echo "::set-output name=changed_charts::$charts"
           fi
       - name: Run chart-testing (lint)
-        run: ct lint --debug --config ./.github/configs/ct-lint.yaml --lint-conf ./.github/configs/lintconf.yaml
+        run: ct lint --debug --config ./.github/configs/ct-lint.yaml --target-branch ${{ github.base_ref }} --lint-conf ./.github/configs/lintconf.yaml
 
       - name: Run docs-testing (helm-docs)
         id: helm-docs
@@ -62,15 +62,6 @@ jobs:
         with:
           config: .github/configs/kind-config.yaml
 
-      - name: Deploy latest ArgoCD CRDs when testing ArgoCD extensions
-        if: |
-          contains(steps.list-changed.outputs.changed_charts, 'argocd-image-updater') ||
-          contains(steps.list-changed.outputs.changed_charts, 'argocd-apps')
-        run: |
-          helm repo add dandydeveloper https://dandydeveloper.github.io/charts/
-          helm dependency build charts/argo-cd/
-          helm template charts/argo-cd/ -s templates/crds/* | kubectl apply -f -
-
       - name: Skip HPA tests of ArgoCD
         if: contains(steps.list-changed.outputs.changed_charts, 'argo-cd')
         run: |
@@ -85,5 +76,5 @@ jobs:
           helm install redis bitnami/redis --wait --namespace redis --set auth.password=argocd --set architecture=standalone
 
       - name: Run chart-testing (install)
-        run: ct install --config ./.github/configs/ct-install.yaml
-        if: steps.list-changed.outputs.changed == 'true'
+        run: ct install --config ./.github/configs/ct-install.yaml --target-branch ${{ github.base_ref }}
+        if: steps.list-changed.outputs.changed == 'true'
\ No newline at end of file
diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml
index 58118915..39f131cb 100644
--- a/charts/argo-cd/Chart.yaml
+++ b/charts/argo-cd/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: v2.4.15
 description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 5.7.0
+version: 5.7.0-cf-init
 home: https://github.com/argoproj/argo-helm
 icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
 sources: