diff --git a/build.sh b/build.sh
index 0c26351..255cdd5 100755
--- a/build.sh
+++ b/build.sh
@@ -4,5 +4,15 @@ IMAGE_NAME="azure-image-chooser"
 #IMAGE="docker.io/skoszewski/$IMAGE_NAME"
 IMAGE="skdomlab.azurecr.io/$IMAGE_NAME"
 
-podman build -t $IMAGE .
-podman push $IMAGE
+if [ "$(command -v docker)" = "docker" ]
+then
+    CMD="docker"
+elif [ "$(command -v podman)" = "podman" ]; then
+    CMD="podman"
+else
+    echo "No suitable container tool found"
+    exit 1
+fi
+
+$CMD build -t $IMAGE .
+$CMD push $IMAGE
diff --git a/run-container.sh b/run-container.sh
index eadf53f..c4b3e45 100755
--- a/run-container.sh
+++ b/run-container.sh
@@ -5,7 +5,17 @@ if [ -z "$AZURE_CLIENT_ID" ] || [ -z "$AZURE_TENANT_ID" ] || [ -z "$AZURE_CLIENT
     exit 1
 fi
 
-podman run --rm \
+if [ "$(command -v docker)" = "docker" ]
+then
+    CMD="docker"
+elif [ "$(command -v podman)" = "podman" ]; then
+    CMD="podman"
+else
+    echo "No suitable container tool found"
+    exit 1
+fi
+
+$CMD run --rm \
     -it \
     -e AZURE_CLIENT_ID="$AZURE_CLIENT_ID" \
     -e AZURE_TENANT_ID="$AZURE_TENANT_ID" \