diff --git a/add-cluster/Dockerfile b/add-cluster/Dockerfile
index dbbb4b59..5b697946 100644
--- a/add-cluster/Dockerfile
+++ b/add-cluster/Dockerfile
@@ -1,9 +1,17 @@
-FROM bitnami/kubectl:1.24
+FROM bitnami/minideb:bullseye
+
+ARG VERSION="1.24"
+
+RUN apt-get update && \
+    apt-get install -y ca-certificates curl && \
+    curl -fsSLo /usr/share/keyrings/kubernetes-archive-keyring.gpg https://packages.cloud.google.com/apt/doc/apt-key.gpg && \
+    echo "deb [signed-by=/usr/share/keyrings/kubernetes-archive-keyring.gpg] https://apt.kubernetes.io/ kubernetes-xenial main" | tee /etc/apt/sources.list.d/kubernetes.list && \
+    apt-get update && \
+    apt-get install -y kubectl="${VERSION}.*"
 
 WORKDIR /src
 
 COPY add-cluster.sh .
 
-CMD [ "./add-cluster.sh" ]
-
+CMD [ "./add-cluster.sh"]
 ENTRYPOINT [ "bash" ]
diff --git a/csdp/base_components/apps/app-proxy/_components/codefresh-base/app-proxy.deploy.yaml b/csdp/base_components/apps/app-proxy/_components/codefresh-base/app-proxy.deploy.yaml
index 0799f221..2c8a8112 100644
--- a/csdp/base_components/apps/app-proxy/_components/codefresh-base/app-proxy.deploy.yaml
+++ b/csdp/base_components/apps/app-proxy/_components/codefresh-base/app-proxy.deploy.yaml
@@ -51,11 +51,17 @@ spec:
                   name: cap-app-proxy-cm
                   key: argoCdUrl
                   optional: true
-            - name: ARGO_CD_TOKEN
+            - name: ARGO_CD_USERNAME
+              valueFrom:
+                configMapKeyRef:
+                  name: cap-app-proxy-cm
+                  key: argoCdUsername
+                  optional: true
+            - name: ARGO_CD_PASSWORD
               valueFrom:
                 secretKeyRef:
-                  name: argocd-token
-                  key: token
+                  name: argocd-initial-admin-secret
+                  key: password
             - name: ARGO_WORKFLOWS_INSECURE
               valueFrom:
                 configMapKeyRef:
diff --git a/csdp/base_components/apps/app-proxy/_components/codefresh-base/app-proxy.role.yaml b/csdp/base_components/apps/app-proxy/_components/codefresh-base/app-proxy.role.yaml
index 3542a406..cfcc6281 100644
--- a/csdp/base_components/apps/app-proxy/_components/codefresh-base/app-proxy.role.yaml
+++ b/csdp/base_components/apps/app-proxy/_components/codefresh-base/app-proxy.role.yaml
@@ -27,6 +27,14 @@ rules:
     verbs:
       - get
       - list
+  - apiGroups:
+      - "apps"
+    resources:
+      - deployments
+    verbs:
+      - get
+      - list
+      - patch
   - apiGroups:
       - argoproj.io
     resources:
diff --git a/csdp/base_components/apps/app-proxy/_components/codefresh-base/kustomization.yaml b/csdp/base_components/apps/app-proxy/_components/codefresh-base/kustomization.yaml
index 29cac758..0a7be6fc 100644
--- a/csdp/base_components/apps/app-proxy/_components/codefresh-base/kustomization.yaml
+++ b/csdp/base_components/apps/app-proxy/_components/codefresh-base/kustomization.yaml
@@ -3,7 +3,7 @@ kind: Component
 images:
   - name: quay.io/codefresh/cap-app-proxy
     newName: quay.io/codefresh/cap-app-proxy
-    newTag: 1.2033.0
+    newTag: 1.2056.0
 resources:
   - app-proxy.deploy.yaml
   - app-proxy.svc.yaml
diff --git a/csdp/base_components/apps/argo-rollouts/_components/codefresh-base/kustomization.yaml b/csdp/base_components/apps/argo-rollouts/_components/codefresh-base/kustomization.yaml
index 015ca99f..4b303690 100644
--- a/csdp/base_components/apps/argo-rollouts/_components/codefresh-base/kustomization.yaml
+++ b/csdp/base_components/apps/argo-rollouts/_components/codefresh-base/kustomization.yaml
@@ -1,7 +1,7 @@
 apiVersion: kustomize.config.k8s.io/v1alpha1
 kind: Component
 resources:
-  - https://github.com/codefresh-io/argo-rollouts/releases/download/v1.4.0-cap-CR-10626/install.yaml
+  - https://github.com/codefresh-io/argo-rollouts/releases/download/v1.4.0-cap-sw/install.yaml
 patches:
   - target:
       group: apiextensions.k8s.io