diff --git a/script/werun b/script/werun
index ea5ff0cbc139efdc4b6c89570fd7423e3a95be84..4e45c1627a35d7ef67dee93890d97d5dce1db475 100755
--- a/script/werun
+++ b/script/werun
@@ -15,9 +15,9 @@ docker run --gpus all \
   -e __NV_PRIME_RENDER_OFFLOAD_PROVIDER=NVIDIA-G1 \
   -e __GLX_VENDOR_LIBRARY_NAME=nvidia \
   --rm -it --name devenv gitlab.liu.se:5000/lrs/devenv_docker_images/lrs-melodic:devel "$@"
-fi
 
-if [[ $(lsb_release -rs) == "20.04" ]]; then
+
+elif [[ $(lsb_release -rs) == "20.04" ]]; then
 docker run --gpus all \
   --network host \
   --security-opt apparmor:unconfined \
@@ -30,4 +30,7 @@ docker run --gpus all \
   -e __NV_PRIME_RENDER_OFFLOAD_PROVIDER=NVIDIA-G1 \
   -e __GLX_VENDOR_LIBRARY_NAME=nvidia \
   --rm -it --name devenv gitlab.liu.se:5000/lrs/devenv_docker_images/lrs-noetic:devel "$@"
+
+else
+  echo "Unsupported operating system"
 fi
diff --git a/script/wgrun b/script/wgrun
index 537dfc563bc7ed1aefe1ae6a9cedc2964d449148..4cc975877b622a7326222ba26d0e0456dc38aa76 100755
--- a/script/wgrun
+++ b/script/wgrun
@@ -11,9 +11,8 @@ docker run --gpus all \
   -e DISPLAY=unix${DISPLAY}\
   -e ROS_HOSTNAME=localhost \
   --rm -it --name devenv gitlab.liu.se:5000/lrs/devenv_docker_images/lrs-melodic:devel "$@"
-fi
 
-if [[ $(lsb_release -rs) == "20.04" ]]; then
+elif [[ $(lsb_release -rs) == "20.04" ]]; then
 docker run --gpus all \
   --network host \
   --security-opt apparmor:unconfined \
@@ -24,4 +23,7 @@ docker run --gpus all \
   -e DISPLAY=unix${DISPLAY}\
   -e ROS_HOSTNAME=localhost \
   --rm -it --name devenv gitlab.liu.se:5000/lrs/devenv_docker_images/lrs-noetic:devel "$@"
+
+else
+  echo "Unsupported operating system"
 fi
diff --git a/script/wpull b/script/wpull
index 295abb1fb363723467d5767ba2e814b81044ec57..dac1787ab9866b5b7820d4d384eba6f5cb670da0 100755
--- a/script/wpull
+++ b/script/wpull
@@ -3,11 +3,13 @@
 if [[ $(lsb_release -rs) == "18.04" ]]; then
     echo "Pulling gitlab.liu.se:5000/lrs/devenv_docker_images/lrs-melodic:devel"
     docker pull gitlab.liu.se:5000/lrs/devenv_docker_images/lrs-melodic:devel
-fi
 
-if [[ $(lsb_release -rs) == "20.04" ]]; then
+elif [[ $(lsb_release -rs) == "20.04" ]]; then
     echo "Pulling gitlab.liu.se:5000/lrs/devenv_docker_images/lrs-noetic:devel"
     docker pull gitlab.liu.se:5000/lrs/devenv_docker_images/lrs-noetic:devel
+
+else
+    echo "Unsupported operating system"
 fi
 
 
diff --git a/script/wrun b/script/wrun
index 59927f4182023df532b3135e02d700bf6f59a1cc..f0c3518b8cc5ad83e98a0dd0c36f1ec8b4e7fc0d 100755
--- a/script/wrun
+++ b/script/wrun
@@ -10,9 +10,8 @@ docker run \
   -e DISPLAY=unix${DISPLAY}\
   -e ROS_HOSTNAME=localhost \
   --rm -it --name devenv gitlab.liu.se:5000/lrs/devenv_docker_images/lrs-melodic:devel "$@"
-fi
 
-if [[ $(lsb_release -rs) == "20.04" ]]; then
+elif [[ $(lsb_release -rs) == "20.04" ]]; then
 docker run \
   --network host \
   --ulimit nofile=1024 \
@@ -22,4 +21,7 @@ docker run \
   -e DISPLAY=unix${DISPLAY}\
   -e ROS_HOSTNAME=localhost \
   --rm -it --name devenv gitlab.liu.se:5000/lrs/devenv_docker_images/lrs-noetic:devel "$@"
+
+else
+    echo "Unsupported operating system"
 fi