diff --git a/grafana/build.yml b/grafana/build.yml
index bb225e0b6..8e7173b1c 100644
--- a/grafana/build.yml
+++ b/grafana/build.yml
@@ -2,9 +2,9 @@ repository: monasca/grafana
 variants:
   - tag: latest
     aliases:
-      - :4.0.0-1.1.3
+      - :4.0.0-1.1.4
   - tag: app
     aliases:
-      - :4.0.0-1.3.0-app
+      - :4.0.0-1.3.1-app
     args:
       MONASCA_APP_REPO: https://github.com/monasca/monasca-grafana.git
diff --git a/grafana/start.sh b/grafana/start.sh
index fcbfbdd35..2882cb603 100644
--- a/grafana/start.sh
+++ b/grafana/start.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-if [ -n $GF_DATABASE_PORT ]; then
+if [ -n "$GF_DATABASE_PORT" ]; then
   export GF_DATABASE_HOST=$GF_DATABASE_HOST":"$GF_DATABASE_PORT
 fi