diff --git a/node/base/build-image.sh b/node/base/build-image.sh
new file mode 100755
index 0000000..12228ff
--- /dev/null
+++ b/node/base/build-image.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+set -e
+
+echo "Build will be tagged with $1"
+echo "Build directory is $(pwd)"
+
+OLD_IMG=$(docker image ls -q "$1")
+docker buildx build . -t "$1"
+
+echo "Build complete, starting upload..."
+docker push "$1"
+
+if [ -n "$OLD_IMG" ]; then
+	if [ "$OLD_IMG" != "$(docker image ls -q "$1")" ]; then
+		echo "New build uploaded, removing old image, id: $OLD_IMG"
+		docker image rmi -f "$OLD_IMG" || true
+        echo "Exit status: $?"
+	fi
+fi
diff --git a/node/build-all.sh b/node/build-all.sh
old mode 100644
new mode 100755
diff --git a/node/npm/build-image.sh b/node/npm/build-image.sh
old mode 100644
new mode 100755