diff --git a/docker/watcher/watcher-api/Dockerfile.j2 b/docker/watcher/watcher-api/Dockerfile.j2
index fadf5ea035346020d1dedd32a39dc816239be82b..d428f69d4dfd77f2833b709ff3c86c8ef253d0d4 100644
--- a/docker/watcher/watcher-api/Dockerfile.j2
+++ b/docker/watcher/watcher-api/Dockerfile.j2
@@ -11,6 +11,8 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
 COPY extend_start.sh /usr/local/bin/kolla_watcher_extend_start
 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 dec6cff26f0df4ff73df0b5113bd108e18cebfe8..a3469103c0cfdb3acd81d7661154ff79342f71f1 100644
--- a/docker/watcher/watcher-applier/Dockerfile.j2
+++ b/docker/watcher/watcher-applier/Dockerfile.j2
@@ -8,6 +8,8 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
 
 {% endif %}
 
+{% block watcher_applier_footer %}{% endblock %}
+{% block footer %}{% endblock %}
 {{ include_footer }}
 
 USER watcher
diff --git a/docker/watcher/watcher-base/Dockerfile.j2 b/docker/watcher/watcher-base/Dockerfile.j2
index f6f86ddf9b3664d11a0400de7aa040b10ef86dc9..5e475f56295258e13c88396f4b4d2f78fdf1a03d 100644
--- a/docker/watcher/watcher-base/Dockerfile.j2
+++ b/docker/watcher/watcher-base/Dockerfile.j2
@@ -25,3 +25,7 @@ COPY extend_start.sh /usr/local/bin/kolla_extend_start
 RUN usermod -a -G kolla watcher \
     && touch /usr/local/bin/kolla_watcher_extend_start \
     && 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 }}
diff --git a/docker/watcher/watcher-engine/Dockerfile.j2 b/docker/watcher/watcher-engine/Dockerfile.j2
index dec6cff26f0df4ff73df0b5113bd108e18cebfe8..bae251c92e9ec98fc075238d19c563163124e3cd 100644
--- a/docker/watcher/watcher-engine/Dockerfile.j2
+++ b/docker/watcher/watcher-engine/Dockerfile.j2
@@ -8,6 +8,8 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
 
 {% endif %}
 
+{% block watcher_engine_footer %}{% endblock %}
+{% block footer %}{% endblock %}
 {{ include_footer }}
 
 USER watcher