diff --git a/lmp/build.sh b/lmp/build.sh
index 714fe9de..29a01e7b 100755
--- a/lmp/build.sh
+++ b/lmp/build.sh
@@ -16,6 +16,10 @@ if [[ $GIT_URL == *"/lmp-manifest.git"* ]]; then
 	manifest="file://$(pwd)/.git -b $GIT_SHA"
 	# repo init won't work off detached heads, so do this to work around:
 	git branch pr-branch $GIT_SHA
+	# fetch also the tags when we are in the CI
+	if [ -n "$GH_TARGET_REPO" ] && [ "$GH_TARGET_REPO" != "$GIT_URL" ]; then
+		git fetch "$GH_TARGET_REPO" --tags --quiet
+	fi
 	# Check to make sure REPO_INIT_OVERRIDES isn't setting a "-b <ref>".
 	# That will break our logic for checking out the exact GIT_SHA above
 	export REPO_INIT_OVERRIDES=$(echo $REPO_INIT_OVERRIDES | sed -e 's/-b\s*\S*//')
diff --git a/lmp/jobserv.yml b/lmp/jobserv.yml
index d44a6270..9bc46278 100644
--- a/lmp/jobserv.yml
+++ b/lmp/jobserv.yml
@@ -398,4 +398,3 @@ params:
 script-repos:
   fio:
     clone-url: https://github.com/foundriesio/ci-scripts
-    git-ref: debug-branch