diff --git a/recipes-gtk/nwg-shell/nwg-bar_git.bb b/recipes-gtk/nwg-shell/nwg-bar_git.bb
index 3f5e1cb..ef80f45 100644
--- a/recipes-gtk/nwg-shell/nwg-bar_git.bb
+++ b/recipes-gtk/nwg-shell/nwg-bar_git.bb
@@ -11,10 +11,11 @@ RDEPENDS:${PN} = "go-runtime"
 
 GO_IMPORT = "github.com/nwg-piotr/nwg-bar.git"
 
-SRC_URI = "git://${GO_IMPORT};nobranch=1;protocol=https"
+SRC_URI = "git://${GO_IMPORT};destsuffix=src/${GO_IMPORT};nobranch=1;protocol=https"
 
 PV = "0.1.5"
 SRCREV = "86f75d0856193c1ba1505f6afbc1b73d34c7093a"
+S = "${UNPACKDIR}"
 
 inherit go go-mod pkgconfig
 
diff --git a/recipes-gtk/nwg-shell/nwg-dock_git.bb b/recipes-gtk/nwg-shell/nwg-dock_git.bb
index 6b41a3d..6b914a6 100644
--- a/recipes-gtk/nwg-shell/nwg-dock_git.bb
+++ b/recipes-gtk/nwg-shell/nwg-dock_git.bb
@@ -10,10 +10,11 @@ RDEPENDS:${PN} = "go-runtime"
 
 GO_IMPORT = "github.com/nwg-piotr/nwg-dock.git"
 
-SRC_URI = "git://${GO_IMPORT};nobranch=1;protocol=https"
+SRC_URI = "git://${GO_IMPORT};destsuffix=src/${GO_IMPORT};nobranch=1;protocol=https"
 
 PV = "0.3.9"
 SRCREV = "6fdd055eaff282298ea5496d203514b5f99314a0"
+S = "${UNPACKDIR}"
 
 inherit go go-mod pkgconfig
 
diff --git a/recipes-gtk/nwg-shell/nwg-drawer_git.bb b/recipes-gtk/nwg-shell/nwg-drawer_git.bb
index ee5a513..da3bfc3 100644
--- a/recipes-gtk/nwg-shell/nwg-drawer_git.bb
+++ b/recipes-gtk/nwg-shell/nwg-drawer_git.bb
@@ -11,10 +11,11 @@ RDEPENDS:${PN} = "go-runtime"
 
 GO_IMPORT = "github.com/nwg-piotr/nwg-drawer.git"
 
-SRC_URI = "git://${GO_IMPORT};nobranch=1;protocol=https"
+SRC_URI = "git://${GO_IMPORT};destsuffix=src/${GO_IMPORT};nobranch=1;protocol=https"
 
 PV = "0.4.7"
 SRCREV = "0cd48d1631eecb3043ee2c1fed9dfa25ca855375"
+S = "${UNPACKDIR}"
 
 inherit go go-mod pkgconfig
 
diff --git a/recipes-gtk/nwg-shell/nwg-look_git.bb b/recipes-gtk/nwg-shell/nwg-look_git.bb
index 985d19f..d8981fc 100644
--- a/recipes-gtk/nwg-shell/nwg-look_git.bb
+++ b/recipes-gtk/nwg-shell/nwg-look_git.bb
@@ -7,9 +7,10 @@ RDEPENDS:${PN} = "xcur2png go-runtime"
 
 GO_IMPORT = "github.com/nwg-piotr/nwg-look"
 
-SRC_URI = "git://${GO_IMPORT};branch=main;protocol=https"
+SRC_URI = "git://${GO_IMPORT};destsuffix=src/${GO_IMPORT};branch=main;protocol=https"
 SRCREV = "88f2639445084bf265ad71dba1c7af507c471762"
 PV = "0.2.7"
+S = "${UNPACKDIR}"
 
 inherit go go-mod pkgconfig gtk-icon-cache
 
diff --git a/recipes-gtk/nwg-shell/nwg-menu_git.bb b/recipes-gtk/nwg-shell/nwg-menu_git.bb
index 52ee71c..9dfda59 100644
--- a/recipes-gtk/nwg-shell/nwg-menu_git.bb
+++ b/recipes-gtk/nwg-shell/nwg-menu_git.bb
@@ -16,10 +16,11 @@ RRECOMMENDS:${PN} = " \
 
 GO_IMPORT = "github.com/nwg-piotr/nwg-menu.git"
 
-SRC_URI = "git://${GO_IMPORT};nobranch=1;protocol=https"
+SRC_URI = "git://${GO_IMPORT};destsuffix=src/${GO_IMPORT};nobranch=1;protocol=https"
 
 PV = "0.1.3"
 SRCREV = "fd8b92ad1ad0c0c7a23fc7a0be942ca0cbe7f7e0"
+S = "${UNPACKDIR}"
 
 inherit go go-mod pkgconfig
 
diff --git a/recipes-gtk/nwg-shell/nwgocc_git.bb b/recipes-gtk/nwg-shell/nwgocc_git.bb
index e180fb0..0997eee 100644
--- a/recipes-gtk/nwg-shell/nwgocc_git.bb
+++ b/recipes-gtk/nwg-shell/nwgocc_git.bb
@@ -13,10 +13,11 @@ RRECOMMENDS:${PN} = " \
 
 GO_IMPORT = "github.com/nwg-piotr/nwgocc.git"
 
-SRC_URI = "git://${GO_IMPORT};nobranch=1;protocol=https"
+SRC_URI = "git://${GO_IMPORT};destsuffix=src/${GO_IMPORT};nobranch=1;protocol=https"
 
 PV = "0.0.1"
 SRCREV = "782a37014de40f63115825c0b5bd343dee2ba668"
+S = "${UNPACKDIR}"
 
 inherit go go-mod pkgconfig gtk-icon-cache