diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ae17230..0bbdc22 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,11 +3,12 @@ stages:
   - build
   - release
 
-Build Docker Images:
+# Notes; we want short labes so we can see what is what, and
+# allow image builds on all branches because don't wan to
+# deal with them on the master branch
+Images:
   stage: images
   when: manual
-  only:
-    - master
   image: registry.gitlab.com/librewolf-community/browser/bsys5/dind
   tags: [autoscale]
   parallel:
@@ -23,7 +24,6 @@ Build Docker Images:
           - macos-x86_64
           - macos-aarch64
           - dind
-          - windows
   script:
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD registry.gitlab.com
     - make docker-$DISTRO
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..04d6895
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "submodules/windows"]
+	path = submodules/windows
+	url = https://gitlab.com/librewolf-community/browser/windows.git
diff --git a/README.md b/README.md
index a3c7211..95fdb55 100644
--- a/README.md
+++ b/README.md
@@ -35,3 +35,4 @@ repository. Then you can just build the target you want with:
 This will pull a prebuilt build environment from
 [this repository](https://gitlab.com/librewolf-community/browser/bsys5/container_registry).
 If you also want to build that yourself, run `make docker-<TARGET>` first.
+
diff --git a/assets/linux.Dockerfile b/assets/linux.Dockerfile
index 252611b..cbe751e 100644
--- a/assets/linux.Dockerfile
+++ b/assets/linux.Dockerfile
@@ -20,7 +20,7 @@ RUN ( zypper -n in mercurial python3 python3-pip python3-devel wget rpm-build ;
 
 # run the bootstrap
 RUN cd /tmp &&\
-    wget -q -O librewolf-$version-$source_release.source.tar.gz https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-$version-$source_release.source.tar.gz?job=Build &&\
+    wget -q -O librewolf-$version-$source_release.source.tar.gz https://gitlab.com/api/v4/projects/32320088/packages/generic/librewolf-source/$version-$source_release/librewolf-$version-$source_release.source.tar.gz &&\
     tar xf librewolf-$version-$source_release.source.tar.gz &&\
     cd librewolf-$version-$source_release &&\
     MOZBUILD_STATE_PATH=$HOME/.mozbuild ./mach --no-interactive bootstrap --application-choice=browser &&\
diff --git a/assets/macos.Dockerfile b/assets/macos.Dockerfile
index 7bcfc5d..6fe3750 100644
--- a/assets/macos.Dockerfile
+++ b/assets/macos.Dockerfile
@@ -24,7 +24,7 @@ RUN mkdir -p /osx-cross/MacOSX-SDKs &&\
     rm -f MacOSX11.3.sdk.tar.xz
 
 # run the bootstrap
-RUN wget -q -O librewolf-$version-$source_release.source.tar.gz https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-$version-$source_release.source.tar.gz?job=Build
+RUN wget -q -O librewolf-$version-$source_release.source.tar.gz https://gitlab.com/api/v4/projects/32320088/packages/generic/librewolf-source/$version-$source_release/librewolf-$version-$source_release.source.tar.gz
 RUN tar xf librewolf-$version-$source_release.source.tar.gz
 WORKDIR librewolf-$version-$source_release
 RUN echo ac_add_options --target=$arch-apple-darwin > mozconfig
@@ -44,7 +44,7 @@ RUN cp -r cctools /root/.mozbuild
 RUN cp -r sysroot-wasm32-wasi /root/.mozbuild
 ## RUN cp -r clang /root/.mozbuild
 RUN cp -r dmg /root/.mozbuild
-RUN cp -r hfsplus-tools /root/.mozbuild
+# RUN cp -r hfsplus-tools /root/.mozbuild
 RUN pip install testresources pycairo
 WORKDIR ..
 RUN rm -rf librewolf-$version-$source_release librewolf-$version-$source_release.source.tar.gz
diff --git a/assets/macos.mozconfig b/assets/macos.mozconfig
index 180e0d9..4fef1be 100644
--- a/assets/macos.mozconfig
+++ b/assets/macos.mozconfig
@@ -22,7 +22,7 @@ export HOST_CC="$CROSS/clang/bin/clang"
 export HOST_CXX="$CROSS/clang/bin/clang++"
 
 # These are needed for packaging.
-export MKFSHFS="$CROSS/hfsplus-tools/newfs_hfs"
+# export MKFSHFS="$CROSS/hfsplus-tools/newfs_hfs"
 export DMG_TOOL="$CROSS/dmg/dmg"
 export HFS_TOOL="$CROSS/dmg/hfsplus"
 
diff --git a/submodules/windows b/submodules/windows
new file mode 160000
index 0000000..33821c6
--- /dev/null
+++ b/submodules/windows
@@ -0,0 +1 @@
+Subproject commit 33821c61665f96aaec2847c740c7e322b629d7da
diff --git a/windows b/windows
deleted file mode 160000
index 5111065..0000000
--- a/windows
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 51110653120b2c84ee9412d21f8e8c3744f70b12