diff --git a/.github/workflows/build-debian11.yml b/.github/workflows/build-debian11.yml
index 3c0f35e7..e4f0f9c1 100644
--- a/.github/workflows/build-debian11.yml
+++ b/.github/workflows/build-debian11.yml
@@ -14,7 +14,7 @@ jobs:
           submodules: recursive
       - name: Build LTFS
         id: build
-        uses: LinearTapeFileSystem/Debian11-Build@v1.1.1
+        uses: LinearTapeFileSystem/Debian11-Build@release/test-icu-config-removal
         with:
           destination: '/tmp/ltfs'
           submodules: recursive
diff --git a/.github/workflows/build-debian12.yml b/.github/workflows/build-debian12.yml
index 395cdf81..d9b4e9fe 100644
--- a/.github/workflows/build-debian12.yml
+++ b/.github/workflows/build-debian12.yml
@@ -14,7 +14,7 @@ jobs:
           submodules: recursive
       - name: Build LTFS
         id: build
-        uses: LinearTapeFileSystem/Debian12-Build@v1.0
+        uses: LinearTapeFileSystem/Debian12-Build@fix/issue-628
         with:
           destination: '/tmp/ltfs'
           submodules: recursive
diff --git a/.github/workflows/build-ubuntu-focal.yml b/.github/workflows/build-ubuntu-focal.yml
index 30a3ce8c..0ee406d5 100644
--- a/.github/workflows/build-ubuntu-focal.yml
+++ b/.github/workflows/build-ubuntu-focal.yml
@@ -14,6 +14,6 @@ jobs:
           submodules: recursive
       - name: Build LTFS
         id: build
-        uses: LinearTapeFileSystem/Ubuntu2004-Build@v1.1
+        uses: LinearTapeFileSystem/Ubuntu2004-Build@fix/issue-628
         with:
           destination: '/tmp/ltfs'
diff --git a/messages/make_message_src.sh b/messages/make_message_src.sh
index 82488e81..3b43f302 100755
--- a/messages/make_message_src.sh
+++ b/messages/make_message_src.sh
@@ -29,6 +29,12 @@ else
 	else
 		PKGDATA=pkgdata
 	fi
+	if pkg-config --exists icu-uc 2>/dev/null; then
+		_ICU_LIBDIR=$(pkg-config --variable=libdir icu-uc 2>/dev/null)
+		if [ -f "${_ICU_LIBDIR}/icu/pkgdata.inc" ]; then
+			ICU_PKGDATA_INC="${_ICU_LIBDIR}/icu/pkgdata.inc"
+		fi
+	fi
 fi
 
 if [ "$#" -ne "1" ]; then
@@ -61,7 +67,7 @@ make_obj() {
 	${GENRB} -d work -q *.txt
 	cd work
 	ls *.res >packagelist.txt
-	${PKGDATA} -p ${BASENAME} -m static -q packagelist.txt >/dev/null
+	${PKGDATA} ${ICU_PKGDATA_INC:+-O} ${ICU_PKGDATA_INC} -p ${BASENAME} -m static -q packagelist.txt >/dev/null
 
 	case $KERNEL_NAME in
 		MINGW32_NT*)