diff --git a/.craft.ini b/.craft.ini
index c262b8ec6..4f7348a18 100644
--- a/.craft.ini
+++ b/.craft.ini
@@ -3,3 +3,6 @@
 
 [BlueprintSettings]
 kde/applications/kdeconnect-kde.packageAppx = True
+# Need the tip of master to build with Qt6. Remove once the release vesion has Qt6 support.
+kde/plasma/breeze.version=master
+kde/unreleased/kirigami-addons.version=master
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 06e26021a..70aa3b25a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,5 +10,5 @@ include:
       - /gitlab-templates/freebsd-qt6.yml
       - /gitlab-templates/windows-qt6.yml
       - /gitlab-templates/clang-format.yml
-      # - /gitlab-templates/craft-windows-x86-64-qt6.yml TODO re-enable when Qt6 Craft build works
-      # - /gitlab-templates/craft-windows-appx-qt6.yml
+      - /gitlab-templates/craft-windows-x86-64-qt6.yml
+      - /gitlab-templates/craft-windows-appx-qt6.yml