diff --git a/mingw-w64-qt5-base/PKGBUILD b/mingw-w64-qt5-base/PKGBUILD
index f16feafc36..acce3ca943 100644
--- a/mingw-w64-qt5-base/PKGBUILD
+++ b/mingw-w64-qt5-base/PKGBUILD
@@ -13,7 +13,7 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
          $([[ ${CARCH} == i686 ]] || echo "${MINGW_PACKAGE_PREFIX}-${_realname}-debug"))
 _qtver=5.15.12
 pkgver=${_qtver}+kde+r147
-pkgrel=1
+pkgrel=2
 _commit=8907dedc858cc344d770a2e826d6acc516429540
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
@@ -37,7 +37,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-vulkan"
              "${MINGW_PACKAGE_PREFIX}-zlib"
              "${MINGW_PACKAGE_PREFIX}-zstd"
-             $([[ ${CARCH} == i686 ]] || echo "${MINGW_PACKAGE_PREFIX}-firebird")
+             $([[ ${CARCH} != x86_64 ]] || echo "${MINGW_PACKAGE_PREFIX}-firebird")
              "${MINGW_PACKAGE_PREFIX}-libmariadbclient"
              "${MINGW_PACKAGE_PREFIX}-postgresql"
              "git"
@@ -201,7 +201,7 @@ build() {
     _extra_config+=("-debug")
   fi
 
-  if [[ ${CARCH} != i686 ]]; then
+  if [[ ${CARCH} == x86_64 ]]; then
     _extra_config+=("-plugin-sql-ibase")
   fi
 
@@ -262,7 +262,7 @@ package_qt5-base() {
            "${MINGW_PACKAGE_PREFIX}-zstd")
   optdepends=("${MINGW_PACKAGE_PREFIX}-libmariadbclient: MySQL/MariaDB driver"
               "${MINGW_PACKAGE_PREFIX}-postgresql: PostgreSQL driver")
-  if [[ ${CARCH} != i686 ]]; then
+  if [[ ${CARCH} == x86_64 ]]; then
     optdepends+=("${MINGW_PACKAGE_PREFIX}-firebird: Firebird/iBase driver")
   fi
   groups=($([[ ${CARCH} == i686 ]] || echo "${MINGW_PACKAGE_PREFIX}-qt5"))
diff --git a/mingw-w64-qt6-base/PKGBUILD b/mingw-w64-qt6-base/PKGBUILD
index 45e805b4aa..2f30ed4672 100644
--- a/mingw-w64-qt6-base/PKGBUILD
+++ b/mingw-w64-qt6-base/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
          "${MINGW_PACKAGE_PREFIX}-${_realname}-debug")
 _qtver=6.6.1
 pkgver=${_qtver/-/}
-pkgrel=4
+pkgrel=5
 arch=(any)
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url='https://www.qt.io'
@@ -36,7 +36,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-zstd"
              "${MINGW_PACKAGE_PREFIX}-xmlstarlet"
              "${MINGW_PACKAGE_PREFIX}-vulkan-headers"
-             "${MINGW_PACKAGE_PREFIX}-firebird"
+             $([[ ${CARCH} == aarch64 ]] || echo "${MINGW_PACKAGE_PREFIX}-firebird")
              "${MINGW_PACKAGE_PREFIX}-libmariadbclient"
              "${MINGW_PACKAGE_PREFIX}-postgresql"
              "rsync")
@@ -163,7 +163,7 @@ build() {
     -DFEATURE_sql_psql=ON \
     -DFEATURE_sql_mysql=ON \
     -DFEATURE_sql_odbc=ON \
-    -DFEATURE_sql_ibase=ON \
+    -DFEATURE_sql_ibase=$([[ ${CARCH} == aarch64 ]] && echo "OFF" || echo "ON")  \
     -DFEATURE_gtk3=OFF \
     -DFEATURE_regularexpression=ON \
     -DFEATURE_force_debug_info=ON \
@@ -191,8 +191,10 @@ package_qt6-base() {
            "${MINGW_PACKAGE_PREFIX}-zlib"
            "${MINGW_PACKAGE_PREFIX}-zstd")
   optdepends=("${MINGW_PACKAGE_PREFIX}-libmariadbclient: MySQL/MariaDB driver"
-              "${MINGW_PACKAGE_PREFIX}-firebird: Firebird/iBase driver"
               "${MINGW_PACKAGE_PREFIX}-postgresql: PostgreSQL driver")
+  if [[ ${CARCH} != aarch64 ]]; then
+    optdepends+=("${MINGW_PACKAGE_PREFIX}-firebird: Firebird/iBase driver")
+  fi
   groups=("${MINGW_PACKAGE_PREFIX}-qt6")
 
   DESTDIR=${pkgdir} ${MINGW_PREFIX}/bin/cmake --install build-${MSYSTEM}
diff --git a/mingw-w64-soci/PKGBUILD b/mingw-w64-soci/PKGBUILD
index 2060740c2f..2fe61fb3a2 100644
--- a/mingw-w64-soci/PKGBUILD
+++ b/mingw-w64-soci/PKGBUILD
@@ -4,7 +4,7 @@ _realname=soci
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=4.0.3
-pkgrel=3
+pkgrel=4
 pkgdesc="SOCI - The C++ Database Access Library (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
@@ -18,14 +18,16 @@ depends=("${MINGW_PACKAGE_PREFIX}-boost")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-ninja"
-             "${MINGW_PACKAGE_PREFIX}-firebird"
+             $([[ ${CARCH} == aarch64 ]] || echo "${MINGW_PACKAGE_PREFIX}-firebird")
              "${MINGW_PACKAGE_PREFIX}-libmariadbclient"
              "${MINGW_PACKAGE_PREFIX}-postgresql"
              "${MINGW_PACKAGE_PREFIX}-sqlite3")
-optdepends=("${MINGW_PACKAGE_PREFIX}-firebird"
-            "${MINGW_PACKAGE_PREFIX}-libmariadbclient"
+optdepends=("${MINGW_PACKAGE_PREFIX}-libmariadbclient"
             "${MINGW_PACKAGE_PREFIX}-postgresql"
             "${MINGW_PACKAGE_PREFIX}-sqlite3")
+if [[ ${CARCH} != aarch64 ]]; then
+  optdepends+=("${MINGW_PACKAGE_PREFIX}-firebird")
+fi
 source=("https://github.com/SOCI/soci/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz"
         soci-4.0.0.patch)
 sha256sums=('4b1ff9c8545c5d802fbe06ee6cd2886630e5c03bf740e269bb625b45cf934928'