diff --git a/docker/Makefile b/docker/Makefile
index 687bdbb..36e2394 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -1,6 +1,6 @@
 all :
 	cp version librewolf
-	make debian10 debian11 fedora34 mint20 ubuntu20
+	make debian10 debian11 fedora34 mint20 ubuntu20 windows
 
 help :
 	@echo "Use: make all clean lw prune mozilla full"
@@ -27,29 +27,34 @@ mozilla :
 
 debian10 :
 	script -O ubuntu20.build.env.log -c "time make -C buildenv/debian10"
-	cp version librewolf/debian10
+	cp version librewolf && cp version librewolf/debian10
 	script -O ubuntu20.build.app.log -c "time make -C librewolf/debian10"
 
 debian11 :
 	script -O ubuntu20.build.env.log -c "time make -C buildenv/debian11"
-	cp version librewolf/debian11
+	cp version librewolf && cp version librewolf/debian11
 	script -O ubuntu20.build.app.log -c "time make -C librewolf/debian11"
 
 fedora34 :
 	script -O ubuntu20.build.env.log -c "time make -C buildenv/fedora34"
-	cp version librewolf/fedora34
+	cp version librewolf && cp version librewolf/fedora34
 	script -O ubuntu20.build.app.log -c "time make -C librewolf/fedora34"
 
 mint20 :
 	script -O ubuntu20.build.env.log -c "time make -C buildenv/mint20"
-	cp version librewolf/mint20
+	cp version librewolf && cp version librewolf/mint20
 	script -O ubuntu20.build.app.log -c "time make -C librewolf/mint20"
 
 ubuntu20 :
 	script -O ubuntu20.build.env.log -c "time make -C buildenv/ubuntu20"
-	cp version librewolf/ubuntu20
+	cp version librewolf && cp version librewolf/ubuntu20
 	script -O ubuntu20.build.app.log -c "time make -C librewolf/ubuntu20"
 
+windows :
+	script -O windows.build.env.log -c "time make -C buildenv/windows"
+	cp version librewolf && cp version librewolf/windows
+	script -O windows.build.app.log -c "time make -C librewolf/windows"
+
 
 
 
@@ -67,6 +72,8 @@ low-disk-full-build :
 	make prunt
 	make ubuntu20
 	make prune
+	make windows
+	make prune
 
 upload-logs :
 	scp *.log vps:pub/pub/librewolf/buildlogs
diff --git a/docker/librewolf/Makefile b/docker/librewolf/Makefile
index 6fd1ade..bb3cc9a 100644
--- a/docker/librewolf/Makefile
+++ b/docker/librewolf/Makefile
@@ -15,7 +15,7 @@ all :
 	make -C fedora34
 	make -C mint20
 	make -C ubuntu20
-
+	make -C windows
 
 clean :
 	rm -f version debian10/version debian11/version fedora34/version ubuntu20/version mint20/version arch/version macos/version windows/version portable-linux/version
@@ -25,23 +25,32 @@ clean :
 	make -C fedora34 clean
 	make -C mint20 clean
 	make -C ubuntu20 clean
+	make -C windows clean
 
 build.debian10 :
+	cp version debian10
 	make -C debian10
 build.debian11 :
+	cp version debian11
 	make -C debian11
 build.fedora34 :
+	cm version fedora34
 	make -C fedora34
 build.mint20 :
+	cp version mint20
 	make -C mint20
 build.ubuntu :
+	cp version ubuntu20
 	make -C ubuntu20
 
 
 build.arch :
+	cp version arch
 	make -C arch
 build.macos :
+	cp version macos
 	make -C macos
 build.windows :
+	cp version windows
 	make -C windows
 
diff --git a/docker/librewolf/windows/Dockerfile b/docker/librewolf/windows/Dockerfile
new file mode 100644
index 0000000..d6dd15f
--- /dev/null
+++ b/docker/librewolf/windows/Dockerfile
@@ -0,0 +1,18 @@
+from mozilla/buildenv-debian11
+run rm -rf mozilla-unified
+
+# Build it..
+copy version /
+run wget -q https://archive.mozilla.org/pub/firefox/releases/$(cat /version)/source/firefox-$(cat /version).source.tar.xz
+
+# dependencies, tools, distro build tools,...
+run apt-get install -y git
+run ## [build trigger] (add or remove a few hashes in front to trigger build from here)
+run git clone --recursive https://gitlab.com/librewolf-community/browser/windows.git
+workdir windows
+run tar xf /firefox-$(cat /version).source.tar.xz
+
+run ./build.py --cross --version $(cat /version) lw_do_patches
+run ./build.py --cross --version $(cat /version) build
+run ./build.py --cross --version $(cat /version) lw_post_build
+run ./build.py --cross --version $(cat /version) package
diff --git a/docker/librewolf/windows/Makefile b/docker/librewolf/windows/Makefile
index b249ac0..0a18cc1 100644
--- a/docker/librewolf/windows/Makefile
+++ b/docker/librewolf/windows/Makefile
@@ -1,5 +1,13 @@
 all :
-	@echo Todo...
+	cp ../version .
+	sudo docker build -t librewolf/release-windows .
+#	make -C deb all
 
 no-cache :
-	@echo Todo...
+	cp ../version .
+	sudo docker build --no-cache -t librewolf/release-windows .
+#	make -C deb no-cache
+
+clean :
+	rm -f version
+#	make -C deb clean