diff --git a/docker/monasca/monasca-agent/Dockerfile.j2 b/docker/monasca/monasca-agent/Dockerfile.j2
new file mode 100644
index 0000000000..096e22c022
--- /dev/null
+++ b/docker/monasca/monasca-agent/Dockerfile.j2
@@ -0,0 +1,31 @@
+FROM {{ namespace }}/{{ image_prefix }}monasca-base:{{ tag }}
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
+
+{% block monasca_agent_header %}{% endblock %}
+
+{% import "macros.j2" as macros with context %}
+
+{% if install_type == 'binary' %}
+
+RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
+    && /bin/false
+
+{% elif install_type == 'source' %}
+
+ADD monasca-agent-archive /monasca-agent-source
+
+{% set monasca_agent_pip_packages = [
+    '/monasca-agent'
+] %}
+
+RUN ln -s monasca-agent-source/* monasca-agent \
+    && {{ macros.install_pip(monasca_agent_pip_packages | customizable("pip_packages")) }}
+
+{% endif %}
+
+{% block monasca_agent_footer %}{% endblock %}
+
+{% block footer %}{% endblock %}
+
+USER monasca
+
diff --git a/kolla/common/config.py b/kolla/common/config.py
index 5ac5df8959..7b7ae9daee 100755
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -506,6 +506,10 @@ SOURCES = {
         'type': 'url',
         'location': ('$tarballs_base/tacker/'
                      'tacker-master.tar.gz')},
+    'monasca-agent': {
+        'type': 'url',
+        'location': ('$tarballs_base/monasca-agent/'
+                     'monasca-agent-master.tar.gz')},
     'monasca-api': {
         'type': 'url',
         'location': ('$tarballs_base/monasca-api/'