diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a3017fa4..c2bbafe6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -43,7 +43,7 @@
 variables:
   FDO_UPSTREAM_REPO: wayland/weston
   FDO_REPO_SUFFIX: "$BUILD_OS/$BUILD_ARCH"
-  FDO_DISTRIBUTION_TAG: '2021-08-03.2-clang'
+  FDO_DISTRIBUTION_TAG: '2021-08-13.0-replace-kvmconfig'
 
 
 include:
diff --git a/.gitlab-ci/build-deps.sh b/.gitlab-ci/build-deps.sh
index dbf5f625..6a5c127e 100755
--- a/.gitlab-ci/build-deps.sh
+++ b/.gitlab-ci/build-deps.sh
@@ -70,7 +70,7 @@ if [[ -n "$KERNEL_DEFCONFIG" ]]; then
 	fi
 
 	make ARCH=${LINUX_ARCH} ${KERNEL_DEFCONFIG}
-	make ARCH=${LINUX_ARCH} kvmconfig
+	make ARCH=${LINUX_ARCH} kvm_guest.config
 	./scripts/config \
 		--enable CONFIG_DRM \
 		--enable CONFIG_DRM_KMS_HELPER \