diff --git a/CHANGELOG.md b/CHANGELOG.md
index b5ab0ec7..32bd5cb7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,25 +1,37 @@
 # Changelog:
 
+# v0.4.11
+
+- [fix] Cannot bootstrap on windows [#221](https://github.com/argoproj-labs/argocd-autopilot/issues/221)
+- [chore] bump github.com/argoproj/argo-cd/v2 to 2.5.9 [#416](https://github.com/argoproj-labs/argocd-autopilot/pull/416)
+
 # v0.4.10
+
 - [fix] Fail early on `repo bootstrap` when there is no repo write permission [#409](https://github.com/argoproj-labs/argocd-autopilot/pull/409)
 
 # v0.4.9
+
 - [fix] fix nil pointer deref in provider code when there are network errors [#403](https://github.com/argoproj-labs/argocd-autopilot/pull/403)
 
 # v0.4.8
+
 - [chore] bumped argo-cd to 2.5.2, removed applicationset pkg (already in argo-cd), updated golang to 1.19 [#394](https://github.com/argoproj-labs/argocd-autopilot/pull/394)
 - [fix] add support for git servers with self-signed certificates [#392](https://github.com/argoproj-labs/argocd-autopilot/pull/392)
 
 # v0.4.7
+
 - [fix] 0.4.6 fix caused a regression when `--repo` contained path and/or ref [#375](https://github.com/argoproj-labs/argocd-autopilot/pull/375)
 
 # v0.4.6
+
 - [fix] When creating a new repo, sometimes getDefaultBranch fails [#372](https://github.com/argoproj-labs/argocd-autopilot/issues/372)
 
 # v0.4.5
+
 - Added support for bitbucket cloud
 
 # v0.4.4
+
 - [fix] find GitLab group by name, instead of searching in 1st page of list
 
 # v0.4.3
diff --git a/Makefile b/Makefile
index 29eb00c2..a1ba3f2b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION=v0.4.10
+VERSION=v0.4.11
 OUT_DIR=dist
 
 CLI_NAME?=argocd-autopilot
@@ -68,11 +68,16 @@ cli-package: $(OUT_DIR)/$(CLI_NAME)-$(shell go env GOOS)-$(shell go env GOARCH)
 $(OUT_DIR)/$(CLI_NAME)-linux-amd64: GO_FLAGS='GOOS=linux GOARCH=amd64 CGO_ENABLED=0'
 $(OUT_DIR)/$(CLI_NAME)-darwin-amd64: GO_FLAGS='GOOS=darwin GOARCH=amd64 CGO_ENABLED=0'
 $(OUT_DIR)/$(CLI_NAME)-darwin-arm64: GO_FLAGS='GOOS=darwin GOARCH=arm64 CGO_ENABLED=0'
-$(OUT_DIR)/$(CLI_NAME)-windows-amd64: GO_FLAGS='GOOS=windows GOARCH=amd64 CGO_ENABLED=0'
+$(OUT_DIR)/$(CLI_NAME)-windows-amd64.exe: GO_FLAGS='GOOS=windows GOARCH=amd64 CGO_ENABLED=0'
 $(OUT_DIR)/$(CLI_NAME)-linux-arm64: GO_FLAGS='GOOS=linux GOARCH=arm64 CGO_ENABLED=0'
 $(OUT_DIR)/$(CLI_NAME)-linux-ppc64le: GO_FLAGS='GOOS=linux GOARCH=ppc64le CGO_ENABLED=0'
 $(OUT_DIR)/$(CLI_NAME)-linux-s390x: GO_FLAGS='GOOS=linux GOARCH=s390x CGO_ENABLED=0'
 
+# special target for windows, to add the ".exe" extension at the end
+$(OUT_DIR)/$(CLI_NAME)-windows-amd64.tar.gz:
+	@make $(OUT_DIR)/$(CLI_NAME)-windows-amd64.exe
+	cd $(OUT_DIR) && tar -czvf $(CLI_NAME)-windows-amd64.tar.gz $(CLI_NAME)-windows-amd64.exe && cd ..
+
 $(OUT_DIR)/$(CLI_NAME)-%.tar.gz:
 	@make $(OUT_DIR)/$(CLI_NAME)-$*
 	cd $(OUT_DIR) && tar -czvf $(CLI_NAME)-$*.tar.gz $(CLI_NAME)-$* && cd ..
diff --git a/docs/releases/release_notes.md b/docs/releases/release_notes.md
index f3efab6c..76721442 100644
--- a/docs/releases/release_notes.md
+++ b/docs/releases/release_notes.md
@@ -1,10 +1,11 @@
 ### Changes
 
-- [fix] Fail early on `repo bootstrap` when there is no repo write permission [#409](https://github.com/argoproj-labs/argocd-autopilot/pull/409)
+- [fix] Cannot bootstrap on windows [#221](https://github.com/argoproj-labs/argocd-autopilot/issues/221)
+- [chore] bump github.com/argoproj/argo-cd/v2 to 2.5.9 [#416](https://github.com/argoproj-labs/argocd-autopilot/pull/416)
 
 ### Contributors:
 
-- Kim Aharfi ([@kim-codefresh](https://github.com/kim-codefresh))
+- Noam Gal ([@noam-codefresh](https://github.com/noam-codefresh))
 
 ## Installation:
 
@@ -47,7 +48,7 @@ argocd-autopilot version
 
 ```bash
 # download and extract the binary
-curl -L --output - https://github.com/argoproj-labs/argocd-autopilot/releases/download/v0.4.10/argocd-autopilot-linux-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/argoproj-labs/argocd-autopilot/releases/download/v0.4.11/argocd-autopilot-linux-amd64.tar.gz | tar zx
 
 # move the binary to your $PATH
 mv ./argocd-autopilot-* /usr/local/bin/argocd-autopilot
@@ -60,7 +61,7 @@ argocd-autopilot version
 
 ```bash
 # download and extract the binary
-curl -L --output - https://github.com/argoproj-labs/argocd-autopilot/releases/download/v0.4.10/argocd-autopilot-darwin-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/argoproj-labs/argocd-autopilot/releases/download/v0.4.11/argocd-autopilot-darwin-amd64.tar.gz | tar zx
 
 # move the binary to your $PATH
 mv ./argocd-autopilot-* /usr/local/bin/argocd-autopilot
@@ -77,5 +78,5 @@ When using the Docker image, you have to provide the `.kube` and `.gitconfig` di
 docker run \
   -v ~/.kube:/home/autopilot/.kube \
   -v ~/.gitconfig:/home/autopilot/.gitconfig \
-  -it quay.io/argoprojlabs/argocd-autopilot:v0.4.10 <cmd> <flags>
+  -it quay.io/argoprojlabs/argocd-autopilot:v0.4.11 <cmd> <flags>
 ```