diff --git a/JeMPI_Apps/JeMPI_BackupRestoreAPI/build.sh b/JeMPI_Apps/JeMPI_BackupRestoreAPI/build.sh
index 77b8e8d5b..4b47384fe 100755
--- a/JeMPI_Apps/JeMPI_BackupRestoreAPI/build.sh
+++ b/JeMPI_Apps/JeMPI_BackupRestoreAPI/build.sh
@@ -9,4 +9,9 @@ source ../build-check-jdk.sh
 JAR_FILE=${BACKUP_RESTORE_API_JAR}
 APP_IMAGE=${BACKUP_RESTORE_API_IMAGE}
 APP=backup-restore-api
+
+if [ "$CI" = true ]; then
+    APP_IMAGE=jembi/${ETL_HUB_IMAGE}:${TAG}
+fi
+
 source ../build-app-image.sh
diff --git a/JeMPI_Apps/build-all-java.sh b/JeMPI_Apps/build-all-java.sh
index e6384f247..70ce9e2b6 100755
--- a/JeMPI_Apps/build-all-java.sh
+++ b/JeMPI_Apps/build-all-java.sh
@@ -40,7 +40,7 @@ pushd JeMPI_Bootstrapper
   CI=$CI TAG=$tag_to_use ./build.sh || exit 1
 popd
 pushd JeMPI_BackupRestoreAPI
-  ./build.sh || exit 1
+  CI=$CI TAG=$tag_to_use ./build.sh || exit 1
 popd
 pushd JeMPI_AsyncReceiver
   ./push.sh