diff --git a/CODEOWNERS b/CODEOWNERS
index 89be8ca1..b0e7e47d 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1 +1 @@
-* daniel.maizel@codefresh.io roi.kramer@codefresh.io oren.gurfinkel@codefresh.io itai@codefresh.io noam.gal@codefresh.io pavel@codefresh.io ziv@codefresh.io
+* daniel.maizel@codefresh.io roi.kramer@codefresh.io itai@codefresh.io noam.gal@codefresh.io pavel@codefresh.io ziv@codefresh.io daniel.soifer@codefresh.io victor.khazanov@codefresh.io denis@codefresh.io yaroslav@codefresh.io
diff --git a/VERSION b/VERSION
index baa98378..6cd32861 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.1.20
+0.1.21
\ No newline at end of file
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 0a7be6fc..9e1c2bf9 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.2056.0
+    newTag: 1.2081.0
 resources:
   - app-proxy.deploy.yaml
   - app-proxy.svc.yaml
diff --git a/csdp/base_components/apps/argo-cd/_components/base-manifests/kustomization.yaml b/csdp/base_components/apps/argo-cd/_components/base-manifests/kustomization.yaml
index a63d3d10..7344a9bb 100644
--- a/csdp/base_components/apps/argo-cd/_components/base-manifests/kustomization.yaml
+++ b/csdp/base_components/apps/argo-cd/_components/base-manifests/kustomization.yaml
@@ -1,4 +1,4 @@
 apiVersion: kustomize.config.k8s.io/v1alpha1
 kind: Component
 resources:
-- https://raw.githubusercontent.com/codefresh-io/argo-cd/release-2.4/manifests/install.yaml
+- https://raw.githubusercontent.com/codefresh-io/argo-cd/release-2.5/manifests/install.yaml
diff --git a/csdp/base_components/apps/argo-cd/_components/codefresh-base/kustomization.yaml b/csdp/base_components/apps/argo-cd/_components/codefresh-base/kustomization.yaml
index 8f835096..d57f34ad 100644
--- a/csdp/base_components/apps/argo-cd/_components/codefresh-base/kustomization.yaml
+++ b/csdp/base_components/apps/argo-cd/_components/codefresh-base/kustomization.yaml
@@ -5,7 +5,7 @@ resources:
 
 images:
   - name: quay.io/codefresh/argocd
-    newTag: v2.4.15-cap-CR-15677-rollout-rollback
+    newTag: v2.5.5-cap-CR-fix-kustomize-v3
   - name: quay.io/codefresh/applicationset
     newTag: v0.4.2-CR-13254-remove-private-logs
 
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
diff --git a/csdp/base_components/bootstrap/kustomization.yaml b/csdp/base_components/bootstrap/kustomization.yaml
index 5118914a..d62bb23f 100644
--- a/csdp/base_components/bootstrap/kustomization.yaml
+++ b/csdp/base_components/bootstrap/kustomization.yaml
@@ -9,8 +9,8 @@ configMapGenerator:
   - name: codefresh-cm
     behavior: create
     literals: # order matters - DO NOT change
-      - version=0.1.20 # Runtime version
-      - bootstrapRevision=0.1.20 # Tag to use for bootstrap (change this to the name of your branch if you want to test changes)
+      - version=0.1.21 # Runtime version
+      - bootstrapRevision=0.1.21 # Tag to use for bootstrap (change this to the name of your branch if you want to test changes)
       - appsetRequeueTime=15
 replacements:
   # template the version from the configmap into the applicationset generators
diff --git a/csdp/hybrid/basic/runtime.yaml b/csdp/hybrid/basic/runtime.yaml
index 6f9ee187..bdb5a181 100644
--- a/csdp/hybrid/basic/runtime.yaml
+++ b/csdp/hybrid/basic/runtime.yaml
@@ -5,7 +5,7 @@ metadata:
   namespace: "{{ namespace }}"
 spec:
   requiredCLIVersion: ^0.1.0
-  version: 0.1.20
+  version: 0.1.21
   bootstrapSpecifier: github.com/codefresh-io/csdp-official/csdp/hybrid/basic/apps/argo-cd
   components:
     - name: events