diff --git a/tools/build-release.sh b/tools/build-release.sh
index 3ad03ddba1b4..4e67f1df749f 100755
--- a/tools/build-release.sh
+++ b/tools/build-release.sh
@@ -209,7 +209,7 @@ for target in $TARGETS; do
     esac
 done
 
-if [ -z "${TARGETS##* docker *}" ]; then
+if [ -z "${TARGETS##* docker *}" ] || [ -z "${TARGETS##* docker}" ]; then
     echo "Building Docker Images"
     DOCKER_USER="elementsproject"
     echo "Creating multi-platform images tagged as $VERSION and latest"
@@ -230,7 +230,7 @@ if [ -z "${TARGETS##* docker *}" ]; then
     echo "Pushed multi-platform images tagged as $VERSION and latest"
 fi
 
-if [ -z "${TARGETS##* sign *}" ]; then
+if [ -z "${TARGETS##* sign *}" ] || [ -z "${TARGETS##* sign}" ]; then
     echo "Signing Release"
     cd release/ || exit
     sha256sum clightning-"$VERSION"-*.tar.* clightning-"$VERSION".zip > SHA256SUMS-"$VERSION"