diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7aaf78b84..58bb56889 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,8 +10,9 @@ variables:
   FDO_DISTRIBUTION_VERSION: '34'
   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/gstreamer/amd64/windows:2021-10-01.0-master"
+  # TODO: should probably get its own image at some point instead of reusing the GStreamer one
+  # See https://gitlab.freedesktop.org/gstreamer/gstreamer/container_registry/18035 for latest
+  WINDOWS_IMAGE: "registry.freedesktop.org/gstreamer/gstreamer/amd64/windows:2021-10-04.1-main"
 
   DEFAULT_MESON_ARGS: >
     --default-library=both
@@ -220,7 +221,7 @@ fedora meson build:
     paths:
       - 'builddir/meson-logs/'
 
-# Based on https://gitlab.freedesktop.org/gstreamer/gst-ci/-/blob/master/gitlab/ci_template.yml
+# Based on https://gitlab.freedesktop.org/gstreamer/gstreamer/-/blob/main/.gitlab-ci.yml (.build windows)
 .build meson windows:
   image: $WINDOWS_IMAGE
   stage: 'build'
@@ -246,9 +247,7 @@ fedora meson build:
 
     # Copy GLib from existing subproject cache to avoid downloading it
     - cd $env:CI_PROJECT_DIR
-    # 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/
+    - cp -r C:/subprojects/glib subprojects/
 
     # For some reason, options are separated by newline instead of space, so we
     # have to replace them first.
@@ -273,8 +272,9 @@ meson vs2017 x86:
     ARCH: 'x86'
 
 meson android arm64 fedora:
-  # See https://gitlab.freedesktop.org/gstreamer/gst-ci/container_registry/164 for current images
-  image: 'registry.freedesktop.org/gstreamer/gst-ci/amd64/android-fedora:2020-10-22.0-master'
+  # TODO: should probably build our own image here some day
+  # See https://gitlab.freedesktop.org/gstreamer/gstreamer/container_registry/7689 for current images
+  image: 'registry.freedesktop.org/gstreamer/gstreamer/amd64/android-fedora:2020-10-22.0-master'
   stage: 'build'
   artifacts:
     name: "${CI_JOB_NAME}_${CI_COMMIT_SHA}"