diff --git a/monasca-agent-collector/Dockerfile b/monasca-agent-collector/Dockerfile
index a69cfae8b..078ba1a1d 100644
--- a/monasca-agent-collector/Dockerfile
+++ b/monasca-agent-collector/Dockerfile
@@ -1,4 +1,5 @@
-FROM monasca/agent-base:master-20170901-210328
+ARG MON_AGENT_BASE_VERSION
+FROM monasca/agent-base:${MON_AGENT_BASE_VERSION}
 
 ARG AGENT_USER="mon-agent"
 
diff --git a/monasca-agent-collector/build.yml b/monasca-agent-collector/build.yml
index 1e9fe9572..b1f77f019 100644
--- a/monasca-agent-collector/build.yml
+++ b/monasca-agent-collector/build.yml
@@ -3,3 +3,5 @@ variants:
   - tag: master
     aliases:
       - :master-{date}-{time}
+    args:
+      MON_AGENT_BASE_VERSION: master-20170918-171757
diff --git a/monasca-agent-collector/start.sh b/monasca-agent-collector/start.sh
index 638ad53c8..afc83a1f3 100755
--- a/monasca-agent-collector/start.sh
+++ b/monasca-agent-collector/start.sh
@@ -68,4 +68,4 @@ done
 
 template $AGENT_CONF/agent.yaml.j2 $AGENT_CONF/agent.yaml
 
-/usr/bin/monasca-collector foreground
+monasca-collector foreground
diff --git a/monasca-agent-forwarder/Dockerfile b/monasca-agent-forwarder/Dockerfile
index fb7a0bbd7..aaf38ce7c 100644
--- a/monasca-agent-forwarder/Dockerfile
+++ b/monasca-agent-forwarder/Dockerfile
@@ -1,4 +1,5 @@
-FROM monasca/agent-base:master-20170901-210328
+ARG MON_AGENT_BASE_VERSION
+FROM monasca/agent-base:${MON_AGENT_BASE_VERSION}
 
 ARG AGENT_USER="mon-agent"
 
diff --git a/monasca-agent-forwarder/build.yml b/monasca-agent-forwarder/build.yml
index 9fe756592..9493eb31f 100644
--- a/monasca-agent-forwarder/build.yml
+++ b/monasca-agent-forwarder/build.yml
@@ -3,3 +3,5 @@ variants:
   - tag: master
     aliases:
       - :master-{date}-{time}
+    args:
+      MON_AGENT_BASE_VERSION: master-20170918-171757
diff --git a/monasca-agent-forwarder/start.sh b/monasca-agent-forwarder/start.sh
index eb058d223..85f9910c6 100755
--- a/monasca-agent-forwarder/start.sh
+++ b/monasca-agent-forwarder/start.sh
@@ -24,4 +24,4 @@ fi
 
 template $AGENT_CONF/agent.yaml.j2 $AGENT_CONF/agent.yaml
 
-/usr/bin/monasca-forwarder
+monasca-forwarder