diff --git a/meta-lxatac-software/recipes-devtools/gitlab-runner/gitlab-runner.inc b/meta-lxatac-software/recipes-devtools/gitlab-runner/gitlab-runner.inc
index 4796c72c..ad12e141 100644
--- a/meta-lxatac-software/recipes-devtools/gitlab-runner/gitlab-runner.inc
+++ b/meta-lxatac-software/recipes-devtools/gitlab-runner/gitlab-runner.inc
@@ -26,5 +26,5 @@ GO_LINKSHARED = ""
 
 do_install:append() {
     install -d ${D}${systemd_system_unitdir}
-    install -m 0644 ${WORKDIR}/gitlab-runner.service ${D}${systemd_system_unitdir}/
+    install -m 0644 ${UNPACKDIR}/gitlab-runner.service ${D}${systemd_system_unitdir}/
 }
diff --git a/meta-lxatac-software/recipes-devtools/gitlab-runner/gitlab-runner_17.3.1.bb b/meta-lxatac-software/recipes-devtools/gitlab-runner/gitlab-runner_17.3.1.bb
index 011d1d21..5cef9c3f 100644
--- a/meta-lxatac-software/recipes-devtools/gitlab-runner/gitlab-runner_17.3.1.bb
+++ b/meta-lxatac-software/recipes-devtools/gitlab-runner/gitlab-runner_17.3.1.bb
@@ -1,4 +1,4 @@
 require gitlab-runner.inc
 
-SRC_URI = "git://gitlab.com/gitlab-org/gitlab-runner.git;branch=17-3-stable;protocol=https"
+SRC_URI = "git://${GO_IMPORT};branch=17-3-stable;protocol=https;destsuffix=${BPN}-${PV}/src/${GO_IMPORT}"
 SRCREV = "66269445606da32c52be605feba6d70fc1a8fb0d"