diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5e7ca454..d1efafe6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -143,6 +143,8 @@ build-windows:
   variables:
     DOCKER_HOST: tcp://docker:2375
   script:
+    # We need to install docker because qtdeploy builds for windows inside a docker container.
+    # Docker will connect to the dockerd daemon provided by the runner service docker:dind at tcp://docker:2375.
     - curl -fsSL https://get.docker.com -o get-docker.sh && sh get-docker.sh
     - apt-get update && apt-get -y install binutils-mingw-w64
     - ln -s /usr/bin/x86_64-w64-mingw32-windres /usr/bin/windres
@@ -151,7 +153,7 @@ build-windows:
   artifacts:
     name: "bridge-windows-$CI_COMMIT_SHORT_SHA"
     paths:
-      - bridge_*.tgz
+      - bridge_*.zip
     expire_in: 2 week
 
 mirror-repo:
diff --git a/Makefile b/Makefile
index 0aff29f3..4d033c1e 100644
--- a/Makefile
+++ b/Makefile
@@ -37,8 +37,13 @@ ifeq "${TARGET_OS}" "darwin"
 endif
 EXE_TARGET:=${DEPLOY_DIR}/${TARGET_OS}/${EXE}
 TGZ_TARGET:=bridge_${TARGET_OS}_${REVISION}.tgz
+ZIP_TARGET:=bridge_${TARGET_OS}_${REVISION}.zip
 
+ifeq "${TARGET_OS}" "windows"
+build: ${ZIP_TARGET}
+else
 build: ${TGZ_TARGET}
+endif
 
 build-nogui:
 	go build ${BUILD_FLAGS_NOGUI} -o Desktop-Bridge cmd/Desktop-Bridge/main.go
@@ -47,6 +52,10 @@ ${TGZ_TARGET}: ${DEPLOY_DIR}/${TARGET_OS}
 	rm -f $@
 	cd ${DEPLOY_DIR} && tar czf ../../../$@ ${TARGET_OS}
 
+${ZIP_TARGET}: ${DEPLOY_DIR}/${TARGET_OS}
+	rm -f $@
+	cd ${DEPLOY_DIR} && zip -r ../../../$@ ${TARGET_OS}
+
 ${DEPLOY_DIR}/linux: ${EXE_TARGET}
 	cp -pf ./internal/frontend/share/icons/logo.svg ${DEPLOY_DIR}/linux/
 	cp -pf ./LICENSE ${DEPLOY_DIR}/linux/