diff --git a/ci/scripts/build.sh b/ci/scripts/build.sh
index 4bfaccfd0..ca37087b1 100755
--- a/ci/scripts/build.sh
+++ b/ci/scripts/build.sh
@@ -12,10 +12,8 @@ source "$(dirname $0)/lib.sh"
 
 if [ -f "ci/Dockerfile-build.${ZT_NAME}" ]; then
     DOCKERFILE="ci/Dockerfile-build.${ZT_NAME}"
-    echo "USING DOCKERFILE ${DOCKERFILE}"
 else
     DOCKERFILE="ci/Dockerfile-build.${PKGFMT}"
-    echo "USING DOCKERFILE ${DOCKERFILE}"    
 fi
 
 echo "#~~~~~~~~~~~~~~~~~~~~"
@@ -34,10 +32,8 @@ echo "PWD: ${PWD}"
 echo "DOCKERFILE: ${DOCKERFILE}"
 echo "#~~~~~~~~~~~~~~~~~~~~"
 
-# if [ ${BUILD_EVENT} == "push" ]; then
-    make munge_rpm zerotier-one.spec VERSION=${VERSION}
-    make munge_deb debian/changelog VERSION=${VERSION}
-# fi
+make munge_rpm zerotier-one.spec VERSION=${VERSION}
+make munge_deb debian/changelog VERSION=${VERSION}
 
 docker buildx build \
        --build-arg ZT_NAME="${ZT_NAME}" \
diff --git a/make-linux.mk b/make-linux.mk
index 5d1155c9e..029308f54 100644
--- a/make-linux.mk
+++ b/make-linux.mk
@@ -519,6 +519,14 @@ synology-pkg: FORCE
 synology-docker: FORCE
 	cd pkg/synology/dsm7-docker/; ./build.sh build-and-push
 
+check_defined = \
+    $(strip $(foreach 1,$1, \
+        $(call __check_defined,$1,$(strip $(value 2)))))
+
+__check_defined = \
+$(if $(value $1),, \
+      $(error Undefined $1$(if $2, ($2))))
+
 munge_rpm:
 	@:$(call check_defined, VERSION)
 	@echo "Updating rpm spec to $(VERSION)"