diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index cd147b43a3..ba5759bf65 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -38,7 +38,8 @@ COPY kibana.yum.repo /etc/yum.repos.d/kibana.yum.repo
 # Turns on MariaDB repos throughout the RPM build
 COPY mariadb.yum.repo /etc/yum.repos.d/MariaDB.repo
 
-RUN yum -y install http://repo.percona.com/release/7/RPMS/x86_64/percona-release-0.1-3.noarch.rpm
+RUN yum -y install \
+        http://repo.percona.com/release/7/RPMS/x86_64/percona-release-0.1-3.noarch.rpm
 
 RUN rpm --import http://yum.mariadb.org/RPM-GPG-KEY-MariaDB \
     && rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-Percona \
@@ -64,11 +65,11 @@ RUN yum-config-manager --enable rhel-7-server-rpms \
     {% if base_distro == 'centos' %}
 
 RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 \
-    && yum install -y \
-         epel-release \
-         yum-plugin-priorities \
-         centos-release-ceph-hammer \
-         centos-release-qemu-ev \
+    && yum -y install \
+           epel-release \
+           yum-plugin-priorities \
+           centos-release-ceph-hammer \
+           centos-release-qemu-ev \
     && rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7 \
     && rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Storage \
     && rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Virtualization \
@@ -81,10 +82,11 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 \
 
 # Enable couple required repositories for all RHEL builds
 # Turn on EPEL throughout the build
-RUN yum install -y \
+RUN yum -y install \
         https://mirror.centos.org/centos-7/7/extras/x86_64/Packages/epel-release-7-5.noarch.rpm \
     && rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7 \
-    && yum -y install yum-plugin-priorities \
+    && yum -y install \
+           yum-plugin-priorities \
     && yum clean all \
     && yum-config-manager --enable rhel-7-server-optional-rpms \
     && yum-config-manager --enable rhel-7-server-extras-rpms
@@ -95,8 +97,7 @@ RUN yum install -y \
     {% if base_distro == 'oraclelinux' %}
 
 COPY oraclelinux-extras.repo /etc/yum.repos.d/oraclelinux-extras.repo
-
-RUN yum install -y \
+RUN yum -y install \
         tar \
         yum-utils \
         http://mirror.centos.org/centos-7/7/extras/x86_64/Packages/epel-release-7-5.noarch.rpm \
@@ -113,7 +114,8 @@ RUN yum install -y \
     && rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Virtualization
 
 RUN yum-config-manager --enable ol7_optional_latest ol7_addons
-RUN yum install -y yum-plugin-priorities \
+RUN yum -y install \
+        yum-plugin-priorities \
     && yum clean all
 
     {% endif %}
@@ -122,9 +124,11 @@ RUN yum install -y yum-plugin-priorities \
     {% if base_distro == 'fedora' %}
 
 # Set up repositories
-RUN yum install -y https://rdo.fedorapeople.org/rdo-release.rpm \
-    && yum -y install dnf dnf-plugins-core \
-    && yum -y install yum-plugin-priorities \
+RUN yum -y install \
+        https://rdo.fedorapeople.org/rdo-release.rpm \
+        dnf \
+        dnf-plugins-core \
+        yum-plugin-priorities \
     && yum clean all
 
     {% endif %}
@@ -135,11 +139,11 @@ RUN yum install -y https://rdo.fedorapeople.org/rdo-release.rpm \
 {# We are back to the basic if conditional here which is:
     if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] #}
 
-RUN yum update -y \
+RUN yum -y update \
     && yum clean all
 
 # Pin package versions
-RUN yum install -y \
+RUN yum -y install \
         yum-plugin-versionlock \
     && yum clean all
 COPY versionlock.list /etc/yum/pluginconf.d/
@@ -147,7 +151,7 @@ COPY versionlock.list /etc/yum/pluginconf.d/
     {% if install_type == 'binary' %}
 
 # Install base packages
-RUN yum install -y \
+RUN yum -y install \
         sudo \
         which \
         python \