diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c8d7747..ae17230 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -45,11 +45,7 @@ Build:
           - fedora36
           - macos-x86_64
           - macos-aarch64
-
-# For Windows, we wanted to use $DISTRO here, but that didn't work
-# remove this note once finishing it. 
-#  image: registry.gitlab.com/librewolf-community/browser/bsys5/$DISTRO
-
+          - windows
   image: registry.gitlab.com/librewolf-community/browser/bsys5/dind
   tags:
     - autoscale
@@ -69,31 +65,12 @@ Build:
       - librewolf-*.rpm.sha256sum
       - librewolf-*.dmg
       - librewolf-*.dmg.sha256sum
-    reports:
-      dotenv: variables.env
-
-# We do windows seperately for the moment, even tho
-# the only real difference is the use of the docker image.
-
-BuildWindows:
-  stage: build
-  when: manual
-  allow_failure: false
-  image: registry.gitlab.com/librewolf-community/browser/bsys5/windows
-  tags:
-    - autoscale
-  script:
-    - make windows # was: make $DISTRO
-    - echo VERSION=$(cat version) >> variables.env
-    - echo RELEASE=$(cat release) >> variables.env
-    - echo SOURCE_RELEASE=$(cat source_release) >> variables.env
-    - "t=$(cat version)-$(cat source_release) ; grep 1 release ; if [ ! $? ]; then t=$(cat version)-$(cat source_release)-$(cat release); fi; echo FILEVER=$t >> variables.env"
-  artifacts:
-    paths:
       - librewolf-*-setup.exe
       - librewolf-*-setup.exe.sha256sum
       - librewolf-*-portable.zip
       - librewolf-*-portable.zip.sha256sum
+    reports:
+      dotenv: variables.env
 
 Release:
   stage: release
diff --git a/Makefile b/Makefile
index ab87398..d3ff0b4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-.PHONY : help clean veryclean prune docker push rmi build update work docker-debian11 debian11 docker-mint20 mint20 docker-mint21 mint21 docker-ubuntu20 ubuntu20 docker-ubuntu21 ubuntu21 docker-ubuntu22 ubuntu22 docker-fedora37 fedora37 docker-fedora36 fedora36 docker-macos-x86_64 macos-x86_64 docker-macos-aarch64 macos-aarch64 docker-tumbleweed tumbleweed tarball docker-dind
+.PHONY : help clean veryclean prune docker push rmi build update work docker-debian11 debian11 docker-mint20 mint20 docker-mint21 mint21 docker-ubuntu20 ubuntu20 docker-ubuntu21 ubuntu21 docker-ubuntu22 ubuntu22 docker-fedora37 fedora37 docker-fedora36 fedora36 docker-macos-x86_64 macos-x86_64 docker-macos-aarch64 macos-aarch64 docker-tumbleweed tumbleweed tarball docker-dind windows
 
 version:=$(shell cat version)
 release:=$(shell cat release)
diff --git a/README.md b/README.md
index 4065e7b..a3c7211 100644
--- a/README.md
+++ b/README.md
@@ -9,16 +9,16 @@ scripts.
 
 ## <a id="targets"></a> Supported Targets
 
-| Platform          | x86_64                  | aarch64            |
-| ----------------- | ----------------------- | ------------------ |
-| Linux             |                         |                    |
-| └─ Debian (deb)   | ✅ (debian11)           | -                  |
-| └─ Ubuntu (deb)   | ✅ (ubuntu20, ubuntu22) | -                  |
-| └─ Mint (deb)     | ✅ (mint20, mint21)     | -                  |
-| └─ Fedora (rpm)   | ✅ (fedora36, fedora37) | -                  |
-| └─ openSUSE (rpm) | ✅ (tumbleweed)         | -                  |
-| MacOS (dmg)       | ✅ (macos-x64_64)       | ✅ (macos-aarch64) |
-| Windows           | _WIP_                   | -                  |
+| Platform                 | x86_64                  | aarch64            |
+| ------------------------ | ----------------------- | ------------------ |
+| Linux                    |                         |                    |
+| └─ Debian (deb)          | ✅ (debian11)           | -                  |
+| └─ Ubuntu (deb)          | ✅ (ubuntu20, ubuntu22) | -                  |
+| └─ Mint (deb)            | ✅ (mint20, mint21)     | -                  |
+| └─ Fedora (rpm)          | ✅ (fedora36, fedora37) | -                  |
+| └─ openSUSE (rpm)        | ✅ (tumbleweed)         | -                  |
+| MacOS (dmg)              | ✅ (macos-x64_64)       | ✅ (macos-aarch64) |
+| Windows (setup,portable) | ✅ (windows)            | -                  |
 
 ## Running bsys5 Locally
 
diff --git a/assets/windows.mk b/assets/windows.mk
index 9e32a4b..3d9c0a8 100644
--- a/assets/windows.mk
+++ b/assets/windows.mk
@@ -25,11 +25,15 @@ build :
 	rm -rf windows
 	git clone https://gitlab.com/librewolf-community/browser/windows.git
 
-	( cd windows/linux && \
-	  pwd && \
-	  ${MAKE} fetch && \
-	  ${MAKE} all && \
-	  cp -v $(outfiles) ../.. )
+	( cd windows/linux && pwd && ${MAKE} fetch )
+
+ifeq ($(use_docker),false)
+	( cd windows/linux && ${MAKE} )
+else
+	docker run --rm -v $(shell pwd)/work:/work:rw registry.gitlab.com/librewolf-community/browser/bsys5/$(distro) sh -c "${MAKE} all"
+endif
+
+	cp -v windows/linux/$(outfiles) .
 
 	sha256sum $(outfile-exe) > $(outfile-exe).sha256sum
 	cat $(outfile-exe).sha256sum
diff --git a/windows b/windows
new file mode 160000
index 0000000..5111065
--- /dev/null
+++ b/windows
@@ -0,0 +1 @@
+Subproject commit 51110653120b2c84ee9412d21f8e8c3744f70b12