diff --git a/.github/workflows/ci-build-image.yml b/.github/workflows/ci-build-image.yml
index 5dd8fec10c..9fdbc80ca3 100644
--- a/.github/workflows/ci-build-image.yml
+++ b/.github/workflows/ci-build-image.yml
@@ -89,6 +89,10 @@ jobs:
     needs: [build-image]
     if: ${{ ! inputs.skip-itests }}
     steps:
+    - name: Install xpath
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y libxml-xpath-perl
     - name: Install qemu
       if: ${{ inputs.build-arch != 'amd64' }}
       continue-on-error: true
diff --git a/repeated-integration-tests.bash b/repeated-integration-tests.bash
index 48efbd6ee2..b94fb69bc1 100755
--- a/repeated-integration-tests.bash
+++ b/repeated-integration-tests.bash
@@ -18,10 +18,9 @@ fi
 getPomProperty() {
     if command -v xpath > /dev/null 2>&1 ; then
         xpath -q -e "project/$1/text()" pom.xml
-    elif command -v mvnd > /dev/null 2>&1 ; then
-        mvnd help:evaluate -o -B -q -DforceStdout -Dexpression="$1"
     else
-        mvn help:evaluate -o -B -q -DforceStdout -Dexpression="$1"
+        "${MVN}" help:help > /dev/null 2>&1
+        "${MVN}" build-helper:regex-property@image-tag-to-lower help:evaluate -o -B -q -DforceStdout -Dexpression="$1"
     fi
 }
 
diff --git a/run.sh b/run.sh
index 66521795e9..3be7042bed 100755
--- a/run.sh
+++ b/run.sh
@@ -10,10 +10,9 @@ fi
 getPomProperty() {
     if command -v xpath > /dev/null 2>&1 ; then
         xpath -q -e "project/properties/$1/text()" pom.xml
-    elif command -v mvnd > /dev/null 2>&1 ; then
-        mvnd help:evaluate -o -B -q -DforceStdout -Dexpression="$1"
     else
-        mvn help:evaluate -o -B -q -DforceStdout -Dexpression="$1"
+        "${MVN}" help:help > /dev/null 2>&1
+        "${MVN}" build-helper:regex-property@image-tag-to-lower help:evaluate -o -B -q -DforceStdout -Dexpression="$1"
     fi
 }