diff --git a/recipes-python/pyside6/python3-pyside6.inc b/recipes-python/pyside6/python3-pyside6.inc
index 29c9991..622bf37 100644
--- a/recipes-python/pyside6/python3-pyside6.inc
+++ b/recipes-python/pyside6/python3-pyside6.inc
@@ -26,8 +26,6 @@ QT_MODULE_REPO = "tqtc-pyside-setup"
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/pyside6:"
 
-S = "${WORKDIR}/git"
-
 EXTRA_OECMAKE += "\
     -DBUILD_TESTS=FALSE \
     -DQFP_PYTHON_SITE_PACKAGES=${PYTHON_SITEPACKAGES_DIR} \
diff --git a/recipes-qt/qt6/qt3d_git.bb b/recipes-qt/qt6/qt3d_git.bb
index cede65d..08db8b2 100644
--- a/recipes-qt/qt6/qt3d_git.bb
+++ b/recipes-qt/qt6/qt3d_git.bb
@@ -23,7 +23,7 @@ include recipes-qt/qt6/qt6.inc
 ASSIMP_BRANCH = "qt6_assimp"
 
 SRC_URI += " \
-    ${QT_GIT}/${QT_GIT_PROJECT}/qtquick3d-assimp.git;name=qt3d-assimp;branch=${ASSIMP_BRANCH};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/assimp/src \
+    ${QT_GIT}/${QT_GIT_PROJECT}/qtquick3d-assimp.git;name=qt3d-assimp;branch=${ASSIMP_BRANCH};protocol=${QT_GIT_PROTOCOL};destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/src/3rdparty/assimp/src \
 "
 
 # Needed for supporting 64bit off_t
diff --git a/recipes-qt/qt6/qt6-git.inc b/recipes-qt/qt6/qt6-git.inc
index 72c9945..a266023 100644
--- a/recipes-qt/qt6/qt6-git.inc
+++ b/recipes-qt/qt6/qt6-git.inc
@@ -8,12 +8,13 @@ QT_MODULE_BRANCH ?= "6.8"
 QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH};nobranch=1"
 QT_MODULE_REPO ?= "${QT_MODULE}.git"
 
-SRC_URI = "${QT_GIT}/${QT_GIT_PROJECT}/${QT_MODULE_REPO};name=${QT_MODULE};${QT_MODULE_BRANCH_PARAM};protocol=${QT_GIT_PROTOCOL}"
+# for compatibility with Yocto releases before whinlatter
+BB_GIT_DEFAULT_DESTSUFFIX ?= "${BP}"
+
+SRC_URI = "${QT_GIT}/${QT_GIT_PROJECT}/${QT_MODULE_REPO};name=${QT_MODULE};${QT_MODULE_BRANCH_PARAM};protocol=${QT_GIT_PROTOCOL};destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}"
 
 CVE_PRODUCT ?= "qt:${BPN} qt:qt"
 
-S = "${WORKDIR}/git"
-
 PV = "${QT_VERSION}"
 
 SRCREV = "${SRCREV_${QT_MODULE}}"
diff --git a/recipes-qt/qt6/qtquick3d_git.bb b/recipes-qt/qt6/qtquick3d_git.bb
index 992a7e3..c0e3766 100644
--- a/recipes-qt/qt6/qtquick3d_git.bb
+++ b/recipes-qt/qt6/qtquick3d_git.bb
@@ -23,7 +23,7 @@ include recipes-qt/qt6/qt6.inc
 ASSIMP_BRANCH = "qt6_assimp"
 
 SRC_URI += " \
-    ${QT_GIT}/${QT_GIT_PROJECT}/qtquick3d-assimp.git;name=qtquick3d-assimp;branch=${ASSIMP_BRANCH};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/assimp/src \
+    ${QT_GIT}/${QT_GIT_PROJECT}/qtquick3d-assimp.git;name=qtquick3d-assimp;branch=${ASSIMP_BRANCH};protocol=${QT_GIT_PROTOCOL};destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/src/3rdparty/assimp/src \
     file://0001-Skip-embree-on-mingw.patch \
 "
 
diff --git a/recipes-qt/qt6/qttools_git.bb b/recipes-qt/qt6/qttools_git.bb
index 20f58fc..50a8ecd 100644
--- a/recipes-qt/qt6/qttools_git.bb
+++ b/recipes-qt/qt6/qttools_git.bb
@@ -17,8 +17,8 @@ include recipes-qt/qt6/qt6-lts.inc
 include recipes-qt/qt6/qt6.inc
 
 SRC_URI += " \
-    ${QT_GIT}/playground/qlitehtml.git;name=qttools-qlitehtml;branch=master;protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/assistant/qlitehtml \
-    git://github.com/litehtml/litehtml.git;name=qttools-qlitehtml-litehtml;branch=master;destsuffix=git/src/assistant/qlitehtml/src/3rdparty/litehtml;protocol=https \
+    ${QT_GIT}/playground/qlitehtml.git;name=qttools-qlitehtml;branch=master;protocol=${QT_GIT_PROTOCOL};destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/src/assistant/qlitehtml \
+    git://github.com/litehtml/litehtml.git;name=qttools-qlitehtml-litehtml;branch=master;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/src/assistant/qlitehtml/src/3rdparty/litehtml;protocol=https \
     file://0002-examples-don-t-track-source-path.patch \
 "
 
diff --git a/recipes-qt/qt6/qtvirtualkeyboard_git.bb b/recipes-qt/qt6/qtvirtualkeyboard_git.bb
index a8c54e9..24f94bb 100644
--- a/recipes-qt/qt6/qtvirtualkeyboard_git.bb
+++ b/recipes-qt/qt6/qtvirtualkeyboard_git.bb
@@ -19,7 +19,7 @@ include recipes-qt/qt6/qt6.inc
 # and enable "t9write" in PACKAGECONFIG. This can be done in a separate .bbappend file.
 # for example:
 #T9WRITEPACKAGE = "${HOME}/Downloads/zzEval_QT_T9Write_Alpha_v750_20150916.zip"
-#SRC_URI += "file://${T9WRITEPACKAGE};subdir=git/src/virtualkeyboard/3rdparty/t9write"
+#SRC_URI += "file://${T9WRITEPACKAGE};subdir=${BB_GIT_DEFAULT_DESTSUFFIX}/src/virtualkeyboard/3rdparty/t9write"
 #PACKAGECONFIG = "t9write"
 
 VKB_LANGUAGES ?= "\
diff --git a/recipes-qt/qt6/qtwebengine.inc b/recipes-qt/qt6/qtwebengine.inc
index 9593ad0..1fcde20 100644
--- a/recipes-qt/qt6/qtwebengine.inc
+++ b/recipes-qt/qt6/qtwebengine.inc
@@ -35,7 +35,7 @@ QT_MODULE_BRANCH_CHROMIUM = "122-based"
 FILESEXTRAPATHS:prepend := "${THISDIR}/qtwebengine:"
 
 SRC_URI += " \
-    ${QT_GIT}/${QT_GIT_PROJECT}/qtwebengine-chromium.git;name=qtwebengine-chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \
+    ${QT_GIT}/${QT_GIT_PROJECT}/qtwebengine-chromium.git;name=qtwebengine-chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/src/3rdparty \
     file://0001-CMake-use-generated-yocto-toolchains.patch \
     file://0002-Enable-examples.patch \
 "