diff --git a/debian/changelog b/debian/changelog
index ac75a27..7f85e62 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+calamares-settings-ubuntu (1:24.04.23) noble; urgency=medium
+
+  * Set GOCACHE to stay within the build directory
+
+ -- Simon Chopin <schopin@ubuntu.com>  Wed, 03 Apr 2024 19:40:50 +0200
+
 calamares-settings-ubuntu (1:24.04.22) noble; urgency=medium
 
   * Add missing build dependency on golang-go.
diff --git a/debian/rules b/debian/rules
index d2f4aa9..ea0abdf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,7 @@ export LC_ALL=C.UTF-8
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 export GOPATH=/usr/share/gocode
 export GO111MODULE=off
+export GOCACHE=$(CURDIR)/.gocache
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 PKGSELECT = "common/modules/pkgselect"
@@ -20,6 +21,10 @@ override_dh_auto_build:
 	(cd $(PKGSELECT)/build && $(MAKE))
 	(cd common/snap-seed-glue && go build -gcflags="all=-N -l" -ldflags="-compressdwarf=false" -o snap-seed-glue main.go)
 
+override_dh_auto_clean:
+	dh_auto_clean
+	rm -rf $(GOCACHE)
+
 override_dh_auto_install:
 	(cd $(PKGSELECT)/build && $(MAKE) DESTDIR=$(CURDIR)/debian/calamares-settings-ubuntu-common/ install)