diff --git a/monasca-agent-collector/start.sh b/monasca-agent-collector/start.sh
index becb2240f..6234dea57 100755
--- a/monasca-agent-collector/start.sh
+++ b/monasca-agent-collector/start.sh
@@ -1,4 +1,5 @@
 #!/bin/ash
+# shellcheck shell=dash
 # (C) Copyright 2017 Hewlett Packard Enterprise Development LP
 
 set -x
@@ -9,7 +10,7 @@ USER_PLUGINS="/plugins.d"
 AGENT_CONF="/etc/monasca/agent"
 AGENT_PLUGINS="$AGENT_CONF/conf.d"
 
-if [ "$KEYSTONE_DEFAULTS_ENABLED" == "true" ]; then
+if [ "$KEYSTONE_DEFAULTS_ENABLED" = "true" ]; then
   export OS_AUTH_URL=${OS_AUTH_URL:-"http://keystone:35357/v3/"}
   export OS_USERNAME=${OS_USERNAME:-"monasca-agent"}
   export OS_PASSWORD=${OS_PASSWORD:-"password"}
@@ -29,8 +30,7 @@ template () {
 }
 
 if [ "$HOSTNAME_FROM_KUBERNETES" = "true" ]; then
-  AGENT_HOSTNAME=$(python /kubernetes_get_host.py)
-  if [ $? != 0 ]; then
+  if ! AGENT_HOSTNAME=$(python /kubernetes_get_host.py); then
     echo "Error getting hostname from Kubernetes"
     return 1
   fi
diff --git a/monasca-agent-forwarder/start.sh b/monasca-agent-forwarder/start.sh
index 5c92ffd43..f3a1be648 100755
--- a/monasca-agent-forwarder/start.sh
+++ b/monasca-agent-forwarder/start.sh
@@ -1,11 +1,12 @@
 #!/bin/ash
+# shellcheck shell=dash
 # (C) Copyright 2017 Hewlett Packard Enterprise Development LP
 
 set -x
 
 AGENT_CONF="/etc/monasca/agent"
 
-if [ "$KEYSTONE_DEFAULTS_ENABLED" == "true" ]; then
+if [ "$KEYSTONE_DEFAULTS_ENABLED" = "true" ]; then
   export OS_AUTH_URL=${OS_AUTH_URL:-"http://keystone:35357/v3/"}
   export OS_USERNAME=${OS_USERNAME:-"monasca-agent"}
   export OS_PASSWORD=${OS_PASSWORD:-"password"}
@@ -23,8 +24,7 @@ template () {
 }
 
 if [ "$HOSTNAME_FROM_KUBERNETES" = "true" ]; then
-  AGENT_HOSTNAME=$(python /kubernetes_get_host.py)
-  if [ $? != 0 ]; then
+  if ! AGENT_HOSTNAME=$(python /kubernetes_get_host.py); then
     echo "Error getting hostname from Kubernetes"
     return 1
   fi