diff --git a/build-images.sh b/build-images.sh
index 81f8a27..3fd0c64 100644
--- a/build-images.sh
+++ b/build-images.sh
@@ -15,22 +15,22 @@ webtop_version=$(cat ${PWD}/webtop5-build/VERSION)
 tmce_jar="webtop-tmceplugins.jar"
 
 # Download of external deps and CHECKSUM verification:
-if ! compgen -G "pecbridge-*.tar.gz"; then
-    curl --netrc --fail -O "https://www.sonicle.com/nethesis/commercial/pecbridge/pecbridge-5.4.0.tar.gz"
-fi
-sha256sum -c CHECKSUM
+# if ! compgen -G "pecbridge-*.tar.gz"; then
+#     curl --netrc --fail -O "https://www.sonicle.com/nethesis/commercial/pecbridge/pecbridge-5.4.0.tar.gz"
+# fi
+# sha256sum -c CHECKSUM
 
 # Reuse existing webtopbuilder container, to speed up builds
-if ! buildah containers --format "{{.ContainerName}}" | grep -q webtopbuilder; then
-    echo "Pulling maven runtime..."
-    buildah from --name webtopbuilder-tmp docker.io/library/maven:3.6-openjdk-8
-    buildah run webtopbuilder-tmp  apt-get  update
-    buildah run webtopbuilder-tmp  apt-get  install -y  nodejs make
-    buildah commit --rm webtopbuilder-tmp webtopbuilder-image
-    buildah from --name webtopbuilder \
-	    -v "${PWD}/webtop5-build:/webtop5-build:z" \
-	    localhost/webtopbuilder-image
-fi
+# if ! buildah containers --format "{{.ContainerName}}" | grep -q webtopbuilder; then
+#     echo "Pulling maven runtime..."
+#     buildah from --name webtopbuilder-tmp docker.io/library/maven:3.6-openjdk-8
+#     buildah run webtopbuilder-tmp  apt-get  update
+#     buildah run webtopbuilder-tmp  apt-get  install -y  nodejs make
+#     buildah commit --rm webtopbuilder-tmp webtopbuilder-image
+#     buildah from --name webtopbuilder \
+# 	    -v "${PWD}/webtop5-build:/webtop5-build:z" \
+# 	    localhost/webtopbuilder-image
+# fi
 
 # if [ ! -e ${PWD}/webtop5-build/webtop-webapp-$webtop_version.war ]; then
 #     buildah run webtopbuilder sh -c "mkdir -p ~/.m2"
@@ -72,8 +72,14 @@ cleanup_list+=("${tmce_plugin_tmp_dir}")
     cd "${tmce_plugin_tmp_dir}"
     curl -L -o tmce-plugin.zip "https://github.com/actions/download-artifact/releases/download/v4/tmce-plugin.zip"
     ls "${PWD}/"
-    unzip tmce-plugin.zip
-    mv tmce-plugin/* "${PWD}/"
+    file tmce-plugin.zip
+    if unzip -tq tmce-plugin.zip; then
+        unzip tmce-plugin.zip
+        mv tmce-plugin/* "${PWD}/"
+    else
+        echo "Error: tmce-plugin.zip is not a valid zip file."
+        exit 1
+    fi
     ls "${PWD}/"
 )