From e5903d5fa9ef545595f7e98b73eb3bb31b72b4bb Mon Sep 17 00:00:00 2001
From: Jeffrey Zhang <zhang.lei.fly@gmail.com>
Date: Thu, 2 Feb 2017 15:22:36 +0800
Subject: [PATCH] Remove include_header and include_footer in all Dockerfiles

include_header and include_footer parameter is already removed, remove
them in all Dockerfiles.
Add missing footer block.

Change-Id: I90da03eb9f95a3827361d5f5ede65fde7d6be2b3
---
 doc/CONTRIBUTING.rst                                    | 4 ----
 docker/aodh/aodh-api/Dockerfile.j2                      | 1 -
 docker/aodh/aodh-evaluator/Dockerfile.j2                | 2 --
 docker/aodh/aodh-expirer/Dockerfile.j2                  | 2 --
 docker/aodh/aodh-listener/Dockerfile.j2                 | 2 --
 docker/aodh/aodh-notifier/Dockerfile.j2                 | 2 --
 docker/base/Dockerfile.j2                               | 1 -
 docker/bifrost/bifrost-deploy/Dockerfile.j2             | 1 -
 docker/ceilometer/ceilometer-api/Dockerfile.j2          | 1 -
 docker/ceilometer/ceilometer-central/Dockerfile.j2      | 1 -
 docker/ceilometer/ceilometer-collector/Dockerfile.j2    | 1 -
 docker/ceilometer/ceilometer-compute/Dockerfile.j2      | 1 -
 docker/ceilometer/ceilometer-notification/Dockerfile.j2 | 1 -
 docker/ceph/ceph-mon/Dockerfile.j2                      | 1 -
 docker/ceph/ceph-osd/Dockerfile.j2                      | 1 -
 docker/ceph/ceph-rgw/Dockerfile.j2                      | 1 -
 docker/chrony/Dockerfile.j2                             | 1 -
 docker/cinder/cinder-api/Dockerfile.j2                  | 1 -
 docker/cinder/cinder-backup/Dockerfile.j2               | 1 -
 docker/cinder/cinder-scheduler/Dockerfile.j2            | 1 -
 docker/cinder/cinder-volume/Dockerfile.j2               | 1 -
 docker/cloudkitty/cloudkitty-api/Dockerfile.j2          | 1 -
 docker/cloudkitty/cloudkitty-processor/Dockerfile.j2    | 1 -
 docker/collectd/Dockerfile.j2                           | 1 -
 docker/congress/congress-api/Dockerfile.j2              | 1 -
 docker/congress/congress-datasource/Dockerfile.j2       | 1 -
 docker/congress/congress-policy-engine/Dockerfile.j2    | 1 -
 docker/cron/Dockerfile.j2                               | 1 -
 docker/dind/Dockerfile.j2                               | 2 +-
 docker/elasticsearch/Dockerfile.j2                      | 1 -
 docker/etcd/Dockerfile.j2                               | 1 -
 docker/fluentd/Dockerfile.j2                            | 1 -
 docker/freezer/freezer-api/Dockerfile.j2                | 1 -
 docker/glance/glance-api/Dockerfile.j2                  | 1 -
 docker/glance/glance-registry/Dockerfile.j2             | 1 -
 docker/gnocchi/gnocchi-api/Dockerfile.j2                | 1 -
 docker/gnocchi/gnocchi-metricd/Dockerfile.j2            | 2 --
 docker/gnocchi/gnocchi-statsd/Dockerfile.j2             | 2 --
 docker/grafana/Dockerfile.j2                            | 1 -
 docker/haproxy/Dockerfile.j2                            | 1 -
 docker/heat/heat-api-cfn/Dockerfile.j2                  | 1 -
 docker/heat/heat-api/Dockerfile.j2                      | 1 -
 docker/heat/heat-engine/Dockerfile.j2                   | 2 --
 docker/heka/Dockerfile.j2                               | 1 -
 docker/horizon/Dockerfile.j2                            | 1 -
 docker/influxdb/Dockerfile.j2                           | 1 -
 docker/ironic/ironic-api/Dockerfile.j2                  | 1 -
 docker/ironic/ironic-conductor/Dockerfile.j2            | 1 -
 docker/ironic/ironic-inspector/Dockerfile.j2            | 1 -
 docker/ironic/ironic-pxe/Dockerfile.j2                  | 1 -
 docker/iscsid/Dockerfile.j2                             | 1 -
 docker/karbor/karbor-api/Dockerfile.j2                  | 1 -
 docker/karbor/karbor-operationengine/Dockerfile.j2      | 1 -
 docker/karbor/karbor-protection/Dockerfile.j2           | 1 -
 docker/keepalived/Dockerfile.j2                         | 1 -
 docker/keystone/keystone-fernet/Dockerfile.j2           | 1 -
 docker/keystone/keystone-ssh/Dockerfile.j2              | 1 -
 docker/keystone/keystone/Dockerfile.j2                  | 1 -
 docker/kibana/Dockerfile.j2                             | 1 -
 docker/kolla-toolbox/Dockerfile.j2                      | 1 -
 docker/kubetoolbox/Dockerfile.j2                        | 1 -
 docker/kuryr/kuryr-libnetwork/Dockerfile.j2             | 1 -
 docker/magnum/magnum-api/Dockerfile.j2                  | 1 -
 docker/magnum/magnum-conductor/Dockerfile.j2            | 1 -
 docker/manila/manila-api/Dockerfile.j2                  | 1 -
 docker/manila/manila-data/Dockerfile.j2                 | 1 -
 docker/manila/manila-scheduler/Dockerfile.j2            | 1 -
 docker/manila/manila-share/Dockerfile.j2                | 1 -
 docker/mariadb/Dockerfile.j2                            | 1 -
 docker/memcached/Dockerfile.j2                          | 1 -
 docker/mistral/mistral-api/Dockerfile.j2                | 1 -
 docker/mistral/mistral-engine/Dockerfile.j2             | 2 --
 docker/mistral/mistral-executor/Dockerfile.j2           | 2 --
 docker/mongodb/Dockerfile.j2                            | 1 -
 docker/multipathd/Dockerfile.j2                         | 1 -
 docker/murano/murano-api/Dockerfile.j2                  | 1 -
 docker/murano/murano-engine/Dockerfile.j2               | 1 -
 docker/neutron/neutron-dhcp-agent/Dockerfile.j2         | 1 -
 docker/neutron/neutron-l3-agent/Dockerfile.j2           | 1 -
 docker/neutron/neutron-lbaas-agent/Dockerfile.j2        | 1 -
 docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2  | 1 -
 docker/neutron/neutron-metadata-agent/Dockerfile.j2     | 1 -
 docker/neutron/neutron-metering-agent/Dockerfile.j2     | 1 -
 docker/neutron/neutron-openvswitch-agent/Dockerfile.j2  | 1 -
 docker/neutron/neutron-server/Dockerfile.j2             | 1 -
 docker/neutron/neutron-sfc-agent/Dockerfile.j2          | 1 -
 docker/neutron/neutron-vpnaas-agent/Dockerfile.j2       | 1 -
 docker/nova/nova-api/Dockerfile.j2                      | 1 -
 docker/nova/nova-compute-ironic/Dockerfile.j2           | 1 -
 docker/nova/nova-compute/Dockerfile.j2                  | 1 -
 docker/nova/nova-conductor/Dockerfile.j2                | 1 -
 docker/nova/nova-consoleauth/Dockerfile.j2              | 1 -
 docker/nova/nova-libvirt/Dockerfile.j2                  | 1 -
 docker/nova/nova-novncproxy/Dockerfile.j2               | 1 -
 docker/nova/nova-scheduler/Dockerfile.j2                | 1 -
 docker/nova/nova-serialproxy/Dockerfile.j2              | 1 -
 docker/nova/nova-spicehtml5proxy/Dockerfile.j2          | 1 -
 docker/nova/nova-ssh/Dockerfile.j2                      | 1 -
 docker/openvswitch/openvswitch-db-server/Dockerfile.j2  | 1 -
 docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2   | 1 -
 docker/panko/panko-api/Dockerfile.j2                    | 1 -
 docker/rabbitmq/Dockerfile.j2                           | 2 +-
 docker/rally/Dockerfile.j2                              | 1 -
 docker/sahara/sahara-api/Dockerfile.j2                  | 1 -
 docker/sahara/sahara-engine/Dockerfile.j2               | 2 --
 docker/searchlight/searchlight-api/Dockerfile.j2        | 1 -
 docker/searchlight/searchlight-listener/Dockerfile.j2   | 1 -
 docker/senlin/senlin-api/Dockerfile.j2                  | 1 -
 docker/senlin/senlin-engine/Dockerfile.j2               | 1 -
 docker/solum/solum-api/Dockerfile.j2                    | 1 -
 docker/solum/solum-conductor/Dockerfile.j2              | 1 -
 docker/solum/solum-deployer/Dockerfile.j2               | 1 -
 docker/solum/solum-worker/Dockerfile.j2                 | 1 -
 docker/swift/swift-account/Dockerfile.j2                | 1 -
 docker/swift/swift-container/Dockerfile.j2              | 1 -
 docker/swift/swift-object-expirer/Dockerfile.j2         | 1 -
 docker/swift/swift-object/Dockerfile.j2                 | 1 -
 docker/swift/swift-proxy-server/Dockerfile.j2           | 1 -
 docker/swift/swift-rsyncd/Dockerfile.j2                 | 1 -
 docker/telegraf/Dockerfile.j2                           | 1 -
 docker/tempest/Dockerfile.j2                            | 1 -
 docker/tgtd/Dockerfile.j2                               | 1 -
 docker/trove/trove-api/Dockerfile.j2                    | 1 -
 docker/trove/trove-conductor/Dockerfile.j2              | 1 -
 docker/trove/trove-guestagent/Dockerfile.j2             | 1 -
 docker/trove/trove-taskmanager/Dockerfile.j2            | 1 -
 docker/vmtp/Dockerfile.j2                               | 1 -
 docker/watcher/watcher-api/Dockerfile.j2                | 1 -
 docker/watcher/watcher-applier/Dockerfile.j2            | 1 -
 docker/watcher/watcher-engine/Dockerfile.j2             | 1 -
 130 files changed, 2 insertions(+), 143 deletions(-)

diff --git a/doc/CONTRIBUTING.rst b/doc/CONTRIBUTING.rst
index 76f6c96aeb..504d9b12ab 100644
--- a/doc/CONTRIBUTING.rst
+++ b/doc/CONTRIBUTING.rst
@@ -82,11 +82,7 @@ is as follows::
 
     {% block << service >>_footer %}{% endblock %}
     {% block footer %}{% endblock %}
-    {{ include_footer }}
 
 .. NOTE::
   The generic footer block ``{% block footer %}{% endblock %}`` should not be
   included in base images (e.g. glance-base).
-
-  {{ include_footer }} is legacy and should not be included in new services, it
-  is superseded by {% block footer %}{% endblock %}
diff --git a/docker/aodh/aodh-api/Dockerfile.j2 b/docker/aodh/aodh-api/Dockerfile.j2
index 370b772869..639e9a40f3 100644
--- a/docker/aodh/aodh-api/Dockerfile.j2
+++ b/docker/aodh/aodh-api/Dockerfile.j2
@@ -19,4 +19,3 @@ RUN chmod 755 /usr/local/bin/kolla_aodh_extend_start
 
 {% block aodh_api_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
diff --git a/docker/aodh/aodh-evaluator/Dockerfile.j2 b/docker/aodh/aodh-evaluator/Dockerfile.j2
index 4fa319ce84..c1d8960626 100644
--- a/docker/aodh/aodh-evaluator/Dockerfile.j2
+++ b/docker/aodh/aodh-evaluator/Dockerfile.j2
@@ -17,6 +17,4 @@ MAINTAINER {{ maintainer }}
 {% block aodh_evaluator_footer %}{% endblock %}
 {% block footer %}{% endblock %}
 
-{{ include_footer }}
-
 USER aodh
diff --git a/docker/aodh/aodh-expirer/Dockerfile.j2 b/docker/aodh/aodh-expirer/Dockerfile.j2
index c43af18c78..476b49b2f0 100644
--- a/docker/aodh/aodh-expirer/Dockerfile.j2
+++ b/docker/aodh/aodh-expirer/Dockerfile.j2
@@ -17,6 +17,4 @@ MAINTAINER {{ maintainer }}
 {% block aodh_expirer_footer %}{% endblock %}
 {% block footer %}{% endblock %}
 
-{{ include_footer }}
-
 USER aodh
diff --git a/docker/aodh/aodh-listener/Dockerfile.j2 b/docker/aodh/aodh-listener/Dockerfile.j2
index 45b41a3adb..66621f960b 100644
--- a/docker/aodh/aodh-listener/Dockerfile.j2
+++ b/docker/aodh/aodh-listener/Dockerfile.j2
@@ -17,6 +17,4 @@ MAINTAINER {{ maintainer }}
 {% block aodh_listener_footer %}{% endblock %}
 {% block footer %}{% endblock %}
 
-{{ include_footer }}
-
 USER aodh
diff --git a/docker/aodh/aodh-notifier/Dockerfile.j2 b/docker/aodh/aodh-notifier/Dockerfile.j2
index 7e1fbadc15..8eca819749 100644
--- a/docker/aodh/aodh-notifier/Dockerfile.j2
+++ b/docker/aodh/aodh-notifier/Dockerfile.j2
@@ -17,6 +17,4 @@ MAINTAINER {{ maintainer }}
 {% block aodh_notifier_footer %}{% endblock %}
 {% block footer %}{% endblock %}
 
-{{ include_footer }}
-
 USER aodh
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index b7816197bb..069567cf66 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -14,7 +14,6 @@ LABEL kolla_version="{{ kolla_version }}"
 
 {% import "macros.j2" as macros with context %}
 {% block base_header %}{% endblock %}
-{{ include_header }}
 
 ENV KOLLA_BASE_DISTRO {{ base_distro }}
 ENV KOLLA_INSTALL_TYPE {{ install_type }}
diff --git a/docker/bifrost/bifrost-deploy/Dockerfile.j2 b/docker/bifrost/bifrost-deploy/Dockerfile.j2
index 1f8897eb2f..1ba27ee0ee 100644
--- a/docker/bifrost/bifrost-deploy/Dockerfile.j2
+++ b/docker/bifrost/bifrost-deploy/Dockerfile.j2
@@ -58,4 +58,3 @@ CMD [ "/sbin/init" ]
 
 {% block bifrost_deploy_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
diff --git a/docker/ceilometer/ceilometer-api/Dockerfile.j2 b/docker/ceilometer/ceilometer-api/Dockerfile.j2
index dbe6c264ed..885155e74d 100644
--- a/docker/ceilometer/ceilometer-api/Dockerfile.j2
+++ b/docker/ceilometer/ceilometer-api/Dockerfile.j2
@@ -63,4 +63,3 @@ RUN chmod 755 /usr/local/bin/kolla_ceilometer_extend_start
 
 {% block ceilometer_api_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
diff --git a/docker/ceilometer/ceilometer-central/Dockerfile.j2 b/docker/ceilometer/ceilometer-central/Dockerfile.j2
index 3d3d4e9219..4b3563ad64 100644
--- a/docker/ceilometer/ceilometer-central/Dockerfile.j2
+++ b/docker/ceilometer/ceilometer-central/Dockerfile.j2
@@ -18,6 +18,5 @@ MAINTAINER {{ maintainer }}
 
 {% block ceilometer_central_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER ceilometer
diff --git a/docker/ceilometer/ceilometer-collector/Dockerfile.j2 b/docker/ceilometer/ceilometer-collector/Dockerfile.j2
index c2e67bbc55..aaa08169d8 100644
--- a/docker/ceilometer/ceilometer-collector/Dockerfile.j2
+++ b/docker/ceilometer/ceilometer-collector/Dockerfile.j2
@@ -18,6 +18,5 @@ MAINTAINER {{ maintainer }}
 
 {% block ceilometer_collector_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER ceilometer
diff --git a/docker/ceilometer/ceilometer-compute/Dockerfile.j2 b/docker/ceilometer/ceilometer-compute/Dockerfile.j2
index 76298e062d..6c793b4909 100644
--- a/docker/ceilometer/ceilometer-compute/Dockerfile.j2
+++ b/docker/ceilometer/ceilometer-compute/Dockerfile.j2
@@ -38,7 +38,6 @@ RUN /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements
 
 {% block ceilometer_compute_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 # NOTE(huikang): non-root user does not work with libvirt.sock.
 #                Need configuration in nova-libvirt container to allow
diff --git a/docker/ceilometer/ceilometer-notification/Dockerfile.j2 b/docker/ceilometer/ceilometer-notification/Dockerfile.j2
index 6d351391bd..8911497397 100644
--- a/docker/ceilometer/ceilometer-notification/Dockerfile.j2
+++ b/docker/ceilometer/ceilometer-notification/Dockerfile.j2
@@ -18,6 +18,5 @@ MAINTAINER {{ maintainer }}
 
 {% block ceilometer_notification_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER ceilometer
diff --git a/docker/ceph/ceph-mon/Dockerfile.j2 b/docker/ceph/ceph-mon/Dockerfile.j2
index 0627eff006..06ff6bfd42 100644
--- a/docker/ceph/ceph-mon/Dockerfile.j2
+++ b/docker/ceph/ceph-mon/Dockerfile.j2
@@ -10,4 +10,3 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start /usr/bin/fetch_ceph_keys.py
 
 {% block ceph_mon_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
diff --git a/docker/ceph/ceph-osd/Dockerfile.j2 b/docker/ceph/ceph-osd/Dockerfile.j2
index 3f38fd016d..a521189dfd 100644
--- a/docker/ceph/ceph-osd/Dockerfile.j2
+++ b/docker/ceph/ceph-osd/Dockerfile.j2
@@ -8,4 +8,3 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start
 
 {% block ceph_osd_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
diff --git a/docker/ceph/ceph-rgw/Dockerfile.j2 b/docker/ceph/ceph-rgw/Dockerfile.j2
index 721bd8f05b..156ba4956a 100644
--- a/docker/ceph/ceph-rgw/Dockerfile.j2
+++ b/docker/ceph/ceph-rgw/Dockerfile.j2
@@ -5,4 +5,3 @@ MAINTAINER {{ maintainer }}
 
 {% block ceph_rgw_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
diff --git a/docker/chrony/Dockerfile.j2 b/docker/chrony/Dockerfile.j2
index d845b50019..13b059020c 100644
--- a/docker/chrony/Dockerfile.j2
+++ b/docker/chrony/Dockerfile.j2
@@ -16,4 +16,3 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start
 
 {% block chrony_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
diff --git a/docker/cinder/cinder-api/Dockerfile.j2 b/docker/cinder/cinder-api/Dockerfile.j2
index cbedd9fd47..eaef8f81ae 100644
--- a/docker/cinder/cinder-api/Dockerfile.j2
+++ b/docker/cinder/cinder-api/Dockerfile.j2
@@ -55,6 +55,5 @@ RUN chmod 755 /usr/local/bin/kolla_cinder_extend_start
 
 {% block cinder_api_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER cinder
diff --git a/docker/cinder/cinder-backup/Dockerfile.j2 b/docker/cinder/cinder-backup/Dockerfile.j2
index 02a30c4933..778482144e 100644
--- a/docker/cinder/cinder-backup/Dockerfile.j2
+++ b/docker/cinder/cinder-backup/Dockerfile.j2
@@ -42,6 +42,5 @@ MAINTAINER {{ maintainer }}
 
 {% block cinder_backup_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER cinder
diff --git a/docker/cinder/cinder-scheduler/Dockerfile.j2 b/docker/cinder/cinder-scheduler/Dockerfile.j2
index b19cb83594..da3a4a4b85 100644
--- a/docker/cinder/cinder-scheduler/Dockerfile.j2
+++ b/docker/cinder/cinder-scheduler/Dockerfile.j2
@@ -19,6 +19,5 @@ MAINTAINER {{ maintainer }}
 
 {% block cinder_scheduler_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER cinder
diff --git a/docker/cinder/cinder-volume/Dockerfile.j2 b/docker/cinder/cinder-volume/Dockerfile.j2
index ef90fcd91a..3472a64af4 100644
--- a/docker/cinder/cinder-volume/Dockerfile.j2
+++ b/docker/cinder/cinder-volume/Dockerfile.j2
@@ -53,6 +53,5 @@ RUN chmod 750 /etc/sudoers.d \
 
 {% block cinder_volume_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER cinder
diff --git a/docker/cloudkitty/cloudkitty-api/Dockerfile.j2 b/docker/cloudkitty/cloudkitty-api/Dockerfile.j2
index 1e0ff78965..7a0728f7ee 100644
--- a/docker/cloudkitty/cloudkitty-api/Dockerfile.j2
+++ b/docker/cloudkitty/cloudkitty-api/Dockerfile.j2
@@ -28,6 +28,5 @@ RUN chmod 755 /usr/local/bin/kolla_cloudkitty_extend_start
 
 {% block cloudkitty_api_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER cloudkitty
diff --git a/docker/cloudkitty/cloudkitty-processor/Dockerfile.j2 b/docker/cloudkitty/cloudkitty-processor/Dockerfile.j2
index 768c406e54..d77446a5f7 100644
--- a/docker/cloudkitty/cloudkitty-processor/Dockerfile.j2
+++ b/docker/cloudkitty/cloudkitty-processor/Dockerfile.j2
@@ -25,6 +25,5 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
 
 {% block cloudkitty_processor_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER cloudkitty
diff --git a/docker/collectd/Dockerfile.j2 b/docker/collectd/Dockerfile.j2
index ac162d8cf4..d22bea01a2 100644
--- a/docker/collectd/Dockerfile.j2
+++ b/docker/collectd/Dockerfile.j2
@@ -20,6 +20,5 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start \
 
 {% block collectd_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER collectd
diff --git a/docker/congress/congress-api/Dockerfile.j2 b/docker/congress/congress-api/Dockerfile.j2
index 4a47d6b944..eb1d35493c 100644
--- a/docker/congress/congress-api/Dockerfile.j2
+++ b/docker/congress/congress-api/Dockerfile.j2
@@ -8,6 +8,5 @@ RUN chmod 755 /usr/local/bin/kolla_congress_extend_start
 
 {% block congress_api_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER congress
diff --git a/docker/congress/congress-datasource/Dockerfile.j2 b/docker/congress/congress-datasource/Dockerfile.j2
index f807ddb695..61f144e003 100644
--- a/docker/congress/congress-datasource/Dockerfile.j2
+++ b/docker/congress/congress-datasource/Dockerfile.j2
@@ -5,6 +5,5 @@ MAINTAINER {{ maintainer }}
 
 {% block congress_datasource_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER congress
diff --git a/docker/congress/congress-policy-engine/Dockerfile.j2 b/docker/congress/congress-policy-engine/Dockerfile.j2
index 88de855717..74d9ce11d8 100644
--- a/docker/congress/congress-policy-engine/Dockerfile.j2
+++ b/docker/congress/congress-policy-engine/Dockerfile.j2
@@ -5,6 +5,5 @@ MAINTAINER {{ maintainer }}
 
 {% block congress_policy_engine_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER congress
diff --git a/docker/cron/Dockerfile.j2 b/docker/cron/Dockerfile.j2
index a2cf93ecd0..7fe5212bf3 100644
--- a/docker/cron/Dockerfile.j2
+++ b/docker/cron/Dockerfile.j2
@@ -24,4 +24,3 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start
 
 {% block cron_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
diff --git a/docker/dind/Dockerfile.j2 b/docker/dind/Dockerfile.j2
index 476b449adf..da3ae5e7cc 100644
--- a/docker/dind/Dockerfile.j2
+++ b/docker/dind/Dockerfile.j2
@@ -27,4 +27,4 @@ COPY start.sh /usr/local/bin/kolla_start
 RUN chmod 755 /usr/local/bin/kolla_start
 
 {% block dind_footer %}{% endblock %}
-{{ include_footer }}
+{% block footer %}{% endblock %}
diff --git a/docker/elasticsearch/Dockerfile.j2 b/docker/elasticsearch/Dockerfile.j2
index df17222900..dd7aa4d0f2 100644
--- a/docker/elasticsearch/Dockerfile.j2
+++ b/docker/elasticsearch/Dockerfile.j2
@@ -40,6 +40,5 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start \
 
 {% block elasticsearch_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER elasticsearch
diff --git a/docker/etcd/Dockerfile.j2 b/docker/etcd/Dockerfile.j2
index 5bd7cc1c86..f91a976e04 100644
--- a/docker/etcd/Dockerfile.j2
+++ b/docker/etcd/Dockerfile.j2
@@ -23,6 +23,5 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start \
 
 {% block etcd_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER etcd
diff --git a/docker/fluentd/Dockerfile.j2 b/docker/fluentd/Dockerfile.j2
index 405e10c5fc..30c9f5771a 100644
--- a/docker/fluentd/Dockerfile.j2
+++ b/docker/fluentd/Dockerfile.j2
@@ -48,6 +48,5 @@ RUN chmod 440 /etc/sudoers.d/kolla_fluentd_sudoers \
 
 {% block fluentd_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER td-agent
diff --git a/docker/freezer/freezer-api/Dockerfile.j2 b/docker/freezer/freezer-api/Dockerfile.j2
index 88c1c77b27..1eab11b025 100644
--- a/docker/freezer/freezer-api/Dockerfile.j2
+++ b/docker/freezer/freezer-api/Dockerfile.j2
@@ -44,4 +44,3 @@ RUN chmod 755 /usr/local/bin/kolla_freezer_extend_start
 
 {% block freezer_api_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
diff --git a/docker/glance/glance-api/Dockerfile.j2 b/docker/glance/glance-api/Dockerfile.j2
index 3528536946..4ef6edbfcf 100644
--- a/docker/glance/glance-api/Dockerfile.j2
+++ b/docker/glance/glance-api/Dockerfile.j2
@@ -18,6 +18,5 @@ RUN chmod 755 /usr/local/bin/kolla_glance_extend_start
 
 {% block glance_api_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER glance
diff --git a/docker/glance/glance-registry/Dockerfile.j2 b/docker/glance/glance-registry/Dockerfile.j2
index 2f214f8533..a5e217e96c 100644
--- a/docker/glance/glance-registry/Dockerfile.j2
+++ b/docker/glance/glance-registry/Dockerfile.j2
@@ -5,6 +5,5 @@ MAINTAINER {{ maintainer }}
 
 {% block glance_registry_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER glance
diff --git a/docker/gnocchi/gnocchi-api/Dockerfile.j2 b/docker/gnocchi/gnocchi-api/Dockerfile.j2
index edee1bc7f3..f42d273695 100644
--- a/docker/gnocchi/gnocchi-api/Dockerfile.j2
+++ b/docker/gnocchi/gnocchi-api/Dockerfile.j2
@@ -23,4 +23,3 @@ RUN chmod 755 /usr/local/bin/kolla_gnocchi_extend_start
 
 {% block gnocchi_api_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
diff --git a/docker/gnocchi/gnocchi-metricd/Dockerfile.j2 b/docker/gnocchi/gnocchi-metricd/Dockerfile.j2
index 7ef3955ce9..365edf3708 100644
--- a/docker/gnocchi/gnocchi-metricd/Dockerfile.j2
+++ b/docker/gnocchi/gnocchi-metricd/Dockerfile.j2
@@ -17,6 +17,4 @@ MAINTAINER {{ maintainer }}
 {% block gnocchi_metricd_footer %}{% endblock %}
 {% block footer %}{% endblock %}
 
-{{ include_footer }}
-
 USER gnocchi
diff --git a/docker/gnocchi/gnocchi-statsd/Dockerfile.j2 b/docker/gnocchi/gnocchi-statsd/Dockerfile.j2
index 20ab2135b6..399cc9535d 100644
--- a/docker/gnocchi/gnocchi-statsd/Dockerfile.j2
+++ b/docker/gnocchi/gnocchi-statsd/Dockerfile.j2
@@ -15,6 +15,4 @@ MAINTAINER {{ maintainer }}
 {% block gnocchi_statsd_footer %}{% endblock %}
 {% block footer %}{% endblock %}
 
-{{ include_footer }}
-
 USER gnocchi
diff --git a/docker/grafana/Dockerfile.j2 b/docker/grafana/Dockerfile.j2
index 694e50c89a..cfaefbd37a 100644
--- a/docker/grafana/Dockerfile.j2
+++ b/docker/grafana/Dockerfile.j2
@@ -22,6 +22,5 @@ RUN grafana-cli plugins install sileht-gnocchi-datasource \
 
 {% block grafana_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER grafana
diff --git a/docker/haproxy/Dockerfile.j2 b/docker/haproxy/Dockerfile.j2
index 964e0e6635..a3a7a0b25c 100644
--- a/docker/haproxy/Dockerfile.j2
+++ b/docker/haproxy/Dockerfile.j2
@@ -25,4 +25,3 @@ RUN chmod 755 /usr/local/bin/kolla_ensure_haproxy_latest_config
 
 {% block haproxy_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
diff --git a/docker/heat/heat-api-cfn/Dockerfile.j2 b/docker/heat/heat-api-cfn/Dockerfile.j2
index 0654edbfa0..71ad40e8ef 100644
--- a/docker/heat/heat-api-cfn/Dockerfile.j2
+++ b/docker/heat/heat-api-cfn/Dockerfile.j2
@@ -16,6 +16,5 @@ MAINTAINER {{ maintainer }}
 
 {% block heat_api_cfn_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER heat
diff --git a/docker/heat/heat-api/Dockerfile.j2 b/docker/heat/heat-api/Dockerfile.j2
index d7486cc7b8..4ed685f536 100644
--- a/docker/heat/heat-api/Dockerfile.j2
+++ b/docker/heat/heat-api/Dockerfile.j2
@@ -19,6 +19,5 @@ RUN chmod 755 /usr/local/bin/kolla_heat_extend_start
 
 {% block heat_api_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER heat
diff --git a/docker/heat/heat-engine/Dockerfile.j2 b/docker/heat/heat-engine/Dockerfile.j2
index 48b600695f..98339e0e5a 100644
--- a/docker/heat/heat-engine/Dockerfile.j2
+++ b/docker/heat/heat-engine/Dockerfile.j2
@@ -21,6 +21,4 @@ MAINTAINER {{ maintainer }}
 {% block heat_engine_footer %}{% endblock %}
 {% block footer %}{% endblock %}
 
-{{ include_footer }}
-
 USER heat
diff --git a/docker/heka/Dockerfile.j2 b/docker/heka/Dockerfile.j2
index 1756849fbe..8d271a9e70 100644
--- a/docker/heka/Dockerfile.j2
+++ b/docker/heka/Dockerfile.j2
@@ -34,6 +34,5 @@ RUN chmod 440 /etc/sudoers.d/kolla_heka_sudoers \
 
 {% block heka_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER heka
diff --git a/docker/horizon/Dockerfile.j2 b/docker/horizon/Dockerfile.j2
index c94d2753ba..194c2c7e00 100644
--- a/docker/horizon/Dockerfile.j2
+++ b/docker/horizon/Dockerfile.j2
@@ -128,4 +128,3 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start
 
 {% block horizon_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
diff --git a/docker/influxdb/Dockerfile.j2 b/docker/influxdb/Dockerfile.j2
index 55cc560214..649867a29a 100644
--- a/docker/influxdb/Dockerfile.j2
+++ b/docker/influxdb/Dockerfile.j2
@@ -19,6 +19,5 @@ RUN chmod 750 /etc/sudoers.d \
 
 {% block influxdb_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER influxdb
diff --git a/docker/ironic/ironic-api/Dockerfile.j2 b/docker/ironic/ironic-api/Dockerfile.j2
index 1fd82dcfa8..9ff62d23b3 100644
--- a/docker/ironic/ironic-api/Dockerfile.j2
+++ b/docker/ironic/ironic-api/Dockerfile.j2
@@ -21,6 +21,5 @@ RUN chmod 755 /usr/local/bin/kolla_ironic_extend_start
 
 {% block ironic_api_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER ironic
diff --git a/docker/ironic/ironic-conductor/Dockerfile.j2 b/docker/ironic/ironic-conductor/Dockerfile.j2
index f97e0e475f..5841c39016 100644
--- a/docker/ironic/ironic-conductor/Dockerfile.j2
+++ b/docker/ironic/ironic-conductor/Dockerfile.j2
@@ -78,6 +78,5 @@ RUN /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements
 
 {% block ironic_conductor_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER ironic
diff --git a/docker/ironic/ironic-inspector/Dockerfile.j2 b/docker/ironic/ironic-inspector/Dockerfile.j2
index 3eae4dab3d..d659eb7ff8 100644
--- a/docker/ironic/ironic-inspector/Dockerfile.j2
+++ b/docker/ironic/ironic-inspector/Dockerfile.j2
@@ -43,6 +43,5 @@ RUN chmod 750 /etc/sudoers.d \
 
 {% block ironic_inspector_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER ironic
diff --git a/docker/ironic/ironic-pxe/Dockerfile.j2 b/docker/ironic/ironic-pxe/Dockerfile.j2
index accfeaff2f..7540b536a3 100644
--- a/docker/ironic/ironic-pxe/Dockerfile.j2
+++ b/docker/ironic/ironic-pxe/Dockerfile.j2
@@ -33,4 +33,3 @@ RUN chmod 755 /usr/local/bin/kolla_ironic_extend_start
 
 {% block ironic_pxe_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
diff --git a/docker/iscsid/Dockerfile.j2 b/docker/iscsid/Dockerfile.j2
index 0f29fe5f34..e1978b53cf 100644
--- a/docker/iscsid/Dockerfile.j2
+++ b/docker/iscsid/Dockerfile.j2
@@ -29,4 +29,3 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start \
 
 {% block iscsid_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
diff --git a/docker/karbor/karbor-api/Dockerfile.j2 b/docker/karbor/karbor-api/Dockerfile.j2
index d8bbe78184..9be12b5215 100644
--- a/docker/karbor/karbor-api/Dockerfile.j2
+++ b/docker/karbor/karbor-api/Dockerfile.j2
@@ -15,6 +15,5 @@ RUN chmod 755 /usr/local/bin/kolla_karbor_extend_start
 
 {% block karbor_api_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER karbor
diff --git a/docker/karbor/karbor-operationengine/Dockerfile.j2 b/docker/karbor/karbor-operationengine/Dockerfile.j2
index 745fcd4a83..99beb28ae2 100644
--- a/docker/karbor/karbor-operationengine/Dockerfile.j2
+++ b/docker/karbor/karbor-operationengine/Dockerfile.j2
@@ -12,6 +12,5 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
 
 {% block karbor_operationengine_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER karbor
diff --git a/docker/karbor/karbor-protection/Dockerfile.j2 b/docker/karbor/karbor-protection/Dockerfile.j2
index 9be5cca0b0..28ddf5f4c9 100644
--- a/docker/karbor/karbor-protection/Dockerfile.j2
+++ b/docker/karbor/karbor-protection/Dockerfile.j2
@@ -12,6 +12,5 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
 
 {% block karbor_protection_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER karbor
diff --git a/docker/keepalived/Dockerfile.j2 b/docker/keepalived/Dockerfile.j2
index 2c3ad15f8e..f7dc8a62d3 100644
--- a/docker/keepalived/Dockerfile.j2
+++ b/docker/keepalived/Dockerfile.j2
@@ -26,4 +26,3 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start /check_alive.sh
 
 {% block keepalived_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
diff --git a/docker/keystone/keystone-fernet/Dockerfile.j2 b/docker/keystone/keystone-fernet/Dockerfile.j2
index 6710490c46..2f72d4e429 100644
--- a/docker/keystone/keystone-fernet/Dockerfile.j2
+++ b/docker/keystone/keystone-fernet/Dockerfile.j2
@@ -27,4 +27,3 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_keystone_bo
 
 {% block keystone_fernet_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
diff --git a/docker/keystone/keystone-ssh/Dockerfile.j2 b/docker/keystone/keystone-ssh/Dockerfile.j2
index 3848e801dd..51314cdc82 100644
--- a/docker/keystone/keystone-ssh/Dockerfile.j2
+++ b/docker/keystone/keystone-ssh/Dockerfile.j2
@@ -29,4 +29,3 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start
 
 {% block keystone_ssh_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
diff --git a/docker/keystone/keystone/Dockerfile.j2 b/docker/keystone/keystone/Dockerfile.j2
index 5a835a9f65..18b549fb58 100644
--- a/docker/keystone/keystone/Dockerfile.j2
+++ b/docker/keystone/keystone/Dockerfile.j2
@@ -13,4 +13,3 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_keystone_bo
 
 {% block keystone_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
diff --git a/docker/kibana/Dockerfile.j2 b/docker/kibana/Dockerfile.j2
index c95b5068c8..d6cfddd0a6 100644
--- a/docker/kibana/Dockerfile.j2
+++ b/docker/kibana/Dockerfile.j2
@@ -15,6 +15,5 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start
 
 {% block kibana_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER kibana
diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2
index 5c5fa738f8..8f348cbfa0 100644
--- a/docker/kolla-toolbox/Dockerfile.j2
+++ b/docker/kolla-toolbox/Dockerfile.j2
@@ -76,6 +76,5 @@ RUN chmod 440 /etc/sudoers.d/kolla_ansible_sudoers
 
 {% block kolla_toolbox_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER ansible
diff --git a/docker/kubetoolbox/Dockerfile.j2 b/docker/kubetoolbox/Dockerfile.j2
index 0fd631d2e1..1609530bf2 100644
--- a/docker/kubetoolbox/Dockerfile.j2
+++ b/docker/kubetoolbox/Dockerfile.j2
@@ -18,4 +18,3 @@ RUN curl -o /usr/bin/kubectl http://storage.googleapis.com/kubernetes-release/re
 
 {% block kubetoolbox_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
diff --git a/docker/kuryr/kuryr-libnetwork/Dockerfile.j2 b/docker/kuryr/kuryr-libnetwork/Dockerfile.j2
index 7f64cf4dad..1d9da60024 100644
--- a/docker/kuryr/kuryr-libnetwork/Dockerfile.j2
+++ b/docker/kuryr/kuryr-libnetwork/Dockerfile.j2
@@ -18,4 +18,3 @@ RUN ln -s kuryr-libnetwork-source/* kuryr-libnetwork \
 
 {% block kuryr_libnetwork_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
diff --git a/docker/magnum/magnum-api/Dockerfile.j2 b/docker/magnum/magnum-api/Dockerfile.j2
index a09c057cb7..4862b6ebb3 100644
--- a/docker/magnum/magnum-api/Dockerfile.j2
+++ b/docker/magnum/magnum-api/Dockerfile.j2
@@ -19,6 +19,5 @@ RUN chmod 755 /usr/local/bin/kolla_magnum_extend_start
 
 {% block magnum_api_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER magnum
diff --git a/docker/magnum/magnum-conductor/Dockerfile.j2 b/docker/magnum/magnum-conductor/Dockerfile.j2
index 080ef693b5..6e065ec8c1 100644
--- a/docker/magnum/magnum-conductor/Dockerfile.j2
+++ b/docker/magnum/magnum-conductor/Dockerfile.j2
@@ -27,6 +27,5 @@ RUN curl -Lo /usr/local/bin/kubectl https://storage.googleapis.com/kubernetes-re
 
 {% block magnum_conductor_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER magnum
diff --git a/docker/manila/manila-api/Dockerfile.j2 b/docker/manila/manila-api/Dockerfile.j2
index 70908d82c1..c2b210a318 100644
--- a/docker/manila/manila-api/Dockerfile.j2
+++ b/docker/manila/manila-api/Dockerfile.j2
@@ -22,6 +22,5 @@ RUN chmod 755 /usr/local/bin/kolla_manila_extend_start
 
 {% block manila_api_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER manila
diff --git a/docker/manila/manila-data/Dockerfile.j2 b/docker/manila/manila-data/Dockerfile.j2
index 4cdeba3251..46cae63f10 100644
--- a/docker/manila/manila-data/Dockerfile.j2
+++ b/docker/manila/manila-data/Dockerfile.j2
@@ -40,6 +40,5 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
 
 {% block manila_data_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER manila
diff --git a/docker/manila/manila-scheduler/Dockerfile.j2 b/docker/manila/manila-scheduler/Dockerfile.j2
index 56ee3ad3f7..28b62b141d 100644
--- a/docker/manila/manila-scheduler/Dockerfile.j2
+++ b/docker/manila/manila-scheduler/Dockerfile.j2
@@ -19,6 +19,5 @@ MAINTAINER {{ maintainer }}
 
 {% block manila_scheduler_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER manila
diff --git a/docker/manila/manila-share/Dockerfile.j2 b/docker/manila/manila-share/Dockerfile.j2
index 42e8d1d533..d0a99ffd39 100644
--- a/docker/manila/manila-share/Dockerfile.j2
+++ b/docker/manila/manila-share/Dockerfile.j2
@@ -19,6 +19,5 @@ MAINTAINER {{ maintainer }}
 
 {% block manila_share_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER manila
diff --git a/docker/mariadb/Dockerfile.j2 b/docker/mariadb/Dockerfile.j2
index 9482e07b70..d450854563 100644
--- a/docker/mariadb/Dockerfile.j2
+++ b/docker/mariadb/Dockerfile.j2
@@ -41,6 +41,5 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start \
 
 {% block mariadb_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER mysql
diff --git a/docker/memcached/Dockerfile.j2 b/docker/memcached/Dockerfile.j2
index 518986f7cd..55a003529a 100644
--- a/docker/memcached/Dockerfile.j2
+++ b/docker/memcached/Dockerfile.j2
@@ -12,6 +12,5 @@ MAINTAINER {{ maintainer }}
 
 {% block memcached_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER memcached
diff --git a/docker/mistral/mistral-api/Dockerfile.j2 b/docker/mistral/mistral-api/Dockerfile.j2
index 579f005dc2..b393cffdce 100644
--- a/docker/mistral/mistral-api/Dockerfile.j2
+++ b/docker/mistral/mistral-api/Dockerfile.j2
@@ -19,6 +19,5 @@ RUN chmod 755 /usr/local/bin/kolla_mistral_extend_start
 
 {% block mistral_api_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER mistral
diff --git a/docker/mistral/mistral-engine/Dockerfile.j2 b/docker/mistral/mistral-engine/Dockerfile.j2
index 458ff881e9..a054d128b2 100644
--- a/docker/mistral/mistral-engine/Dockerfile.j2
+++ b/docker/mistral/mistral-engine/Dockerfile.j2
@@ -17,6 +17,4 @@ MAINTAINER {{ maintainer }}
 {% block mistral_engine_footer %}{% endblock %}
 {% block footer %}{% endblock %}
 
-{{ include_footer }}
-
 USER mistral
diff --git a/docker/mistral/mistral-executor/Dockerfile.j2 b/docker/mistral/mistral-executor/Dockerfile.j2
index 382d0e33c0..ac68130ae2 100644
--- a/docker/mistral/mistral-executor/Dockerfile.j2
+++ b/docker/mistral/mistral-executor/Dockerfile.j2
@@ -17,6 +17,4 @@ MAINTAINER {{ maintainer }}
 {% block mistral_executor_footer %}{% endblock %}
 {% block footer %}{% endblock %}
 
-{{ include_footer }}
-
 USER mistral
diff --git a/docker/mongodb/Dockerfile.j2 b/docker/mongodb/Dockerfile.j2
index 6a078fb23c..4a8d2e3621 100644
--- a/docker/mongodb/Dockerfile.j2
+++ b/docker/mongodb/Dockerfile.j2
@@ -29,6 +29,5 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start \
 
 {% block mongodb_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER mongodb
diff --git a/docker/multipathd/Dockerfile.j2 b/docker/multipathd/Dockerfile.j2
index 391008e11f..d87da215c3 100644
--- a/docker/multipathd/Dockerfile.j2
+++ b/docker/multipathd/Dockerfile.j2
@@ -15,4 +15,3 @@ MAINTAINER {{ maintainer }}
 
 {% block multipathd_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
diff --git a/docker/murano/murano-api/Dockerfile.j2 b/docker/murano/murano-api/Dockerfile.j2
index 2a71f98cf1..cee22cd75b 100644
--- a/docker/murano/murano-api/Dockerfile.j2
+++ b/docker/murano/murano-api/Dockerfile.j2
@@ -23,6 +23,5 @@ RUN chmod 755 /usr/local/bin/kolla_murano_extend_start
 
 {% block murano_api_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER murano
diff --git a/docker/murano/murano-engine/Dockerfile.j2 b/docker/murano/murano-engine/Dockerfile.j2
index 846a6e4bee..80e73ce3df 100644
--- a/docker/murano/murano-engine/Dockerfile.j2
+++ b/docker/murano/murano-engine/Dockerfile.j2
@@ -18,6 +18,5 @@ MAINTAINER {{ maintainer }}
 
 {% block murano_engine_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER murano
diff --git a/docker/neutron/neutron-dhcp-agent/Dockerfile.j2 b/docker/neutron/neutron-dhcp-agent/Dockerfile.j2
index 497f220025..c499192386 100644
--- a/docker/neutron/neutron-dhcp-agent/Dockerfile.j2
+++ b/docker/neutron/neutron-dhcp-agent/Dockerfile.j2
@@ -19,6 +19,5 @@ MAINTAINER {{ maintainer }}
 
 {% block neutron_dhcp_agent_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER neutron
diff --git a/docker/neutron/neutron-l3-agent/Dockerfile.j2 b/docker/neutron/neutron-l3-agent/Dockerfile.j2
index 322d0817ad..96f2a0eca7 100644
--- a/docker/neutron/neutron-l3-agent/Dockerfile.j2
+++ b/docker/neutron/neutron-l3-agent/Dockerfile.j2
@@ -19,6 +19,5 @@ MAINTAINER {{ maintainer }}
 
 {% block neutron_l3_agent_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER neutron
diff --git a/docker/neutron/neutron-lbaas-agent/Dockerfile.j2 b/docker/neutron/neutron-lbaas-agent/Dockerfile.j2
index 9046712310..b84b498e7d 100644
--- a/docker/neutron/neutron-lbaas-agent/Dockerfile.j2
+++ b/docker/neutron/neutron-lbaas-agent/Dockerfile.j2
@@ -45,6 +45,5 @@ RUN chmod 755 /usr/local/bin/kolla_neutron_extend_start
 
 {% block neutron_lbaas_agent_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER neutron
diff --git a/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2 b/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2
index 010c312d0e..5f894d26c6 100644
--- a/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2
+++ b/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2
@@ -35,6 +35,5 @@ MAINTAINER {{ maintainer }}
 
 {% block neutron_linuxbridge_agent_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER neutron
diff --git a/docker/neutron/neutron-metadata-agent/Dockerfile.j2 b/docker/neutron/neutron-metadata-agent/Dockerfile.j2
index 87269f58fe..97685abf6b 100644
--- a/docker/neutron/neutron-metadata-agent/Dockerfile.j2
+++ b/docker/neutron/neutron-metadata-agent/Dockerfile.j2
@@ -25,6 +25,5 @@ RUN chmod 755 /usr/local/bin/kolla_neutron_extend_start \
 
 {% block neutron_metadata_agent_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER neutron
diff --git a/docker/neutron/neutron-metering-agent/Dockerfile.j2 b/docker/neutron/neutron-metering-agent/Dockerfile.j2
index b0133aaf68..dcdf8f2407 100644
--- a/docker/neutron/neutron-metering-agent/Dockerfile.j2
+++ b/docker/neutron/neutron-metering-agent/Dockerfile.j2
@@ -20,6 +20,5 @@ MAINTAINER {{ maintainer }}
 
 {% block neutron_metering_agent_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER neutron
diff --git a/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 b/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2
index d41f71a8b9..1a3c52875a 100644
--- a/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2
+++ b/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2
@@ -27,6 +27,5 @@ MAINTAINER {{ maintainer }}
 
 {% block neutron_openvswitch_agent_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER neutron
diff --git a/docker/neutron/neutron-server/Dockerfile.j2 b/docker/neutron/neutron-server/Dockerfile.j2
index 1fee58600b..dd6d03bf34 100644
--- a/docker/neutron/neutron-server/Dockerfile.j2
+++ b/docker/neutron/neutron-server/Dockerfile.j2
@@ -35,6 +35,5 @@ RUN chmod 755 /usr/local/bin/kolla_neutron_extend_start \
 
 {% block neutron_server_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER neutron
diff --git a/docker/neutron/neutron-sfc-agent/Dockerfile.j2 b/docker/neutron/neutron-sfc-agent/Dockerfile.j2
index a2daf90d05..cdd0b555cc 100644
--- a/docker/neutron/neutron-sfc-agent/Dockerfile.j2
+++ b/docker/neutron/neutron-sfc-agent/Dockerfile.j2
@@ -21,6 +21,5 @@ RUN chmod 755 /usr/local/bin/kolla_neutron_extend_start
 
 {% block neutron_sfc_agent_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER neutron
diff --git a/docker/neutron/neutron-vpnaas-agent/Dockerfile.j2 b/docker/neutron/neutron-vpnaas-agent/Dockerfile.j2
index f60c096a25..c995cee0e6 100644
--- a/docker/neutron/neutron-vpnaas-agent/Dockerfile.j2
+++ b/docker/neutron/neutron-vpnaas-agent/Dockerfile.j2
@@ -46,7 +46,6 @@ RUN chmod 755 /usr/local/bin/kolla_neutron_extend_start
 
 {% block neutron_vpnaas_agent_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 # TODO(pbourke): The libreswan driver required by redhat derived bases
 # currently requires root in Neutron. Remove this if condition once
diff --git a/docker/nova/nova-api/Dockerfile.j2 b/docker/nova/nova-api/Dockerfile.j2
index 7c8436fd0e..0e9eeb1241 100644
--- a/docker/nova/nova-api/Dockerfile.j2
+++ b/docker/nova/nova-api/Dockerfile.j2
@@ -53,6 +53,5 @@ RUN chmod 755 /usr/local/bin/kolla_nova_extend_start
 
 {% block nova_api_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER nova
diff --git a/docker/nova/nova-compute-ironic/Dockerfile.j2 b/docker/nova/nova-compute-ironic/Dockerfile.j2
index 1fd22cef84..65fe986f97 100644
--- a/docker/nova/nova-compute-ironic/Dockerfile.j2
+++ b/docker/nova/nova-compute-ironic/Dockerfile.j2
@@ -29,6 +29,5 @@ RUN rm /etc/nova/nova-compute.conf
 
 {% block nova_compute_ironic_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER nova
diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2
index 3962ad046e..0304c79541 100644
--- a/docker/nova/nova-compute/Dockerfile.j2
+++ b/docker/nova/nova-compute/Dockerfile.j2
@@ -96,6 +96,5 @@ ENV PATH $PATH:/lib/udev
 
 {% block nova_compute_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER nova
diff --git a/docker/nova/nova-conductor/Dockerfile.j2 b/docker/nova/nova-conductor/Dockerfile.j2
index ebb61a67a7..95d56b3941 100644
--- a/docker/nova/nova-conductor/Dockerfile.j2
+++ b/docker/nova/nova-conductor/Dockerfile.j2
@@ -26,6 +26,5 @@ MAINTAINER {{ maintainer }}
 
 {% block nova_conductor_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER nova
diff --git a/docker/nova/nova-consoleauth/Dockerfile.j2 b/docker/nova/nova-consoleauth/Dockerfile.j2
index e5a8ad5c48..d87009a266 100644
--- a/docker/nova/nova-consoleauth/Dockerfile.j2
+++ b/docker/nova/nova-consoleauth/Dockerfile.j2
@@ -27,6 +27,5 @@ MAINTAINER {{ maintainer }}
 
 {% block nova_consoleauth_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER nova
diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2
index 813b971282..079711a05d 100644
--- a/docker/nova/nova-libvirt/Dockerfile.j2
+++ b/docker/nova/nova-libvirt/Dockerfile.j2
@@ -64,4 +64,3 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start
 
 {% block nova_libvirt_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
diff --git a/docker/nova/nova-novncproxy/Dockerfile.j2 b/docker/nova/nova-novncproxy/Dockerfile.j2
index 19a861458a..aa8a5dde57 100644
--- a/docker/nova/nova-novncproxy/Dockerfile.j2
+++ b/docker/nova/nova-novncproxy/Dockerfile.j2
@@ -33,6 +33,5 @@ MAINTAINER {{ maintainer }}
 
 {% block nova_novncproxy_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER nova
diff --git a/docker/nova/nova-scheduler/Dockerfile.j2 b/docker/nova/nova-scheduler/Dockerfile.j2
index edd49883cd..c17c46fd40 100644
--- a/docker/nova/nova-scheduler/Dockerfile.j2
+++ b/docker/nova/nova-scheduler/Dockerfile.j2
@@ -26,6 +26,5 @@ MAINTAINER {{ maintainer }}
 
 {% block nova_scheduler_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER nova
diff --git a/docker/nova/nova-serialproxy/Dockerfile.j2 b/docker/nova/nova-serialproxy/Dockerfile.j2
index 025a888a1c..1d29b3165e 100644
--- a/docker/nova/nova-serialproxy/Dockerfile.j2
+++ b/docker/nova/nova-serialproxy/Dockerfile.j2
@@ -22,6 +22,5 @@ MAINTAINER {{ maintainer }}
 
 {% block nova_serialproxy_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER nova
diff --git a/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 b/docker/nova/nova-spicehtml5proxy/Dockerfile.j2
index 913d33e457..edd014dfa5 100644
--- a/docker/nova/nova-spicehtml5proxy/Dockerfile.j2
+++ b/docker/nova/nova-spicehtml5proxy/Dockerfile.j2
@@ -45,6 +45,5 @@ MAINTAINER {{ maintainer }}
 
 {% block nova_spicehtml5proxy_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER nova
diff --git a/docker/nova/nova-ssh/Dockerfile.j2 b/docker/nova/nova-ssh/Dockerfile.j2
index 3b4ded4127..98bee70f13 100644
--- a/docker/nova/nova-ssh/Dockerfile.j2
+++ b/docker/nova/nova-ssh/Dockerfile.j2
@@ -26,4 +26,3 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start
 
 {% block nova_ssh_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
diff --git a/docker/openvswitch/openvswitch-db-server/Dockerfile.j2 b/docker/openvswitch/openvswitch-db-server/Dockerfile.j2
index cf85de2bda..1b23732d6c 100644
--- a/docker/openvswitch/openvswitch-db-server/Dockerfile.j2
+++ b/docker/openvswitch/openvswitch-db-server/Dockerfile.j2
@@ -12,4 +12,3 @@ RUN chmod 755 /usr/local/bin/kolla_ensure_openvswitch_configured \
 
 {% block openvswitch_db_server_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
diff --git a/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2 b/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2
index ef7a5e6ed8..19535d0b17 100644
--- a/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2
+++ b/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2
@@ -8,4 +8,3 @@ RUN chmod 755 /usr/local/bin/kolla_openvswitch_extend_start
 
 {% block openvswitch_vswitchd_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
diff --git a/docker/panko/panko-api/Dockerfile.j2 b/docker/panko/panko-api/Dockerfile.j2
index 0ef0de233c..090a2e9bb6 100644
--- a/docker/panko/panko-api/Dockerfile.j2
+++ b/docker/panko/panko-api/Dockerfile.j2
@@ -22,4 +22,3 @@ RUN chmod 755 /usr/local/bin/kolla_panko_extend_start
 
 {% block panko_api_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
diff --git a/docker/rabbitmq/Dockerfile.j2 b/docker/rabbitmq/Dockerfile.j2
index 764ffbab23..4c7ff02a26 100644
--- a/docker/rabbitmq/Dockerfile.j2
+++ b/docker/rabbitmq/Dockerfile.j2
@@ -61,6 +61,6 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/rabbitmq_get_gosp
     && chmod 440 /etc/sudoers.d/kolla_rabbitmq_sudoers
 
 {% block rabbitmq_footer %}{% endblock %}
-{{ include_footer }}
+{% block footer %}{% endblock %}
 
 USER rabbitmq
diff --git a/docker/rally/Dockerfile.j2 b/docker/rally/Dockerfile.j2
index 04a14a741b..e1872829dd 100644
--- a/docker/rally/Dockerfile.j2
+++ b/docker/rally/Dockerfile.j2
@@ -30,6 +30,5 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start
 
 {% block rally_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER rally
diff --git a/docker/sahara/sahara-api/Dockerfile.j2 b/docker/sahara/sahara-api/Dockerfile.j2
index 91937f9d8f..02dd7e8e8a 100644
--- a/docker/sahara/sahara-api/Dockerfile.j2
+++ b/docker/sahara/sahara-api/Dockerfile.j2
@@ -19,6 +19,5 @@ RUN chmod 755 /usr/local/bin/kolla_sahara_extend_start
 
 {% block sahara_api_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER sahara
diff --git a/docker/sahara/sahara-engine/Dockerfile.j2 b/docker/sahara/sahara-engine/Dockerfile.j2
index d91b0b73a9..84b8b9a362 100644
--- a/docker/sahara/sahara-engine/Dockerfile.j2
+++ b/docker/sahara/sahara-engine/Dockerfile.j2
@@ -17,6 +17,4 @@ MAINTAINER {{ maintainer }}
 {% block sahara_engine_footer %}{% endblock %}
 {% block footer %}{% endblock %}
 
-{{ include_footer }}
-
 USER sahara
diff --git a/docker/searchlight/searchlight-api/Dockerfile.j2 b/docker/searchlight/searchlight-api/Dockerfile.j2
index 1f4797e039..d07c0d1d6b 100644
--- a/docker/searchlight/searchlight-api/Dockerfile.j2
+++ b/docker/searchlight/searchlight-api/Dockerfile.j2
@@ -15,6 +15,5 @@ RUN chmod 755 /usr/local/bin/kolla_searchlight_extend_start
 
 {% block searchlight_api_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER searchlight
diff --git a/docker/searchlight/searchlight-listener/Dockerfile.j2 b/docker/searchlight/searchlight-listener/Dockerfile.j2
index ddba8713b9..8487efb40d 100644
--- a/docker/searchlight/searchlight-listener/Dockerfile.j2
+++ b/docker/searchlight/searchlight-listener/Dockerfile.j2
@@ -12,6 +12,5 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
 
 {% block searchlight_listener_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER searchlight
diff --git a/docker/senlin/senlin-api/Dockerfile.j2 b/docker/senlin/senlin-api/Dockerfile.j2
index e556b40861..a6ac97ba5e 100644
--- a/docker/senlin/senlin-api/Dockerfile.j2
+++ b/docker/senlin/senlin-api/Dockerfile.j2
@@ -15,6 +15,5 @@ RUN chmod 755 /usr/local/bin/kolla_senlin_extend_start
 
 {% block senlin_api_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER senlin
diff --git a/docker/senlin/senlin-engine/Dockerfile.j2 b/docker/senlin/senlin-engine/Dockerfile.j2
index 625796d072..7a3307d692 100644
--- a/docker/senlin/senlin-engine/Dockerfile.j2
+++ b/docker/senlin/senlin-engine/Dockerfile.j2
@@ -12,6 +12,5 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
 
 {% block senlin_engine_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER senlin
diff --git a/docker/solum/solum-api/Dockerfile.j2 b/docker/solum/solum-api/Dockerfile.j2
index 2a5de0e666..16e8c61c68 100644
--- a/docker/solum/solum-api/Dockerfile.j2
+++ b/docker/solum/solum-api/Dockerfile.j2
@@ -15,6 +15,5 @@ RUN chmod 755 /usr/local/bin/kolla_solum_extend_start
 
 {% block solum_api_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER solum
diff --git a/docker/solum/solum-conductor/Dockerfile.j2 b/docker/solum/solum-conductor/Dockerfile.j2
index a2c69ea0f1..03f8a38196 100644
--- a/docker/solum/solum-conductor/Dockerfile.j2
+++ b/docker/solum/solum-conductor/Dockerfile.j2
@@ -12,6 +12,5 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
 
 {% block solum_conductor_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER solum
diff --git a/docker/solum/solum-deployer/Dockerfile.j2 b/docker/solum/solum-deployer/Dockerfile.j2
index 44cb8ada47..782f2563d2 100644
--- a/docker/solum/solum-deployer/Dockerfile.j2
+++ b/docker/solum/solum-deployer/Dockerfile.j2
@@ -12,6 +12,5 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
 
 {% block solum_deployer_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER solum
diff --git a/docker/solum/solum-worker/Dockerfile.j2 b/docker/solum/solum-worker/Dockerfile.j2
index 509c030584..6ac2f9b321 100644
--- a/docker/solum/solum-worker/Dockerfile.j2
+++ b/docker/solum/solum-worker/Dockerfile.j2
@@ -12,6 +12,5 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
 
 {% block solum_worker_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER solum
diff --git a/docker/swift/swift-account/Dockerfile.j2 b/docker/swift/swift-account/Dockerfile.j2
index f69a7317bf..153555cc30 100644
--- a/docker/swift/swift-account/Dockerfile.j2
+++ b/docker/swift/swift-account/Dockerfile.j2
@@ -18,6 +18,5 @@ MAINTAINER {{ maintainer }}
 
 {% block swift_account_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER swift
diff --git a/docker/swift/swift-container/Dockerfile.j2 b/docker/swift/swift-container/Dockerfile.j2
index 8bc64b9ecb..d1b038f5e1 100644
--- a/docker/swift/swift-container/Dockerfile.j2
+++ b/docker/swift/swift-container/Dockerfile.j2
@@ -18,6 +18,5 @@ MAINTAINER {{ maintainer }}
 
 {% block swift_container_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER swift
diff --git a/docker/swift/swift-object-expirer/Dockerfile.j2 b/docker/swift/swift-object-expirer/Dockerfile.j2
index 4ee5c8ec56..f168716489 100644
--- a/docker/swift/swift-object-expirer/Dockerfile.j2
+++ b/docker/swift/swift-object-expirer/Dockerfile.j2
@@ -20,6 +20,5 @@ MAINTAINER {{ maintainer }}
 
 {% block swift_object_expirer_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER swift
diff --git a/docker/swift/swift-object/Dockerfile.j2 b/docker/swift/swift-object/Dockerfile.j2
index 60bcc675f2..ee7ff2346b 100644
--- a/docker/swift/swift-object/Dockerfile.j2
+++ b/docker/swift/swift-object/Dockerfile.j2
@@ -18,6 +18,5 @@ MAINTAINER {{ maintainer }}
 
 {% block swift_object_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER swift
diff --git a/docker/swift/swift-proxy-server/Dockerfile.j2 b/docker/swift/swift-proxy-server/Dockerfile.j2
index d777a10cd0..430fd4f5d8 100644
--- a/docker/swift/swift-proxy-server/Dockerfile.j2
+++ b/docker/swift/swift-proxy-server/Dockerfile.j2
@@ -18,6 +18,5 @@ MAINTAINER {{ maintainer }}
 
 {% block swift_proxy_server_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER swift
diff --git a/docker/swift/swift-rsyncd/Dockerfile.j2 b/docker/swift/swift-rsyncd/Dockerfile.j2
index a34a646e80..d43efa1773 100644
--- a/docker/swift/swift-rsyncd/Dockerfile.j2
+++ b/docker/swift/swift-rsyncd/Dockerfile.j2
@@ -17,6 +17,5 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start
 
 {% block swift_rsyncd_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER swift
diff --git a/docker/telegraf/Dockerfile.j2 b/docker/telegraf/Dockerfile.j2
index d6f30d7181..ba3df8c954 100644
--- a/docker/telegraf/Dockerfile.j2
+++ b/docker/telegraf/Dockerfile.j2
@@ -19,6 +19,5 @@ RUN chmod 750 /etc/sudoers.d \
 
 {% block telegraf_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER telegraf
diff --git a/docker/tempest/Dockerfile.j2 b/docker/tempest/Dockerfile.j2
index dbfb0aa9cd..2f3a53817e 100644
--- a/docker/tempest/Dockerfile.j2
+++ b/docker/tempest/Dockerfile.j2
@@ -39,4 +39,3 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start
 
 {% block tempest_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
diff --git a/docker/tgtd/Dockerfile.j2 b/docker/tgtd/Dockerfile.j2
index d1e37d53f8..284b5c61da 100644
--- a/docker/tgtd/Dockerfile.j2
+++ b/docker/tgtd/Dockerfile.j2
@@ -21,4 +21,3 @@ RUN sed -i '1 i include /var/lib/cinder/volumes/*' /etc/tgt/targets.conf
 
 {% block tgtd_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
diff --git a/docker/trove/trove-api/Dockerfile.j2 b/docker/trove/trove-api/Dockerfile.j2
index 5ac79271a7..c3dd29a002 100644
--- a/docker/trove/trove-api/Dockerfile.j2
+++ b/docker/trove/trove-api/Dockerfile.j2
@@ -21,6 +21,5 @@ RUN chmod 755 /usr/local/bin/kolla_trove_extend_start
 
 {% block trove_api_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER trove
diff --git a/docker/trove/trove-conductor/Dockerfile.j2 b/docker/trove/trove-conductor/Dockerfile.j2
index 0941fae5f0..a8a187acf0 100644
--- a/docker/trove/trove-conductor/Dockerfile.j2
+++ b/docker/trove/trove-conductor/Dockerfile.j2
@@ -18,6 +18,5 @@ MAINTAINER {{ maintainer }}
 
 {% block trove_conductor_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER trove
diff --git a/docker/trove/trove-guestagent/Dockerfile.j2 b/docker/trove/trove-guestagent/Dockerfile.j2
index bcbe9aa5ac..c5c5f8cad8 100644
--- a/docker/trove/trove-guestagent/Dockerfile.j2
+++ b/docker/trove/trove-guestagent/Dockerfile.j2
@@ -18,6 +18,5 @@ MAINTAINER {{ maintainer }}
 
 {% block trove_guestagent_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER trove
diff --git a/docker/trove/trove-taskmanager/Dockerfile.j2 b/docker/trove/trove-taskmanager/Dockerfile.j2
index f594266463..4d20028425 100644
--- a/docker/trove/trove-taskmanager/Dockerfile.j2
+++ b/docker/trove/trove-taskmanager/Dockerfile.j2
@@ -18,6 +18,5 @@ MAINTAINER {{ maintainer }}
 
 {% block trove_taskmanager_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER trove
diff --git a/docker/vmtp/Dockerfile.j2 b/docker/vmtp/Dockerfile.j2
index ffd3dfd5df..c86f6e1753 100644
--- a/docker/vmtp/Dockerfile.j2
+++ b/docker/vmtp/Dockerfile.j2
@@ -24,6 +24,5 @@ RUN chmod 750 /etc/sudoers.d \
 
 {% block vmtp_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER vmtp
diff --git a/docker/watcher/watcher-api/Dockerfile.j2 b/docker/watcher/watcher-api/Dockerfile.j2
index a133b380de..d8e5181168 100644
--- a/docker/watcher/watcher-api/Dockerfile.j2
+++ b/docker/watcher/watcher-api/Dockerfile.j2
@@ -19,6 +19,5 @@ RUN chmod 755 /usr/local/bin/kolla_watcher_extend_start
 
 {% block watcher_api_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER watcher
diff --git a/docker/watcher/watcher-applier/Dockerfile.j2 b/docker/watcher/watcher-applier/Dockerfile.j2
index 364ab2abc2..e9a7895261 100644
--- a/docker/watcher/watcher-applier/Dockerfile.j2
+++ b/docker/watcher/watcher-applier/Dockerfile.j2
@@ -16,6 +16,5 @@ MAINTAINER {{ maintainer }}
 
 {% block watcher_applier_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER watcher
diff --git a/docker/watcher/watcher-engine/Dockerfile.j2 b/docker/watcher/watcher-engine/Dockerfile.j2
index 3aad9ea595..5b8e374ac5 100644
--- a/docker/watcher/watcher-engine/Dockerfile.j2
+++ b/docker/watcher/watcher-engine/Dockerfile.j2
@@ -16,6 +16,5 @@ MAINTAINER {{ maintainer }}
 
 {% block watcher_engine_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER watcher