diff --git a/client/build-image.sh b/client/build-image.sh
index 0a7c055f..2986c84e 100644
--- a/client/build-image.sh
+++ b/client/build-image.sh
@@ -1,10 +1,13 @@
 #!/bin/bash
 
 version=$1
+echo "Version: $version"
 
-if [[ $version == *"SNAPSHOT"* ]]; then
-  version="latest"
-fi
+case "$version" in
+  *SNAPSHOT*)
+    version="latest"
+    ;;
+esac
 
 echo "Using image tag: $version"
 
diff --git a/server/build-image.sh b/server/build-image.sh
index d6a7dcb4..4ff2a2d4 100644
--- a/server/build-image.sh
+++ b/server/build-image.sh
@@ -1,10 +1,13 @@
 #!/bin/bash
 
 version=$1
+echo "Version: $version"
 
-if [[ $version == *"SNAPSHOT"* ]]; then
-  version="latest"
-fi
+case "$version" in
+  *SNAPSHOT*)
+    version="latest"
+    ;;
+esac
 
 echo "Using image tag: $version"
 
diff --git a/web/build-image.sh b/web/build-image.sh
index 23215e7d..afc38651 100644
--- a/web/build-image.sh
+++ b/web/build-image.sh
@@ -1,10 +1,13 @@
 #!/bin/bash
 
 version=$1
+echo "Version: $version"
 
-if [[ $version == *"SNAPSHOT"* ]]; then
-  version="latest"
-fi
+case "$version" in
+  *SNAPSHOT*)
+    version="latest"
+    ;;
+esac
 
 echo "Using image tag: $version"