diff --git a/build-images.sh b/build-images.sh
index 629cf43..96ed199 100644
--- a/build-images.sh
+++ b/build-images.sh
@@ -32,19 +32,19 @@ if ! buildah containers --format "{{.ContainerName}}" | grep -q webtopbuilder; t
 	    localhost/webtopbuilder-image
 fi
 
-if [ ! -e ${PWD}/webtop5-build/webtop-webapp-$webtop_version.war ]; then
-    buildah run webtopbuilder sh -c "mkdir -p ~/.m2"
-    buildah run webtopbuilder sh -c "cp webtop5-build/settings.xml  ~/.m2/"
-    buildah run webtopbuilder sh -c "cd webtop5-build/ && ./prep-sources"
-fi
+# if [ ! -e ${PWD}/webtop5-build/webtop-webapp-$webtop_version.war ]; then
+#     buildah run webtopbuilder sh -c "mkdir -p ~/.m2"
+#     buildah run webtopbuilder sh -c "cp webtop5-build/settings.xml  ~/.m2/"
+#     buildah run webtopbuilder sh -c "cd webtop5-build/ && ./prep-sources"
+# fi
 
-if [ ! -e ${PWD}/webtop5-build/ListTimeZones.class ]; then
-    buildah run webtopbuilder sh -c "cd webtop5-build/ && javac ListTimeZones.java"
-fi
+# if [ ! -e ${PWD}/webtop5-build/ListTimeZones.class ]; then
+#     buildah run webtopbuilder sh -c "cd webtop5-build/ && javac ListTimeZones.java"
+# fi
 
-if [ ! -e ${PWD}/webtop5-build/WebtopPassEncode.class ]; then
-    buildah run webtopbuilder sh -c "cd webtop5-build/ && javac WebtopPassEncode.java"
-fi
+# if [ ! -e ${PWD}/webtop5-build/WebtopPassEncode.class ]; then
+#     buildah run webtopbuilder sh -c "cd webtop5-build/ && javac WebtopPassEncode.java"
+# fi
 
 jcharset_tmp_dir=$(mktemp -d)
 cleanup_list+=("${jcharset_tmp_dir}")
@@ -66,9 +66,9 @@ cleanup_list+=("${pecbridge_tmp_dir}")
 tar -C "${pecbridge_tmp_dir}" -x -v -z -f pecbridge-*.tar.gz
 
 # Download tmce plugin if GITHUB_TOKEN is set
-if [ -n "${TMCE_TOKEN}" ]; then
+if [ -n "${GITHUB_TOKEN}" ]; then
     echo "Downloading tmce plugin..."
-    curl -H "Authorization: token $TMCE_TOKEN" -H 'Accept: application/vnd.github.v3.raw' -o $tmce_jar -L \
+    curl -H "Authorization: token $GITHUB_TOKEN" -H 'Accept: application/vnd.github.v3.raw' -o $tmce_jar -L \
       https://api.github.com/repos/nethesis/webtop-tmceplugins/contents/$tmce_jar?ref=master
 else
     echo "TMCE_TOKEN not set, skipping tmce plugin download"