diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index fb16ee874..6c9dc166e 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -122,7 +122,7 @@ jobs:
         run: brew tap RfidResearchGroup/proxmark3
 
       - name: Install dependencies
-        run: brew install readline coreutils qt@5 RfidResearchGroup/proxmark3/arm-none-eabi-gcc openssl gd
+        run: brew install readline coreutils qt RfidResearchGroup/proxmark3/arm-none-eabi-gcc openssl gd
         continue-on-error: true
 
       - name: Install Python dependencies
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index 261cb693c..759b2f690 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -91,7 +91,7 @@ jobs:
         run: sudo apt-get update
 
       - name: Install dependencies
-        run: sudo apt-get install -yqq make autoconf build-essential ca-certificates pkg-config libreadline-dev gcc-arm-none-eabi libnewlib-dev qtbase5-dev libbz2-dev liblz4-dev libbluetooth-dev libpython3-dev python3 python3-dev libpython3-all-dev liblua5.4-dev liblua5.4-0 lua5.4 sed libssl-dev libgd-dev
+        run: sudo apt-get install -yqq make autoconf build-essential ca-certificates pkg-config libreadline-dev gcc-arm-none-eabi libnewlib-dev qt6-base-dev libbz2-dev liblz4-dev libbluetooth-dev libpython3-dev python3 python3-dev libpython3-all-dev liblua5.4-dev liblua5.4-0 lua5.4 sed libssl-dev libgd-dev
 
       - name: Install Python dependencies
         run: pip install -r tools/requirements.txt
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index edfe83b74..849264ae7 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -121,7 +121,6 @@ jobs:
             libbz2-dev
             liblz4-dev
             qt6-base-dev
-            qtbase5-dev
             cmake
             libpython3-dev
             libssl-dev
diff --git a/doc/md/Development/Makefile-vs-CMake.md b/doc/md/Development/Makefile-vs-CMake.md
index 2d2e7d4e8..73e938a60 100644
--- a/doc/md/Development/Makefile-vs-CMake.md
+++ b/doc/md/Development/Makefile-vs-CMake.md
@@ -70,10 +70,10 @@ At the moment both are maintained because they don't perfectly overlap yet.
 | dep pthread | sys | sys |  |
 | pthread detection | **none** | **none** (1) | (1) cf https://stackoverflow.com/questions/1620918/cmake-and-libpthread ? |
 | `SKIPPTHREAD` | yes | yes | e.g. for termux |
-| dep Qt | opt, sys, Qt6 & Qt5 | opt, sys, Qt5 |  |
-| Qt detection | pc(qt6)/pc(qt5)/`QTDIR`(1) (2) | find_package(qt5) (3) | (1) if `QTDIR`: hardcode path (2) OSX: pkg-config hook for Brew (3) OSX: add search path|
+| dep Qt | opt, sys, Qt6 & Qt5 | opt, sys, Qt6 & Qt5 |  |
+| Qt detection | pc(qt6)/pc(qt5)/`QTDIR`(1) (2) | find_package(qt6/qt5) (3) | (1) if `QTDIR`: hardcode path (2) OSX: pkg-config hook for Brew (3) OSX: add search path|
 | `SKIPQT` | yes | yes | |
-| `SKIPQT6` | yes | no | |
+| `SKIPQT6` | yes | yes | |
 | dep readline | sys  | sys |  |
 | readline detection | **none** (1) | find*(2), Cross:getzip | (1) OSX: hardcoded path (2) additional paths for OSX |
 | `SKIPREADLINE` | yes | yes | CLI not fully functional without Readline |