diff --git a/.docker/docker-qgis-build.sh b/.docker/docker-qgis-build.sh
index 38f91a2f156..2cf342edfa7 100755
--- a/.docker/docker-qgis-build.sh
+++ b/.docker/docker-qgis-build.sh
@@ -101,7 +101,7 @@ cmake \
  -DWITH_QWTPOLAR=OFF \
  -DWITH_APIDOC=OFF \
  -DWITH_ASTYLE=OFF \
- -DWITH_BINDINGS=${WITH_QT5} \
+ -DWITH_BINDINGS=ON \
  -DWITH_SERVER=ON \
  -DWITH_SERVER_LANDINGPAGE_WEBAPP=${WITH_QT5} \
  -DWITH_ORACLE=ON \
diff --git a/.docker/qgis3-qt6-build-deps.dockerfile b/.docker/qgis3-qt6-build-deps.dockerfile
index 4edb3320631..1ec6373ed4a 100644
--- a/.docker/qgis3-qt6-build-deps.dockerfile
+++ b/.docker/qgis3-qt6-build-deps.dockerfile
@@ -1,6 +1,6 @@
 ARG DISTRO_VERSION=38
 
-FROM fedora:${DISTRO_VERSION} as single
+FROM fedora:${DISTRO_VERSION} as binary-for-oracle
 MAINTAINER Matthias Kuhn <matthias@opengis.ch>
 
 RUN dnf -y --refresh install \
@@ -32,11 +32,17 @@ RUN dnf -y --refresh install \
     PDAL \
     PDAL-libs \
     PDAL-devel \
+    perl-YAML-Tiny \
     proj-devel \
     protobuf-devel \
     protobuf-lite-devel \
     python3-devel \
+    python3-pyqt6 \
+    python3-pyqt6-devel \
+    python3-qscintilla-qt6 \
+    python3-qscintilla-qt6-devel \
     python3-termcolor \
+    PyQt-builder \
     qca-qt6-devel \
     qt6-qt3d-devel \
     qt6-qtbase-devel \
@@ -53,6 +59,7 @@ RUN dnf -y --refresh install \
     qtkeychain-qt6-devel \
     qwt-qt6-devel \
     qscintilla-qt6-devel \
+    sip6 \
     spatialindex-devel \
     sqlite-devel \
     unzip \
@@ -83,3 +90,14 @@ RUN unzip instantclient-sqlplus-linux.x64-19.9.0.0.0dbru.zip
 
 ENV PATH="/instantclient_19_9:${PATH}"
 ENV LD_LIBRARY_PATH="/instantclient_19_9:${LD_LIBRARY_PATH}"
+ENV LANG=C.UTF-8
+
+FROM binary-for-oracle as binary-only
+
+RUN dnf -y --refresh install \
+    python3-gdal \
+    python3-nose2 \
+    python3-psycopg2 \
+    python3-pyyaml
+
+FROM binary-only
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index c7e89a762f5..5b754912d87 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -316,7 +316,7 @@ jobs:
 
           - qt-version: 6
             distro-version: 38
-            docker-target: single
+            docker-target: binary-only
 
           - qt-version: 5
             distro-version: 22.04