diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 11f45725a..7aaf78b84 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,7 +11,7 @@ variables:
   FDO_DISTRIBUTION_TAG: '2021-08-26.0'
 
   # TODO: should probably get its own image at some point instead of reusing the GStreamer one.
-  WINDOWS_IMAGE:             "registry.freedesktop.org/gstreamer/gst-ci/amd64/windows:v16-master"
+  WINDOWS_IMAGE: "registry.freedesktop.org/gstreamer/gstreamer/amd64/windows:2021-10-01.0-master"
 
   DEFAULT_MESON_ARGS: >
     --default-library=both
@@ -246,7 +246,9 @@ fedora meson build:
 
     # Copy GLib from existing subproject cache to avoid downloading it
     - cd $env:CI_PROJECT_DIR
-    - cp -r C:/subprojects/glib subprojects/
+    # FIXME: current windows image is missing the subproject cache,
+    # re-add this once the image has been fixed to include it again
+    # - cp -r C:/subprojects/glib subprojects/
 
     # For some reason, options are separated by newline instead of space, so we
     # have to replace them first.
@@ -309,7 +311,7 @@ meson android arm64 fedora:
       ar          = toolchain + '-ar'
       strip       = toolchain + '-strip'
       EOF
-    - meson setup --cross-file android-cross-file.txt build
+    - meson setup --cross-file android-cross-file.txt -Dpixman:a64-neon=disabled build
     - meson compile --verbose -C build
 
 meson macOS: