diff --git a/README.md b/README.md
index 84a492b80ee390dc55ab3ea6febe7afb3182913c..dc0edf5fa717271ec4fe1be7f33889d856695fed 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ This project contains the common CI templates and scripts for Hive and Hive-rela
 
 - misc - miscellaneous files
 - scripts/bash - Bash scripts
-- scripts/emscripten - source for emsdk image
+- scripts/bash/emscripten - source for emsdk image
 - scripts/python - Python scripts
 - templates - GitLab CI templates
 
diff --git a/docker-bake.hcl b/docker-bake.hcl
index 5ff82994fb80e36b6ea08e27d8a971611e9be0e2..320dec0e968512550afa2293a0ad7c2ef2d9052a 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -77,7 +77,7 @@ target "tox-test-runner" {
 
 target "emsdk" {
   dockerfile = "Dockerfile.emscripten"
-  tags = [ notempty(CI_REGISTRY_IMAGE) ? "${CI_REGISTRY_IMAGE}/emsdk:${EMSCRIPTEN_VERSION}" : "emsdk:${EMSCRIPTEN_VERSION}" ]
+  tags = generate-tags("emsdk", "${EMSCRIPTEN_VERSION}")
   cache-from = generate-cache-from("emsdk", "${EMSCRIPTEN_VERSION}")
   cache-to = generate-cache-to("emsdk", "${EMSCRIPTEN_VERSION}")
   args = {
diff --git a/scripts/bash/build_emscripten_image.sh b/scripts/bash/build_emscripten_image.sh
index 6487e33fa274ef9f7e7e277d4b3d6c6a44de0acb..e9fd3566a6f1b6c005bda9585faee8d006a4a6a5 100755
--- a/scripts/bash/build_emscripten_image.sh
+++ b/scripts/bash/build_emscripten_image.sh
@@ -11,5 +11,5 @@ export DOCKER_BUILDKIT=1
 
 docker build --target=emscripten_builder \
   --build-arg "EMSCRIPTEN_VERSION=${EMSDK_VERSION}" \
-  -t "${REGISTRY}emsdk:3.1.43" \
-  -f "${SRCDIR}/Dockerfile.emscripten" "${SRCDIR}"
+  --tag "${REGISTRY}emsdk:3.1.43" \
+  --file "${SRCDIR}/Dockerfile.emscripten" "${SRCDIR}"
diff --git a/scripts/bash/emscripten/prepare_boost.sh b/scripts/bash/emscripten/prepare_boost.sh
index 2642c18f596ea05b99011634f193fd3fd1d37df2..3766961b6dea9e85beeca6ccf76ec9fa8970fcb2 100755
--- a/scripts/bash/emscripten/prepare_boost.sh
+++ b/scripts/bash/emscripten/prepare_boost.sh
@@ -1,5 +1,7 @@
 #! /bin/bash
 
+echo "Building Boost..."
+
 set -xeuo pipefail
 
 TMP_SRC=${1:?"Missing arg #1 to specify source temp directory"}
@@ -44,3 +46,5 @@ printf "using clang : emscripten : emcc -s USE_ZLIB=1 -s USE_ICU=0 : <archiver>e
   --with-regex \
   --with-system \
   install
+
+echo "Boost build finished."
\ No newline at end of file
diff --git a/scripts/bash/emscripten/prepare_openssl.sh b/scripts/bash/emscripten/prepare_openssl.sh
index 499c7100946ed83447dc89569f82d95146a4ffea..c627cb8eb0da23d891cd7b69708103b1e2c01652 100755
--- a/scripts/bash/emscripten/prepare_openssl.sh
+++ b/scripts/bash/emscripten/prepare_openssl.sh
@@ -1,5 +1,7 @@
 #! /bin/bash
 
+echo "Building OpenSSL..."
+
 set -xeuo pipefail
 
 TMP_SRC=${1:?"Missing arg #1 to specify source temp directory"}
@@ -28,3 +30,4 @@ sed -i 's/$(CROSS_COMPILE)//' Makefile
 emmake make -j 8 
 emmake make install
 
+echo "OpenSSL build finished."
\ No newline at end of file
diff --git a/scripts/bash/emscripten/prepare_secp256k1-zkp.sh b/scripts/bash/emscripten/prepare_secp256k1-zkp.sh
index 04c41e0e9964b1b1af7494ce760454ab57dcd87a..48db9f05c750bd36cc0a1aef3b97e12d3750d4fe 100755
--- a/scripts/bash/emscripten/prepare_secp256k1-zkp.sh
+++ b/scripts/bash/emscripten/prepare_secp256k1-zkp.sh
@@ -1,5 +1,7 @@
 #! /bin/bash
 
+echo "Building secp256k1-zkp..."
+
 set -xeuo pipefail
 
 TMP_SRC=${1:?"Missing arg #1 to specify source temp directory"}
@@ -26,3 +28,5 @@ emconfigure ./configure --prefix="${INSTALL_PREFIX}" \
   --enable-experimental
 emmake make
 emmake make install
+
+echo "Secp256k1-zkp build finished."
\ No newline at end of file