diff --git a/Makefile b/Makefile
index a1d21b080..f81d2ad40 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION=v0.0.23
+VERSION=v0.0.24
 OUT_DIR=dist
 YEAR?=$(shell date +"%Y")
 
diff --git a/docs/releases/release_notes.md b/docs/releases/release_notes.md
index 072ddd65b..6b848e7b0 100644
--- a/docs/releases/release_notes.md
+++ b/docs/releases/release_notes.md
@@ -8,7 +8,7 @@
 ### Linux
 ```bash
 # download and extract the binary
-curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.21/cf-linux-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.24/cf-linux-amd64.tar.gz | tar zx
 
 # move the binary to your $PATH
 mv ./cf-* /usr/local/bin/cf
@@ -20,7 +20,7 @@ cf version
 ### Mac
 ```bash
 # download and extract the binary
-curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.21/cf-darwin-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.24/cf-darwin-amd64.tar.gz | tar zx
 
 # move the binary to your $PATH
 mv ./cf-* /usr/local/bin/cf
diff --git a/manifests/argo-rollouts/kustomization.yaml b/manifests/argo-rollouts/kustomization.yaml
index bfef0d2a4..894323add 100644
--- a/manifests/argo-rollouts/kustomization.yaml
+++ b/manifests/argo-rollouts/kustomization.yaml
@@ -3,10 +3,20 @@ kind: Kustomization
 resources:
   - https://github.com/argoproj/argo-rollouts/releases/download/v1.0.2/install.yaml
 patches:
-  - patch: |-
-      - op: remove
-        path: /spec/preserveUnknownFields
-    target:
+  - target:
       group: apiextensions.k8s.io
       version: v1
       kind: CustomResourceDefinition
+    patch: |-
+      - op: remove
+        path: /spec/preserveUnknownFields
+
+  # reset the crbs to `subject.namespace: default`, so that argo-rollouts will later change them to the actual ns
+  - target:
+      group: rbac.authorization.k8s.io
+      version: v1
+      kind: ClusterRoleBinding
+    patch: |-
+      - op: replace
+        path: /subjects/0/namespace
+        value: default
diff --git a/manifests/argo-workflows/kustomization.yaml b/manifests/argo-workflows/kustomization.yaml
index 3bc50b9ac..93f5b66e5 100644
--- a/manifests/argo-workflows/kustomization.yaml
+++ b/manifests/argo-workflows/kustomization.yaml
@@ -2,3 +2,14 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - https://raw.githubusercontent.com/argoproj/argo-workflows/v3.1.1/manifests/install.yaml
+
+patches:
+  # reset the crbs to `subject.namespace: default`, so that argo-workflows will later change them to the actual ns
+  - target:
+      group: rbac.authorization.k8s.io
+      version: v1
+      kind: ClusterRoleBinding
+    patch: |-
+      - op: replace
+        path: /subjects/0/namespace
+        value: default