diff --git a/logspout/build.yml b/logspout/build.yml
index e5955067c..f1e25f445 100644
--- a/logspout/build.yml
+++ b/logspout/build.yml
@@ -1,6 +1,6 @@
 repository: monasca/logspout
 variants:
-  - tag: 0.0.1
+  - tag: 0.0.2
     aliases:
       - :latest
     args:
diff --git a/logspout/start.sh b/logspout/start.sh
index acca15880..4443c3976 100755
--- a/logspout/start.sh
+++ b/logspout/start.sh
@@ -4,10 +4,10 @@
 MONASCA_LOG_AGENT_WAIT_RETRIES=${MONASCA_LOG_AGENT_WAIT_RETRIES:-"24"}
 MONASCA_LOG_AGENT_WAIT_DELAY=${MONASCA_LOG_AGENT_WAIT_DELAY:-"5"}
 
-if [ $MONASCA_WAIT_FOR_LOG_AGENT = "true" ]; then
+if [ "$MONASCA_WAIT_FOR_LOG_AGENT" = "true" ]; then
     RETRIES=$MONASCA_LOG_AGENT_WAIT_RETRIES \
       SLEEP_LENGTH=$MONASCA_LOG_AGENT_WAIT_DELAY \
-      /wait-for.sh ${MONASCA_LOG_AGENT_URI} && /bin/logspout
+      /wait-for.sh "${MONASCA_LOG_AGENT_URI}" && /bin/logspout
 else
     /bin/logspout
 fi
diff --git a/monasca-agent-base/apk_install.sh b/monasca-agent-base/apk_install.sh
index b42622fea..61cea032c 100644
--- a/monasca-agent-base/apk_install.sh
+++ b/monasca-agent-base/apk_install.sh
@@ -1,3 +1,6 @@
+#!/bin/sh
+# (C) Copyright 2017 FUJITSU LIMITED
+
 install_apk_deps() {
   apk add --no-cache libxml2 py2-psutil
   apk add --no-cache --virtual build-dep git make g++ linux-headers libxml2-dev libxslt-dev