diff --git a/docker/ceph/ceph-base/Dockerfile.j2 b/docker/ceph/ceph-base/Dockerfile.j2
index 7edc3ebdfe..dfed5947b9 100644
--- a/docker/ceph/ceph-base/Dockerfile.j2
+++ b/docker/ceph/ceph-base/Dockerfile.j2
@@ -33,5 +33,3 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start \
     && usermod -a -G kolla ceph
 
 {% block ceph_base_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-{{ include_footer }}
diff --git a/docker/cinder/cinder-base/Dockerfile.j2 b/docker/cinder/cinder-base/Dockerfile.j2
index 8d59f54414..989ded8805 100644
--- a/docker/cinder/cinder-base/Dockerfile.j2
+++ b/docker/cinder/cinder-base/Dockerfile.j2
@@ -70,4 +70,3 @@ RUN usermod -a -G kolla cinder \
     && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_cinder_extend_start
 
 {% block cinder_base_footer %}{% endblock %}
-{% block footer %}{% endblock %}
diff --git a/docker/congress/congress-base/Dockerfile.j2 b/docker/congress/congress-base/Dockerfile.j2
index 01890efca6..5d1dedfd3a 100644
--- a/docker/congress/congress-base/Dockerfile.j2
+++ b/docker/congress/congress-base/Dockerfile.j2
@@ -42,5 +42,3 @@ RUN usermod -a -G kolla congress \
     && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_congress_extend_start
 
 {% block congress_base_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-{{ include_footer }}
diff --git a/docker/designate/designate-base/Dockerfile.j2 b/docker/designate/designate-base/Dockerfile.j2
index ad0727c1a2..173f145d0f 100644
--- a/docker/designate/designate-base/Dockerfile.j2
+++ b/docker/designate/designate-base/Dockerfile.j2
@@ -58,4 +58,3 @@ RUN usermod -a -G kolla designate \
     && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_designate_extend_start
 
 {% block designate_base_footer %}{% endblock %}
-{% block footer %}{% endblock %}
diff --git a/docker/glance/glance-base/Dockerfile.j2 b/docker/glance/glance-base/Dockerfile.j2
index 95983f45cc..5b1f89cca0 100644
--- a/docker/glance/glance-base/Dockerfile.j2
+++ b/docker/glance/glance-base/Dockerfile.j2
@@ -50,5 +50,3 @@ RUN usermod -a -G kolla glance \
     && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_glance_extend_start
 
 {% block glance_base_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-{{ include_footer }}
diff --git a/docker/heat/heat-base/Dockerfile.j2 b/docker/heat/heat-base/Dockerfile.j2
index d936318bd5..01b898e9b7 100644
--- a/docker/heat/heat-base/Dockerfile.j2
+++ b/docker/heat/heat-base/Dockerfile.j2
@@ -33,4 +33,3 @@ RUN usermod -a -G kolla heat \
     && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_heat_extend_start
 
 {% block heat_base_footer %}{% endblock %}
-{% block footer %}{% endblock %}
diff --git a/docker/keystone/keystone-base/Dockerfile.j2 b/docker/keystone/keystone-base/Dockerfile.j2
index 6a909a5d5b..a17a9b4fb9 100644
--- a/docker/keystone/keystone-base/Dockerfile.j2
+++ b/docker/keystone/keystone-base/Dockerfile.j2
@@ -77,5 +77,3 @@ RUN usermod -a -G kolla keystone \
     && chmod 755 /var/www/cgi-bin/keystone/*
 
 {% block keystone_base_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-{{ include_footer }}
diff --git a/docker/manila/manila-base/Dockerfile.j2 b/docker/manila/manila-base/Dockerfile.j2
index cd8b70b668..e5142123ef 100644
--- a/docker/manila/manila-base/Dockerfile.j2
+++ b/docker/manila/manila-base/Dockerfile.j2
@@ -60,4 +60,3 @@ RUN touch /usr/local/bin/kolla_manila_extend_start \
 RUN usermod -a -G kolla manila
 
 {% block manila_base_footer %}{% endblock %}
-{% block footer %}{% endblock %}
diff --git a/docker/murano/murano-base/Dockerfile.j2 b/docker/murano/murano-base/Dockerfile.j2
index 30b4d5fcd6..f0b0ee6f53 100644
--- a/docker/murano/murano-base/Dockerfile.j2
+++ b/docker/murano/murano-base/Dockerfile.j2
@@ -36,4 +36,3 @@ RUN usermod -a -G kolla murano \
     && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_murano_extend_start
 
 {% block murano_base_footer %}{% endblock %}
-{% block footer %}{% endblock %}
diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2
index 4b9f912512..041aff2d1f 100644
--- a/docker/openstack-base/Dockerfile.j2
+++ b/docker/openstack-base/Dockerfile.j2
@@ -350,4 +350,3 @@ ENV PATH /var/lib/kolla/venv/bin:$PATH
 {% endif %}
 
 {% block openstack_base_footer %}{% endblock %}
-{% block footer %}{% endblock %}
diff --git a/docker/openvswitch/openvswitch-base/Dockerfile.j2 b/docker/openvswitch/openvswitch-base/Dockerfile.j2
index 0dce1ff776..832dbec122 100644
--- a/docker/openvswitch/openvswitch-base/Dockerfile.j2
+++ b/docker/openvswitch/openvswitch-base/Dockerfile.j2
@@ -20,4 +20,3 @@ RUN touch /usr/local/bin/kolla_openvswitch_extend_start \
     && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_openvswitch_extend_start
 
 {% block openvswitch_base_footer %}{% endblock %}
-{% block footer %}{% endblock %}
diff --git a/docker/searchlight/searchlight-base/Dockerfile.j2 b/docker/searchlight/searchlight-base/Dockerfile.j2
index a5fa4995fc..96eb274088 100644
--- a/docker/searchlight/searchlight-base/Dockerfile.j2
+++ b/docker/searchlight/searchlight-base/Dockerfile.j2
@@ -27,4 +27,3 @@ RUN usermod -a -G kolla searchlight \
     && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_searchlight_extend_start
 
 {% block searchlight_base_footer %}{% endblock %}
-{% block footer %}{% endblock %}
diff --git a/docker/senlin/senlin-base/Dockerfile.j2 b/docker/senlin/senlin-base/Dockerfile.j2
index 369b0bf4ec..1c38ee183d 100644
--- a/docker/senlin/senlin-base/Dockerfile.j2
+++ b/docker/senlin/senlin-base/Dockerfile.j2
@@ -27,4 +27,3 @@ RUN usermod -a -G kolla senlin \
     && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_senlin_extend_start
 
 {% block senlin_base_footer %}{% endblock %}
-{% block footer %}{% endblock %}
diff --git a/docker/swift/swift-base/Dockerfile.j2 b/docker/swift/swift-base/Dockerfile.j2
index c35bc20a56..c1ec5409ce 100644
--- a/docker/swift/swift-base/Dockerfile.j2
+++ b/docker/swift/swift-base/Dockerfile.j2
@@ -53,4 +53,3 @@ RUN mkdir -p /opt/swift
 RUN usermod -a -G kolla swift
 
 {% block swift_base_footer %}{% endblock %}
-{% block footer %}{% endblock %}
diff --git a/docker/trove/trove-base/Dockerfile.j2 b/docker/trove/trove-base/Dockerfile.j2
index 6f7bb9447c..e72f3ea743 100644
--- a/docker/trove/trove-base/Dockerfile.j2
+++ b/docker/trove/trove-base/Dockerfile.j2
@@ -34,4 +34,3 @@ RUN usermod -a -G kolla trove \
     && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_trove_extend_start
 
 {% block trove_base_footer %}{% endblock %}
-{% block footer %}{% endblock %}
diff --git a/docker/watcher/watcher-base/Dockerfile.j2 b/docker/watcher/watcher-base/Dockerfile.j2
index 1e695dc0bb..9d5386897d 100644
--- a/docker/watcher/watcher-base/Dockerfile.j2
+++ b/docker/watcher/watcher-base/Dockerfile.j2
@@ -29,5 +29,3 @@ RUN usermod -a -G kolla watcher \
     && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_watcher_extend_start
 
 {% block watcher_base_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-{{ include_footer }}