diff --git a/build.sh b/build.sh
index 255cdd5..1261950 100755
--- a/build.sh
+++ b/build.sh
@@ -4,10 +4,9 @@ IMAGE_NAME="azure-image-chooser"
 #IMAGE="docker.io/skoszewski/$IMAGE_NAME"
 IMAGE="skdomlab.azurecr.io/$IMAGE_NAME"
 
-if [ "$(command -v docker)" = "docker" ]
-then
+if [ "$(basename $(command -v docker))" = "docker" ]; then
     CMD="docker"
-elif [ "$(command -v podman)" = "podman" ]; then
+elif [ "$(basename $(command -v podman))" = "podman" ]; then
     CMD="podman"
 else
     echo "No suitable container tool found"
diff --git a/run-container.sh b/run-container.sh
index c4b3e45..d819ce4 100755
--- a/run-container.sh
+++ b/run-container.sh
@@ -5,10 +5,9 @@ if [ -z "$AZURE_CLIENT_ID" ] || [ -z "$AZURE_TENANT_ID" ] || [ -z "$AZURE_CLIENT
     exit 1
 fi
 
-if [ "$(command -v docker)" = "docker" ]
-then
+if [ "$(basename $(command -v docker))" = "docker" ]; then
     CMD="docker"
-elif [ "$(command -v podman)" = "podman" ]; then
+elif [ "$(basename $(command -v podman))" = "podman" ]; then
     CMD="podman"
 else
     echo "No suitable container tool found"