diff --git a/devel/generator/templates/layouts/mingw-w64-qt6-base.sh.ep b/devel/generator/templates/layouts/mingw-w64-qt6-base.sh.ep
index caf1d33e..06de9789 100644
--- a/devel/generator/templates/layouts/mingw-w64-qt6-base.sh.ep
+++ b/devel/generator/templates/layouts/mingw-w64-qt6-base.sh.ep
@@ -38,7 +38,13 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm
 sha256sums=('<%== $qt_module_sha256 %>'\
 <%== include 'fragments/sha256_list', relevant_files => $patch_files %>)
 
-_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
+# disable i686 builds because as of Qt 6.7.0 the i686 builds are no longer stable and 32-bit Windows is
+# generally not supported by upstream
+# remarks:
+# - This is in-line with MSYS2's packaging of mingw-w64 Qt 6 packages.
+# - You may override MINGW_W64_QT6_ARCHS by adding the variable to `/etc/makepkg.conf` in case you nevertheless
+#   want to add back the i686 build.
+_architectures=${MINGW_W64_QT6_ARCHS:-x86_64-w64-mingw32}
 
 % if ($patch_files->size || content_for('prepare')->size) {
 prepare () {
diff --git a/devel/generator/templates/layouts/mingw-w64-qt6-module.sh.ep b/devel/generator/templates/layouts/mingw-w64-qt6-module.sh.ep
index 37844e03..73b9261a 100644
--- a/devel/generator/templates/layouts/mingw-w64-qt6-module.sh.ep
+++ b/devel/generator/templates/layouts/mingw-w64-qt6-module.sh.ep
@@ -15,7 +15,7 @@ _pkgfqn="qt<%== $qt_module %>-everywhere-src-${_qtver}"
 sha256sums=('<%== stash('git_commit') ? 'SKIP' : $qt_module_sha256 %>'\
 <%== include 'fragments/sha256_list', relevant_files => $patch_files %>)
 
-_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
+_architectures=${MINGW_W64_QT6_ARCHS:-x86_64-w64-mingw32}
 
 % if ($patch_files->size || content_for('prepare')->size) {
 prepare () {
diff --git a/passwordmanager/mingw-w64-qt6/PKGBUILD b/passwordmanager/mingw-w64-qt6/PKGBUILD
index 10381df7..eac4ddf8 100644
--- a/passwordmanager/mingw-w64-qt6/PKGBUILD
+++ b/passwordmanager/mingw-w64-qt6/PKGBUILD
@@ -19,7 +19,7 @@ source=("${_name}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/arc
 sha256sums=('018dc831794182a66f4820ede7e399cee7633107542451206062bb01500541e0')
 options=(!buildflags staticlibs !strip !emptydirs)
 
-_architectures=('i686-w64-mingw32' 'x86_64-w64-mingw32')
+_architectures=(${MINGW_W64_QT6_ARCHS:-x86_64-w64-mingw32})
 _configurations=()
 [[ $NO_SHARED_LIBS ]] || _configurations+=('shared')
 [[ $NO_STATIC_LIBS ]] || _configurations+=('static') makedepends+=('mingw-w64-cmake-static' 'mingw-w64-qt6-base-static' 'mingw-w64-qt6-translations' 'mingw-w64-qt6-svg-static' 'breeze-icons' 'numix-icon-theme-git')