diff --git a/docker/centos/source/base/Dockerfile b/docker/centos/source/base/Dockerfile
index 974d79da12..781827652b 100644
--- a/docker/centos/source/base/Dockerfile
+++ b/docker/centos/source/base/Dockerfile
@@ -21,6 +21,7 @@ RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \
     && rm get-pip.py
 
 RUN pip install --upgrade \
+    cachetools \
     crudini \
     crux \
     pip
diff --git a/docker/centos/source/neutron/neutron-agents/Dockerfile b/docker/centos/source/neutron/neutron-agents/Dockerfile
new file mode 100644
index 0000000000..546c2a2104
--- /dev/null
+++ b/docker/centos/source/neutron/neutron-agents/Dockerfile
@@ -0,0 +1,27 @@
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%neutron-base:%%KOLLA_TAG%%
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+# Install supervisor
+RUN easy_install supervisor
+
+# Install supervisor-stdout
+RUN pip install supervisor-stdout
+
+# Configure supervisord
+RUN mkdir -p /var/log/supervisor/
+COPY supervisord.conf /etc/
+
+# TODO: SamYaple FWaaS is part of the l3-agent, not a seperate agent that is
+# why this file is needed. To support FWaaS we cannot have a seperate container
+# I need to figure out the best way to make this work together
+#
+# This file _does_ _not_ need to exist, you must remove referencing it from the
+# exec line in the start script. Also all these config options can exist in the
+# main neutron.conf if we wish
+COPY fwaas_driver.ini /etc/neutron/
+
+COPY neutron-dhcp-agent/ /opt/kolla/neutron-dhcp-agent
+COPY neutron-l3-agent/ /opt/kolla/neutron-l3-agent
+COPY neutron-metadata-agent/ /opt/kolla/neutron-metadata-agent
+
+CMD ["/usr/bin/supervisord"]
diff --git a/docker/centos/source/neutron/neutron-agents/build b/docker/centos/source/neutron/neutron-agents/build
new file mode 120000
index 0000000000..ec19138031
--- /dev/null
+++ b/docker/centos/source/neutron/neutron-agents/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/neutron/neutron-agents/fwaas_driver.ini b/docker/centos/source/neutron/neutron-agents/fwaas_driver.ini
new file mode 120000
index 0000000000..0e016223ce
--- /dev/null
+++ b/docker/centos/source/neutron/neutron-agents/fwaas_driver.ini
@@ -0,0 +1 @@
+../../../../common/neutron/neutron-l3-agent/fwaas_driver.ini
\ No newline at end of file
diff --git a/docker/centos/source/neutron/neutron-agents/neutron-dhcp-agent/check.sh b/docker/centos/source/neutron/neutron-agents/neutron-dhcp-agent/check.sh
new file mode 120000
index 0000000000..8658a69801
--- /dev/null
+++ b/docker/centos/source/neutron/neutron-agents/neutron-dhcp-agent/check.sh
@@ -0,0 +1 @@
+../../../../../common/neutron/neutron-dhcp-agent/check.sh
\ No newline at end of file
diff --git a/docker/centos/source/neutron/neutron-agents/neutron-dhcp-agent/config-external.sh b/docker/centos/source/neutron/neutron-agents/neutron-dhcp-agent/config-external.sh
new file mode 120000
index 0000000000..680eee8757
--- /dev/null
+++ b/docker/centos/source/neutron/neutron-agents/neutron-dhcp-agent/config-external.sh
@@ -0,0 +1 @@
+../../../../../common/neutron/neutron-dhcp-agent/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/neutron/neutron-agents/neutron-dhcp-agent/config-internal.sh b/docker/centos/source/neutron/neutron-agents/neutron-dhcp-agent/config-internal.sh
new file mode 120000
index 0000000000..65cd887042
--- /dev/null
+++ b/docker/centos/source/neutron/neutron-agents/neutron-dhcp-agent/config-internal.sh
@@ -0,0 +1 @@
+../../../../../common/neutron/neutron-dhcp-agent/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/source/neutron/neutron-agents/neutron-dhcp-agent/start.sh b/docker/centos/source/neutron/neutron-agents/neutron-dhcp-agent/start.sh
new file mode 120000
index 0000000000..63dad958d6
--- /dev/null
+++ b/docker/centos/source/neutron/neutron-agents/neutron-dhcp-agent/start.sh
@@ -0,0 +1 @@
+../../../../../common/neutron/neutron-dhcp-agent/start.sh
\ No newline at end of file
diff --git a/docker/centos/source/neutron/neutron-agents/neutron-l3-agent/check.sh b/docker/centos/source/neutron/neutron-agents/neutron-l3-agent/check.sh
new file mode 120000
index 0000000000..df50ef3901
--- /dev/null
+++ b/docker/centos/source/neutron/neutron-agents/neutron-l3-agent/check.sh
@@ -0,0 +1 @@
+../../../../../common/neutron/neutron-l3-agent/check.sh
\ No newline at end of file
diff --git a/docker/centos/source/neutron/neutron-agents/neutron-l3-agent/config-external.sh b/docker/centos/source/neutron/neutron-agents/neutron-l3-agent/config-external.sh
new file mode 120000
index 0000000000..f4530afd99
--- /dev/null
+++ b/docker/centos/source/neutron/neutron-agents/neutron-l3-agent/config-external.sh
@@ -0,0 +1 @@
+../../../../../common/neutron/neutron-l3-agent/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/neutron/neutron-agents/neutron-l3-agent/config-internal.sh b/docker/centos/source/neutron/neutron-agents/neutron-l3-agent/config-internal.sh
new file mode 120000
index 0000000000..73c2ccb551
--- /dev/null
+++ b/docker/centos/source/neutron/neutron-agents/neutron-l3-agent/config-internal.sh
@@ -0,0 +1 @@
+../../../../../common/neutron/neutron-l3-agent/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/source/neutron/neutron-agents/neutron-l3-agent/fwaas_driver.ini b/docker/centos/source/neutron/neutron-agents/neutron-l3-agent/fwaas_driver.ini
new file mode 120000
index 0000000000..8ea67959c5
--- /dev/null
+++ b/docker/centos/source/neutron/neutron-agents/neutron-l3-agent/fwaas_driver.ini
@@ -0,0 +1 @@
+../../../../../common/neutron/neutron-l3-agent/fwaas_driver.ini
\ No newline at end of file
diff --git a/docker/centos/source/neutron/neutron-agents/neutron-l3-agent/start.sh b/docker/centos/source/neutron/neutron-agents/neutron-l3-agent/start.sh
new file mode 120000
index 0000000000..fa70dec8b1
--- /dev/null
+++ b/docker/centos/source/neutron/neutron-agents/neutron-l3-agent/start.sh
@@ -0,0 +1 @@
+../../../../../common/neutron/neutron-l3-agent/start.sh
\ No newline at end of file
diff --git a/docker/centos/source/neutron/neutron-agents/neutron-metadata-agent/check.sh b/docker/centos/source/neutron/neutron-agents/neutron-metadata-agent/check.sh
new file mode 120000
index 0000000000..ddbee63083
--- /dev/null
+++ b/docker/centos/source/neutron/neutron-agents/neutron-metadata-agent/check.sh
@@ -0,0 +1 @@
+../../../../../common/neutron/neutron-metadata-agent/check.sh
\ No newline at end of file
diff --git a/docker/centos/source/neutron/neutron-agents/neutron-metadata-agent/config-external.sh b/docker/centos/source/neutron/neutron-agents/neutron-metadata-agent/config-external.sh
new file mode 120000
index 0000000000..a5c3ac24a0
--- /dev/null
+++ b/docker/centos/source/neutron/neutron-agents/neutron-metadata-agent/config-external.sh
@@ -0,0 +1 @@
+../../../../../common/neutron/neutron-metadata-agent/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/neutron/neutron-agents/neutron-metadata-agent/config-internal.sh b/docker/centos/source/neutron/neutron-agents/neutron-metadata-agent/config-internal.sh
new file mode 120000
index 0000000000..23d60c52f8
--- /dev/null
+++ b/docker/centos/source/neutron/neutron-agents/neutron-metadata-agent/config-internal.sh
@@ -0,0 +1 @@
+../../../../../common/neutron/neutron-metadata-agent/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/source/neutron/neutron-agents/neutron-metadata-agent/start.sh b/docker/centos/source/neutron/neutron-agents/neutron-metadata-agent/start.sh
new file mode 120000
index 0000000000..0de2452ee9
--- /dev/null
+++ b/docker/centos/source/neutron/neutron-agents/neutron-metadata-agent/start.sh
@@ -0,0 +1 @@
+../../../../../common/neutron/neutron-metadata-agent/start.sh
\ No newline at end of file
diff --git a/docker/centos/source/neutron/neutron-agents/supervisord.conf b/docker/centos/source/neutron/neutron-agents/supervisord.conf
new file mode 100644
index 0000000000..2db1af2dc2
--- /dev/null
+++ b/docker/centos/source/neutron/neutron-agents/supervisord.conf
@@ -0,0 +1,46 @@
+[unix_http_server]
+file = /var/run/supervisor.sock
+
+[inet_http_server]
+port = 127.0.0.1:9001
+
+[supervisord]
+nodaemon=true
+logfile = /var/log/supervisor/supervisord.log
+logfile_maxbytes = 200KB
+logfile_backups = 1
+pidfile = /var/run/supervisord.pid
+childlogdir = /var/log/supervisor
+
+[rpcinterface:supervisor]
+supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
+
+[supervisorctl]
+serverurl = unix:///var/run/supervisor.sock
+
+[program:neutron-dhcp-agent]
+command=/opt/kolla/neutron-dhcp-agent/start.sh
+priority=40
+startsec=10
+stderr_events_enabled=true
+stdout_events_enabled=true
+
+[program:neutron-metadata-agent]
+command=/opt/kolla/neutron-metadata-agent/start.sh
+priority=40
+startsec=10
+stderr_events_enabled=true
+stdout_events_enabled=true
+
+[program:neutron-l3-agent]
+command=/opt/kolla/neutron-l3-agent/start.sh
+priority=40
+startsec=10
+stderr_events_enabled=true
+stdout_events_enabled=true
+
+[eventlistener:stdout]
+command = supervisor_stdout
+buffer_size = 100
+events = PROCESS_LOG
+result_handler = supervisor_stdout:event_handler
diff --git a/docker/centos/source/neutron/neutron-base/.buildinfo b/docker/centos/source/neutron/neutron-base/.buildinfo
new file mode 100644
index 0000000000..586be38175
--- /dev/null
+++ b/docker/centos/source/neutron/neutron-base/.buildinfo
@@ -0,0 +1,11 @@
+# Build info specific to this image. All values can be overridden in .buildconf
+
+SOURCE_INSTALL_METHOD=curl
+COMPONENT=neutron
+SOURCE_INSTALL_AVAILABLE=1
+
+# Used for git install method
+: ${CLONE_FROM:=https://github.com/openstack/neutron}
+
+# Used for curl install method
+: ${TARBALL_URI:=http://tarballs.openstack.org/neutron/neutron-2015.1.0.tar.gz}
diff --git a/docker/centos/source/neutron/neutron-base/Dockerfile b/docker/centos/source/neutron/neutron-base/Dockerfile
new file mode 100644
index 0000000000..8d9ba1816e
--- /dev/null
+++ b/docker/centos/source/neutron/neutron-base/Dockerfile
@@ -0,0 +1,19 @@
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+ADD ./neutron.tar /
+RUN ln -s /neutron-* /neutron
+
+RUN cd /neutron \
+    && useradd --user-group neutron \
+    && pip install -r requirements.txt \
+    && pip install /neutron \
+    && mkdir /etc/neutron /usr/share/neutron /var/log/neutron \
+    && cp -r etc/* /etc/neutron/ \
+    && cp -r etc/neutron/* /etc/neutron/ \
+    && cp etc/api-paste.ini /usr/share/neutron \
+    && mv /etc/neutron/neutron/ /etc/neutron/plugins/ \
+    && chown -R neutron: /etc/neutron /var/log/neutron \
+    && rm -rf /root/.cache
+
+COPY config-neutron.sh config-sudoers.sh /opt/kolla/
diff --git a/docker/centos/source/neutron/neutron-base/build b/docker/centos/source/neutron/neutron-base/build
new file mode 120000
index 0000000000..ec19138031
--- /dev/null
+++ b/docker/centos/source/neutron/neutron-base/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/neutron/neutron-base/config-neutron.sh b/docker/centos/source/neutron/neutron-base/config-neutron.sh
new file mode 120000
index 0000000000..0de5981230
--- /dev/null
+++ b/docker/centos/source/neutron/neutron-base/config-neutron.sh
@@ -0,0 +1 @@
+../../../../common/neutron/neutron-base/config-neutron.sh
\ No newline at end of file
diff --git a/docker/centos/source/neutron/neutron-base/config-sudoers.sh b/docker/centos/source/neutron/neutron-base/config-sudoers.sh
new file mode 120000
index 0000000000..08e65f4d7e
--- /dev/null
+++ b/docker/centos/source/neutron/neutron-base/config-sudoers.sh
@@ -0,0 +1 @@
+../../../../common/neutron/neutron-base/config-sudoers.sh
\ No newline at end of file
diff --git a/docker/centos/source/neutron/neutron-base/ip_wrapper.py b/docker/centos/source/neutron/neutron-base/ip_wrapper.py
new file mode 120000
index 0000000000..10607150ab
--- /dev/null
+++ b/docker/centos/source/neutron/neutron-base/ip_wrapper.py
@@ -0,0 +1 @@
+../../../../common/neutron/neutron-base/ip_wrapper.py
\ No newline at end of file
diff --git a/docker/centos/source/neutron/neutron-linuxbridge-agent/Dockerfile b/docker/centos/source/neutron/neutron-linuxbridge-agent/Dockerfile
new file mode 100644
index 0000000000..db552af070
--- /dev/null
+++ b/docker/centos/source/neutron/neutron-linuxbridge-agent/Dockerfile
@@ -0,0 +1,11 @@
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%neutron-base:%%KOLLA_TAG%%
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+# Install required packages
+RUN yum install -y ebtables && yum clean all
+
+COPY check.sh start.sh /
+
+COPY config-internal.sh config-external.sh /opt/kolla/
+
+CMD ["/start.sh"]
diff --git a/docker/centos/source/neutron/neutron-linuxbridge-agent/build b/docker/centos/source/neutron/neutron-linuxbridge-agent/build
new file mode 120000
index 0000000000..ec19138031
--- /dev/null
+++ b/docker/centos/source/neutron/neutron-linuxbridge-agent/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/neutron/neutron-linuxbridge-agent/check.sh b/docker/centos/source/neutron/neutron-linuxbridge-agent/check.sh
new file mode 120000
index 0000000000..469fd5d7fd
--- /dev/null
+++ b/docker/centos/source/neutron/neutron-linuxbridge-agent/check.sh
@@ -0,0 +1 @@
+../../../../common/neutron/neutron-linuxbridge-agent/check.sh
\ No newline at end of file
diff --git a/docker/centos/source/neutron/neutron-linuxbridge-agent/config-external.sh b/docker/centos/source/neutron/neutron-linuxbridge-agent/config-external.sh
new file mode 120000
index 0000000000..6bd77d67dc
--- /dev/null
+++ b/docker/centos/source/neutron/neutron-linuxbridge-agent/config-external.sh
@@ -0,0 +1 @@
+../../../../common/neutron/neutron-linuxbridge-agent/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/neutron/neutron-linuxbridge-agent/config-internal.sh b/docker/centos/source/neutron/neutron-linuxbridge-agent/config-internal.sh
new file mode 120000
index 0000000000..faacbd3ed9
--- /dev/null
+++ b/docker/centos/source/neutron/neutron-linuxbridge-agent/config-internal.sh
@@ -0,0 +1 @@
+../../../../common/neutron/neutron-linuxbridge-agent/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/source/neutron/neutron-linuxbridge-agent/start.sh b/docker/centos/source/neutron/neutron-linuxbridge-agent/start.sh
new file mode 120000
index 0000000000..9d51d3d6a1
--- /dev/null
+++ b/docker/centos/source/neutron/neutron-linuxbridge-agent/start.sh
@@ -0,0 +1 @@
+../../../../common/neutron/neutron-linuxbridge-agent/start.sh
\ No newline at end of file
diff --git a/docker/centos/source/neutron/neutron-openvswitch-agent/Dockerfile b/docker/centos/source/neutron/neutron-openvswitch-agent/Dockerfile
new file mode 100644
index 0000000000..7bc3e2bb85
--- /dev/null
+++ b/docker/centos/source/neutron/neutron-openvswitch-agent/Dockerfile
@@ -0,0 +1,14 @@
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%neutron-base:%%KOLLA_TAG%%
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+# Install required packages
+RUN yum install -y \
+        https://rdoproject.org/repos/openstack-kilo/rdo-release-kilo.rpm \
+        openvswitch \
+    && yum clean all
+
+COPY check.sh start.sh /
+
+COPY config-internal.sh config-external.sh /opt/kolla/
+
+CMD ["/start.sh"]
diff --git a/docker/centos/source/neutron/neutron-openvswitch-agent/build b/docker/centos/source/neutron/neutron-openvswitch-agent/build
new file mode 120000
index 0000000000..ec19138031
--- /dev/null
+++ b/docker/centos/source/neutron/neutron-openvswitch-agent/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/neutron/neutron-openvswitch-agent/check.sh b/docker/centos/source/neutron/neutron-openvswitch-agent/check.sh
new file mode 120000
index 0000000000..1a664032e6
--- /dev/null
+++ b/docker/centos/source/neutron/neutron-openvswitch-agent/check.sh
@@ -0,0 +1 @@
+../../../../common/neutron/neutron-openvswitch-agent/check.sh
\ No newline at end of file
diff --git a/docker/centos/source/neutron/neutron-openvswitch-agent/config-external.sh b/docker/centos/source/neutron/neutron-openvswitch-agent/config-external.sh
new file mode 120000
index 0000000000..14354b71a0
--- /dev/null
+++ b/docker/centos/source/neutron/neutron-openvswitch-agent/config-external.sh
@@ -0,0 +1 @@
+../../../../common/neutron/neutron-openvswitch-agent/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/neutron/neutron-openvswitch-agent/config-internal.sh b/docker/centos/source/neutron/neutron-openvswitch-agent/config-internal.sh
new file mode 120000
index 0000000000..1d7c6c6bff
--- /dev/null
+++ b/docker/centos/source/neutron/neutron-openvswitch-agent/config-internal.sh
@@ -0,0 +1 @@
+../../../../common/neutron/neutron-openvswitch-agent/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/source/neutron/neutron-openvswitch-agent/start.sh b/docker/centos/source/neutron/neutron-openvswitch-agent/start.sh
new file mode 120000
index 0000000000..c14edb0adf
--- /dev/null
+++ b/docker/centos/source/neutron/neutron-openvswitch-agent/start.sh
@@ -0,0 +1 @@
+../../../../common/neutron/neutron-openvswitch-agent/start.sh
\ No newline at end of file
diff --git a/docker/centos/source/neutron/neutron-server/Dockerfile b/docker/centos/source/neutron/neutron-server/Dockerfile
new file mode 100644
index 0000000000..75f7c066f9
--- /dev/null
+++ b/docker/centos/source/neutron/neutron-server/Dockerfile
@@ -0,0 +1,11 @@
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%neutron-base:%%KOLLA_TAG%%
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+#Install required packages
+RUN yum install -y which && \
+    yum clean all
+
+COPY check.sh start.sh /
+COPY config-internal.sh config-external.sh /opt/kolla/
+
+CMD ["/start.sh"]
diff --git a/docker/centos/source/neutron/neutron-server/build b/docker/centos/source/neutron/neutron-server/build
new file mode 120000
index 0000000000..ec19138031
--- /dev/null
+++ b/docker/centos/source/neutron/neutron-server/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/neutron/neutron-server/check.sh b/docker/centos/source/neutron/neutron-server/check.sh
new file mode 120000
index 0000000000..0019366163
--- /dev/null
+++ b/docker/centos/source/neutron/neutron-server/check.sh
@@ -0,0 +1 @@
+../../../../common/neutron/neutron-server/check.sh
\ No newline at end of file
diff --git a/docker/centos/source/neutron/neutron-server/config-external.sh b/docker/centos/source/neutron/neutron-server/config-external.sh
new file mode 120000
index 0000000000..b8d7792ced
--- /dev/null
+++ b/docker/centos/source/neutron/neutron-server/config-external.sh
@@ -0,0 +1 @@
+../../../../common/neutron/neutron-server/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/neutron/neutron-server/config-internal.sh b/docker/centos/source/neutron/neutron-server/config-internal.sh
new file mode 120000
index 0000000000..6c3a8a112b
--- /dev/null
+++ b/docker/centos/source/neutron/neutron-server/config-internal.sh
@@ -0,0 +1 @@
+../../../../common/neutron/neutron-server/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/source/neutron/neutron-server/start.sh b/docker/centos/source/neutron/neutron-server/start.sh
new file mode 120000
index 0000000000..a11ea7703f
--- /dev/null
+++ b/docker/centos/source/neutron/neutron-server/start.sh
@@ -0,0 +1 @@
+../../../../common/neutron/neutron-server/start.sh
\ No newline at end of file