diff --git a/docker/pypi/wmagent/wmagent-docker-run.sh b/docker/pypi/wmagent/wmagent-docker-run.sh
index a6e2207d9..ad968ccc7 100755
--- a/docker/pypi/wmagent/wmagent-docker-run.sh
+++ b/docker/pypi/wmagent/wmagent-docker-run.sh
@@ -78,16 +78,13 @@ groupEntry=$(getent group $wmaGroup)
 
 # Validation step
 # Delete local docker passwd/group files if uucp is not present (so it can be recreated)
-if [ -f "$HOST_MOUNT_DIR/admin/etc/passwd" ]; then
-    if ! grep -q uucp "$HOST_MOUNT_DIR/admin/etc/passwd"; then
+[[ -f "$HOST_MOUNT_DIR/admin/etc/passwd" ]] && ! grep -q uucp "$HOST_MOUNT_DIR/admin/etc/passwd" &&  {
         rm $HOST_MOUNT_DIR/admin/etc/passwd
-    fi
-fi
-if [ -f "$HOST_MOUNT_DIR/admin/etc/group" ]; then
-    if ! grep -q uucp "$HOST_MOUNT_DIR/admin/etc/group"; then
+}
+[[ -f "$HOST_MOUNT_DIR/admin/etc/group" ]] && ! grep -q uucp "$HOST_MOUNT_DIR/admin/etc/group" &&  {
         rm $HOST_MOUNT_DIR/admin/etc/group
-    fi
-fi
+}
+
 if ! [ -f $HOST_MOUNT_DIR/admin/etc/passwd ]; then
     echo "Creating passwd file"
     getent passwd > $HOST_MOUNT_DIR/admin/etc/passwd