diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d3fb4a7f5..03015ecd1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,8 +17,8 @@ stages:
 
 variables:
   FDO_UPSTREAM_REPO: 'pipewire/pipewire'
-  BLUEZ_COMMIT: '7cd27f4f66aa88194fbc1565bc13f24405acacd8'
-  PYTEST_BLUEZENV_VERSION: 'pytest-bluezenv==0.1.4'
+  BLUEZ_COMMIT: 'ee4a4775bc4f8348e2a860dc44bcdd7570279908'
+  PYTEST_BLUEZENV_VERSION: 'pytest-bluezenv==0.1.5'
   BLUEZENV_BZIMAGE: 'https://github.com/pv/bluez-test-functional-kernel/releases/download/2026-05-08.1/bzImage-v7.0-cfg3ed20edd'
 
 # ci-templates as of Mar 25th 2024
@@ -41,7 +41,7 @@ include:
 .fedora:
   variables:
     # Update this tag when you want to trigger a rebuild
-    FDO_DISTRIBUTION_TAG: '2026-05-09.8'
+    FDO_DISTRIBUTION_TAG: '2026-05-12.1'
     FDO_DISTRIBUTION_VERSION: '44'
     FDO_DISTRIBUTION_PACKAGES: >-
       alsa-lib-devel
diff --git a/.gitlab/ci/setup-fedora-container.sh b/.gitlab/ci/setup-fedora-container.sh
index e2bf16913..b6a76fc0a 100755
--- a/.gitlab/ci/setup-fedora-container.sh
+++ b/.gitlab/ci/setup-fedora-container.sh
@@ -11,7 +11,7 @@ if [ -n "$FDO_CI_CONCURRENT" ]; then
 fi
 
 # Build BlueZ snapshot for bluetooth VM testing
-git clone --depth 1 --revision "$BLUEZ_COMMIT" https://github.com/bluez/bluez.git /bluez-build
+git clone --depth 1 --revision "$BLUEZ_COMMIT" https://git.kernel.org/pub/scm/bluetooth/bluez.git /bluez-build
 cd /bluez-build
 ./bootstrap
 ./configure --enable-tools --disable-obex --enable-asan --enable-ubsan --enable-debug