diff --git a/docker_templates/nova/nova-api/Dockerfile.j2 b/docker_templates/nova/nova-api/Dockerfile.j2
new file mode 100644
index 0000000000000000000000000000000000000000..1b1e119275736b2df856ff6c4fc658a82e995d84
--- /dev/null
+++ b/docker_templates/nova/nova-api/Dockerfile.j2
@@ -0,0 +1,16 @@
+FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-nova-base:{{ tag }}
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+{% if install_type == 'binary' %}
+ {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %}
+
+RUN yum -y install openstack-nova-api \
+ && yum clean all
+
+ {% endif %}
+{% endif %}
+
+COPY start.sh /
+COPY config-external.sh /opt/kolla/
+
+CMD ["/start.sh"]
diff --git a/docker_templates/nova/nova-api/config-external.sh b/docker_templates/nova/nova-api/config-external.sh
new file mode 120000
index 0000000000000000000000000000000000000000..bfa5b09c031a15d30f67e15078256919d45de50d
--- /dev/null
+++ b/docker_templates/nova/nova-api/config-external.sh
@@ -0,0 +1 @@
+../../../docker/common/nova/nova-api/config-external.sh
\ No newline at end of file
diff --git a/docker_templates/nova/nova-api/start.sh b/docker_templates/nova/nova-api/start.sh
new file mode 120000
index 0000000000000000000000000000000000000000..e4407856ea88267580a82f4ef45d492be226d856
--- /dev/null
+++ b/docker_templates/nova/nova-api/start.sh
@@ -0,0 +1 @@
+../../../docker/common/nova/nova-api/start.sh
\ No newline at end of file
diff --git a/docker_templates/nova/nova-base/Dockerfile.j2 b/docker_templates/nova/nova-base/Dockerfile.j2
new file mode 100644
index 0000000000000000000000000000000000000000..46ce0e2e0dc26d7fd98a4094706781cf35cafb2a
--- /dev/null
+++ b/docker_templates/nova/nova-base/Dockerfile.j2
@@ -0,0 +1,52 @@
+FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-base:{{ tag }}
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+{% if install_type == 'binary' %}
+ {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %}
+
+RUN yum -y install \
+ openstack-nova-common \
+ python-keystoneclient \
+ python-cinderclient \
+ python-nova \
+ bridge-utils \
+ && yum clean all
+
+ {% elif base_distro in ['ubuntu', 'debian'] %}
+
+RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
+ && /bin/false
+
+ {% endif %}
+{% elif install_type == 'source' %}
+ {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %}
+
+RUN yum -y install \
+ bridge-utils \
+ && yum clean all
+
+ {% elif base_distro in ['ubuntu', 'debian'] %}
+
+RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
+ && /bin/false
+
+ {% endif %}
+
+RUN pip install \
+ python-cinderclient \
+ python-keystoneclient
+
+ADD ./nova.tar /
+RUN ln -s /nova-* /nova
+
+RUN cd /nova \
+ && useradd --user-group nova \
+ && pip install -r requirements.txt \
+ && pip install /nova \
+ && tox -egenconfig \
+ && mkdir /etc/nova /var/log/nova \
+ && cp -r /nova/etc/nova/* /etc/nova/ \
+ && chown -R nova: /etc/nova /var/log/nova \
+ && rm -rf /root/.cache
+
+{% endif %}
diff --git a/docker_templates/nova/nova-compute/Dockerfile.j2 b/docker_templates/nova/nova-compute/Dockerfile.j2
new file mode 100644
index 0000000000000000000000000000000000000000..84dd5d3d8d10b22cd5a276e195ffd2c17f85b8de
--- /dev/null
+++ b/docker_templates/nova/nova-compute/Dockerfile.j2
@@ -0,0 +1,27 @@
+FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-nova-base:{{ tag }}
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+{% if install_type == 'binary' %}
+ {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %}
+
+RUN yum -y install openstack-nova-compute \
+ openvswitch \
+ sysfsutils \
+ && yum clean all
+
+ {% endif %}
+{% elif install_type == 'source' %}
+
+RUN yum -y install \
+ sysfsutils \
+ libvirt-python \
+ && yum clean all
+
+{% endif %}
+
+COPY start.sh /
+COPY config-external.sh /opt/kolla/
+
+VOLUME [ "/sys/fs/cgroup" ]
+
+CMD ["/start.sh"]
diff --git a/docker_templates/nova/nova-compute/config-external.sh b/docker_templates/nova/nova-compute/config-external.sh
new file mode 120000
index 0000000000000000000000000000000000000000..f048280043392c7e04e14774c6e48ea37c783ae8
--- /dev/null
+++ b/docker_templates/nova/nova-compute/config-external.sh
@@ -0,0 +1 @@
+../../../docker/common/nova/nova-compute/config-external.sh
\ No newline at end of file
diff --git a/docker_templates/nova/nova-compute/start.sh b/docker_templates/nova/nova-compute/start.sh
new file mode 120000
index 0000000000000000000000000000000000000000..6745e03e6bae246399f260ea3a8b48d9760e289c
--- /dev/null
+++ b/docker_templates/nova/nova-compute/start.sh
@@ -0,0 +1 @@
+../../../docker/common/nova/nova-compute/start.sh
\ No newline at end of file
diff --git a/docker_templates/nova/nova-conductor/Dockerfile.j2 b/docker_templates/nova/nova-conductor/Dockerfile.j2
new file mode 100644
index 0000000000000000000000000000000000000000..572d2b46a0e76de2b30c36b4c82ad95a3934c39e
--- /dev/null
+++ b/docker_templates/nova/nova-conductor/Dockerfile.j2
@@ -0,0 +1,17 @@
+FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-nova-base:{{ tag }}
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+{% if install_type == 'binary' %}
+ {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %}
+
+RUN yum -y install \
+ openstack-nova-conductor \
+ && yum clean all
+
+ {% endif %}
+{% endif %}
+
+COPY start.sh /
+COPY config-external.sh /opt/kolla/
+
+CMD ["/start.sh"]
diff --git a/docker_templates/nova/nova-conductor/config-external.sh b/docker_templates/nova/nova-conductor/config-external.sh
new file mode 120000
index 0000000000000000000000000000000000000000..0f8937e2d4be012c1ef5dd4ad9a9904c95965c8e
--- /dev/null
+++ b/docker_templates/nova/nova-conductor/config-external.sh
@@ -0,0 +1 @@
+../../../docker/common/nova/nova-conductor/config-external.sh
\ No newline at end of file
diff --git a/docker_templates/nova/nova-conductor/start.sh b/docker_templates/nova/nova-conductor/start.sh
new file mode 120000
index 0000000000000000000000000000000000000000..bd27c2681739b87cbdd875c1857e1a0f01f7268d
--- /dev/null
+++ b/docker_templates/nova/nova-conductor/start.sh
@@ -0,0 +1 @@
+../../../docker/common/nova/nova-conductor/start.sh
\ No newline at end of file
diff --git a/docker_templates/nova/nova-consoleauth/Dockerfile.j2 b/docker_templates/nova/nova-consoleauth/Dockerfile.j2
new file mode 100644
index 0000000000000000000000000000000000000000..c1e8cbffbf1f1b3fd4bda806e291bf0af061ec8b
--- /dev/null
+++ b/docker_templates/nova/nova-consoleauth/Dockerfile.j2
@@ -0,0 +1,16 @@
+FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-nova-base:{{ tag }}
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+{% if install_type == 'binary' %}
+ {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %}
+
+RUN yum -y install openstack-nova-console \
+ && yum clean all
+
+ {% endif %}
+{% endif %}
+
+COPY start.sh /
+COPY config-external.sh /opt/kolla/
+
+CMD ["/start.sh"]
diff --git a/docker_templates/nova/nova-consoleauth/config-external.sh b/docker_templates/nova/nova-consoleauth/config-external.sh
new file mode 120000
index 0000000000000000000000000000000000000000..90fedb172c1fe55791b15b4184c6afb77a503b5e
--- /dev/null
+++ b/docker_templates/nova/nova-consoleauth/config-external.sh
@@ -0,0 +1 @@
+../../../docker/common/nova/nova-consoleauth/config-external.sh
\ No newline at end of file
diff --git a/docker_templates/nova/nova-consoleauth/start.sh b/docker_templates/nova/nova-consoleauth/start.sh
new file mode 120000
index 0000000000000000000000000000000000000000..23339e5d9cfd164686f3c09b7e28affbfa571a96
--- /dev/null
+++ b/docker_templates/nova/nova-consoleauth/start.sh
@@ -0,0 +1 @@
+../../../docker/common/nova/nova-consoleauth/start.sh
\ No newline at end of file
diff --git a/docker_templates/nova/nova-libvirt/Dockerfile.j2 b/docker_templates/nova/nova-libvirt/Dockerfile.j2
new file mode 100644
index 0000000000000000000000000000000000000000..691ec81335c72a73d9b79e57752bb1a9e755c4dc
--- /dev/null
+++ b/docker_templates/nova/nova-libvirt/Dockerfile.j2
@@ -0,0 +1,22 @@
+FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-nova-base:{{ tag }}
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+{% if base_distro in ['fedora', 'centos', 'oraclelinux'] %}
+
+RUN yum -y install \
+ libvirt-daemon \
+ libguestfs \
+ qemu-system-x86 \
+ libvirt-daemon-driver-nwfilter \
+ libvirt-daemon-config-nwfilter \
+ libvirt-daemon-driver-lxc \
+ && yum clean all
+
+{% endif %}
+
+COPY start.sh /
+COPY config-external.sh /opt/kolla/
+
+VOLUME [ "/sys/fs/cgroup" ]
+
+CMD ["/start.sh"]
diff --git a/docker_templates/nova/nova-libvirt/config-external.sh b/docker_templates/nova/nova-libvirt/config-external.sh
new file mode 120000
index 0000000000000000000000000000000000000000..cdcc6cc68c065cd090e55d9dd270420644dc5b28
--- /dev/null
+++ b/docker_templates/nova/nova-libvirt/config-external.sh
@@ -0,0 +1 @@
+../../../docker/common/nova/nova-libvirt/config-external.sh
\ No newline at end of file
diff --git a/docker_templates/nova/nova-libvirt/start.sh b/docker_templates/nova/nova-libvirt/start.sh
new file mode 120000
index 0000000000000000000000000000000000000000..8188547e1de6eec50ad9d0a58a4b3d5c27175ece
--- /dev/null
+++ b/docker_templates/nova/nova-libvirt/start.sh
@@ -0,0 +1 @@
+../../../docker/common/nova/nova-libvirt/start.sh
\ No newline at end of file
diff --git a/docker_templates/nova/nova-network/Dockerfile.j2 b/docker_templates/nova/nova-network/Dockerfile.j2
new file mode 100644
index 0000000000000000000000000000000000000000..2f6adf18ebf5d5329644b2c543a37edf2e968699
--- /dev/null
+++ b/docker_templates/nova/nova-network/Dockerfile.j2
@@ -0,0 +1,26 @@
+FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-nova-base:{{ tag }}
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+{% if install_type == 'binary' %}
+ {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %}
+
+RUN yum -y install \
+ openstack-nova-network \
+ bridge-utils \
+ initscripts \
+ && yum clean all
+
+ {% endif %}
+{% elif install_type == 'source' %}
+ {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %}
+
+RUN yum -y install initscripts \
+ && yum clean all
+
+ {% endif %}
+{% endif %}
+
+COPY start.sh /
+COPY config-external.sh /opt/kolla/
+
+CMD ["/start.sh"]
diff --git a/docker_templates/nova/nova-network/config-external.sh b/docker_templates/nova/nova-network/config-external.sh
new file mode 120000
index 0000000000000000000000000000000000000000..02cf8efee951e000215242c26acd35b3a1347b36
--- /dev/null
+++ b/docker_templates/nova/nova-network/config-external.sh
@@ -0,0 +1 @@
+../../../docker/common/nova/nova-network/config-external.sh
\ No newline at end of file
diff --git a/docker_templates/nova/nova-network/start.sh b/docker_templates/nova/nova-network/start.sh
new file mode 120000
index 0000000000000000000000000000000000000000..ce608a5d463d4fc2936ea3d81aaf5b7c69c9fb55
--- /dev/null
+++ b/docker_templates/nova/nova-network/start.sh
@@ -0,0 +1 @@
+../../../docker/common/nova/nova-network/start.sh
\ No newline at end of file
diff --git a/docker_templates/nova/nova-novncproxy/Dockerfile.j2 b/docker_templates/nova/nova-novncproxy/Dockerfile.j2
new file mode 100644
index 0000000000000000000000000000000000000000..58a4664bdd3daa250f172490d81b2c1e6a9b1dbf
--- /dev/null
+++ b/docker_templates/nova/nova-novncproxy/Dockerfile.j2
@@ -0,0 +1,27 @@
+FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-nova-base:{{ tag }}
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+{% if install_type == 'binary' %}
+ {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %}
+
+RUN yum -y install \
+ novnc \
+ openstack-nova-novncproxy \
+ && yum clean all
+
+ {% endif %}
+{% elif install_type == 'source' %}
+ {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %}
+
+RUN yum -y install \
+ https://rdoproject.org/repos/openstack-kilo/rdo-release-kilo.rpm \
+ novnc \
+ && yum clean all
+
+ {% endif %}
+{% endif %}
+
+COPY start.sh /
+COPY config-external.sh /opt/kolla/
+
+CMD ["/start.sh"]
diff --git a/docker_templates/nova/nova-novncproxy/config-external.sh b/docker_templates/nova/nova-novncproxy/config-external.sh
new file mode 120000
index 0000000000000000000000000000000000000000..87797c27cc19001b2b36042fcd9f780c5774a41f
--- /dev/null
+++ b/docker_templates/nova/nova-novncproxy/config-external.sh
@@ -0,0 +1 @@
+../../../docker/common/nova/nova-novncproxy/config-external.sh
\ No newline at end of file
diff --git a/docker_templates/nova/nova-novncproxy/start.sh b/docker_templates/nova/nova-novncproxy/start.sh
new file mode 120000
index 0000000000000000000000000000000000000000..36d3f1a459e470f1339d290146659770c6172188
--- /dev/null
+++ b/docker_templates/nova/nova-novncproxy/start.sh
@@ -0,0 +1 @@
+../../../docker/common/nova/nova-novncproxy/start.sh
\ No newline at end of file
diff --git a/docker_templates/nova/nova-scheduler/Dockerfile.j2 b/docker_templates/nova/nova-scheduler/Dockerfile.j2
new file mode 100644
index 0000000000000000000000000000000000000000..66b4910bc8940897d7a9f349e508dd5a64a844ac
--- /dev/null
+++ b/docker_templates/nova/nova-scheduler/Dockerfile.j2
@@ -0,0 +1,16 @@
+FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-nova-base:{{ tag }}
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+{% if install_type == 'binary' %}
+ {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %}
+
+RUN yum -y install openstack-nova-scheduler \
+ && yum clean all
+
+ {% endif %}
+{% endif %}
+
+COPY start.sh /
+COPY config-external.sh /opt/kolla/
+
+CMD ["/start.sh"]
diff --git a/docker_templates/nova/nova-scheduler/config-external.sh b/docker_templates/nova/nova-scheduler/config-external.sh
new file mode 120000
index 0000000000000000000000000000000000000000..4021bbbdadd0b669842cbe08100cbe0637ac6a0a
--- /dev/null
+++ b/docker_templates/nova/nova-scheduler/config-external.sh
@@ -0,0 +1 @@
+../../../docker/common/nova/nova-scheduler/config-external.sh
\ No newline at end of file
diff --git a/docker_templates/nova/nova-scheduler/start.sh b/docker_templates/nova/nova-scheduler/start.sh
new file mode 120000
index 0000000000000000000000000000000000000000..cd2206191387a7f4470a37981d2fbf509831ce2c
--- /dev/null
+++ b/docker_templates/nova/nova-scheduler/start.sh
@@ -0,0 +1 @@
+../../../docker/common/nova/nova-scheduler/start.sh
\ No newline at end of file