diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index 86c8286dd8..48522109dd 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -194,13 +194,13 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
 ] %}
 
 RUN {{ macros.install_packages(base_centos_yum_repo_packages | customizable("centos_yum_repo_packages"), chain=True, clean=False) }} \
-{% for repo in base_centos_yum_repos_to_disable | customizable('centos_yum_repos_to_disable') -%}
+{%- for repo in base_centos_yum_repos_to_disable | customizable('centos_yum_repos_to_disable') %}
 {%- if distro_package_manager == 'dnf' %}
     && dnf config-manager --disable {{ repo }} \
-{% else %}
+{%- else %}
     && yum-config-manager --disable {{ repo }} \
-{% endif -%}
-{% endfor -%}
+{%- endif -%}
+{%- endfor %}
 {% for key in base_centos_yum_repo_keys | customizable('centos_yum_repo_keys') -%}
     && rpm --import {{ key }} \
 {% endfor -%}
diff --git a/docker/bifrost/bifrost-base/Dockerfile.j2 b/docker/bifrost/bifrost-base/Dockerfile.j2
index 6b9f5f4d42..8cf1b62d6a 100644
--- a/docker/bifrost/bifrost-base/Dockerfile.j2
+++ b/docker/bifrost/bifrost-base/Dockerfile.j2
@@ -39,19 +39,19 @@ RUN sed -e "s/.*mariadb.*//Ig" -e "s/.*rabbitmq.*//Ig" -i /etc/apt/sources.list
 ENV ANSIBLE_GATHER_TIMEOUT=30
 
 {% block bifrost_ansible_install %}
-{% if base_package_type == 'deb' %}
+{%- if base_package_type == 'deb' %}
 RUN apt-get update && \
-{% else %}
+{%- else %}
 RUN echo " " && \
-{% endif %}
+{%- endif %}
     bash -c './scripts/env-setup.sh && source ./env-vars && \
     ansible-playbook -vvvv -i /bifrost/playbooks/inventory/target /bifrost/playbooks/install.yaml \
     -e @/tmp/build_arg.yml && \
-{% if base_package_type == 'deb' %}
+{%- if base_package_type == 'deb' %}
     apt-get clean && rm -rf /var/lib/apt/lists/*'
-{% else %}
+{%- else %}
     yum clean all && rm -rf /var/yum/cache'
-{% endif %}
+{%- endif %}
 {% endblock %}
 {% endif %}
 
diff --git a/docker/fluentd/Dockerfile.j2 b/docker/fluentd/Dockerfile.j2
index 76fe1c3226..5091efae62 100644
--- a/docker/fluentd/Dockerfile.j2
+++ b/docker/fluentd/Dockerfile.j2
@@ -107,11 +107,11 @@ ARG monasca_output_plugin_url=https://github.com/monasca/fluentd-monasca/archive
 RUN curl -sSL $monasca_output_plugin_url -o /tmp/fluentd-monasca.tar.gz \
     && tar -xvf /tmp/fluentd-monasca.tar.gz -C /tmp \
     && cd /tmp/fluentd-monasca-* \
-{% if fluentd_user == 'fluentd' %}
+{%- if fluentd_user == 'fluentd' %}
     && gem build fluentd-monasca-output.gemspec \
-{% else %}
+{%- else %}
     && td-agent-gem build fluentd-monasca-output.gemspec \
-{% endif %}
+{%- endif %}
     && {{ macros.install_fluent_plugins(fluentd_user, ['fluentd-monasca-output-*.gem'], chain=True) }} \
     && rm -rf /tmp/fluentd*