diff --git a/docker/centos/binary/barbican/Dockerfile b/docker/centos/binary/barbican/Dockerfile
index 0a124dc386..5c139a0add 100644
--- a/docker/centos/binary/barbican/Dockerfile
+++ b/docker/centos/binary/barbican/Dockerfile
@@ -1,7 +1,7 @@
 FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
 MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
-ADD ./start.sh /start.sh
+COPY ./start.sh /start.sh
 
 # Install required packages
 # NOTE: these packages (tar especially) can be pruned once converted to
diff --git a/docker/centos/binary/ceilometer/ceilometer-alarm/Dockerfile b/docker/centos/binary/ceilometer/ceilometer-alarm/Dockerfile
index 24e0369250..efe2684ee4 100644
--- a/docker/centos/binary/ceilometer/ceilometer-alarm/Dockerfile
+++ b/docker/centos/binary/ceilometer/ceilometer-alarm/Dockerfile
@@ -3,7 +3,7 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
 RUN yum install -y openstack-ceilometer-alarm && yum clean all
 
-ADD ./start.sh /start.sh
+COPY ./start.sh /start.sh
 COPY config-internal.sh config-external.sh /opt/kolla/
 
 CMD ["/start.sh"]
diff --git a/docker/centos/binary/ceilometer/ceilometer-api/Dockerfile b/docker/centos/binary/ceilometer/ceilometer-api/Dockerfile
index 387660fff4..d80da07bbf 100644
--- a/docker/centos/binary/ceilometer/ceilometer-api/Dockerfile
+++ b/docker/centos/binary/ceilometer/ceilometer-api/Dockerfile
@@ -3,6 +3,6 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
 RUN yum install -y openstack-ceilometer-api && yum clean all
 
-ADD ./start.sh /start.sh
+COPY ./start.sh /start.sh
 COPY config-internal.sh config-external.sh /opt/kolla/
 CMD ["/start.sh"]
diff --git a/docker/centos/binary/ceilometer/ceilometer-central/Dockerfile b/docker/centos/binary/ceilometer/ceilometer-central/Dockerfile
index 29ebbdc931..6317a43e40 100644
--- a/docker/centos/binary/ceilometer/ceilometer-central/Dockerfile
+++ b/docker/centos/binary/ceilometer/ceilometer-central/Dockerfile
@@ -3,7 +3,7 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
 RUN yum install -y openstack-ceilometer-central && yum clean all
 
-ADD ./start.sh /start.sh
+COPY ./start.sh /start.sh
 COPY config-internal.sh config-external.sh /opt/kolla/
 
 CMD ["/start.sh"]
diff --git a/docker/centos/binary/ceilometer/ceilometer-collector/Dockerfile b/docker/centos/binary/ceilometer/ceilometer-collector/Dockerfile
index a715014ce9..55cabe1e43 100644
--- a/docker/centos/binary/ceilometer/ceilometer-collector/Dockerfile
+++ b/docker/centos/binary/ceilometer/ceilometer-collector/Dockerfile
@@ -3,7 +3,7 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
 RUN yum install -y openstack-ceilometer-collector && yum clean all
 
-ADD ./start.sh /start.sh
+COPY ./start.sh /start.sh
 COPY config-internal.sh config-external.sh /opt/kolla/
 
 CMD ["/start.sh"]
diff --git a/docker/centos/binary/ceilometer/ceilometer-compute/Dockerfile b/docker/centos/binary/ceilometer/ceilometer-compute/Dockerfile
index 3d476d8e52..08bb70c1e0 100644
--- a/docker/centos/binary/ceilometer/ceilometer-compute/Dockerfile
+++ b/docker/centos/binary/ceilometer/ceilometer-compute/Dockerfile
@@ -4,7 +4,7 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
 RUN yum install -y openstack-ceilometer-compute python-ceilometerclient python-pecan \
     && yum clean all
 
-ADD ./start.sh /start.sh
+COPY ./start.sh /start.sh
 COPY config-internal.sh config-external.sh /opt/kolla/
 
 CMD ["/start.sh"]
diff --git a/docker/centos/binary/ceilometer/ceilometer-notification/Dockerfile b/docker/centos/binary/ceilometer/ceilometer-notification/Dockerfile
index 7d6f2763d6..2161b7f318 100644
--- a/docker/centos/binary/ceilometer/ceilometer-notification/Dockerfile
+++ b/docker/centos/binary/ceilometer/ceilometer-notification/Dockerfile
@@ -3,7 +3,7 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
 RUN yum install -y openstack-ceilometer-notification && yum clean all
 
-ADD ./start.sh /start.sh
+COPY ./start.sh /start.sh
 COPY config-internal.sh config-external.sh /opt/kolla/
 
 CMD ["/start.sh"]
diff --git a/docker/centos/binary/cinder-app/cinder-scheduler/Dockerfile b/docker/centos/binary/cinder-app/cinder-scheduler/Dockerfile
index 1014e3dcef..43994f1238 100644
--- a/docker/centos/binary/cinder-app/cinder-scheduler/Dockerfile
+++ b/docker/centos/binary/cinder-app/cinder-scheduler/Dockerfile
@@ -1,7 +1,7 @@
 FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%cinder-base:%%KOLLA_TAG%%
 MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
-ADD ./start.sh /start.sh
+COPY ./start.sh /start.sh
 COPY config-internal.sh config-external.sh /opt/kolla/
 
 CMD ["/start.sh"]
diff --git a/docker/centos/binary/docker-compose/README.md b/docker/centos/binary/docker-compose/README.md
index 857202e779..38b17a16a5 100644
--- a/docker/centos/binary/docker-compose/README.md
+++ b/docker/centos/binary/docker-compose/README.md
@@ -8,7 +8,7 @@ Fast, isolated development environments using Docker.
 Define your app's environment with Docker so it can be reproduced anywhere:
 
     FROM python:2.7
-    ADD . /code
+    COPY . /code
     WORKDIR /code
     RUN pip install -r requirements.txt
     CMD python app.py
diff --git a/docker/centos/binary/glance/glance-api/Dockerfile b/docker/centos/binary/glance/glance-api/Dockerfile
index 70e87a882c..dc123fc1b1 100644
--- a/docker/centos/binary/glance/glance-api/Dockerfile
+++ b/docker/centos/binary/glance/glance-api/Dockerfile
@@ -1,8 +1,8 @@
 FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%glance-base:%%KOLLA_TAG%%
 MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
-ADD ./start.sh /start.sh
-ADD ./check.sh /check.sh
+COPY ./start.sh /start.sh
+COPY ./check.sh /check.sh
 
 COPY config-internal.sh config-external.sh /opt/kolla/
 
diff --git a/docker/centos/binary/glance/glance-registry/Dockerfile b/docker/centos/binary/glance/glance-registry/Dockerfile
index 27269a03ea..5ff6609231 100644
--- a/docker/centos/binary/glance/glance-registry/Dockerfile
+++ b/docker/centos/binary/glance/glance-registry/Dockerfile
@@ -3,5 +3,5 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
 COPY config-internal.sh config-external.sh /opt/kolla/
 
-ADD ./start.sh /start.sh
+COPY ./start.sh /start.sh
 CMD ["/start.sh"]
diff --git a/docker/centos/binary/hautoproxy/Dockerfile b/docker/centos/binary/hautoproxy/Dockerfile
index c5c265d0ab..34299c843b 100644
--- a/docker/centos/binary/hautoproxy/Dockerfile
+++ b/docker/centos/binary/hautoproxy/Dockerfile
@@ -3,7 +3,7 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
 RUN yum -y install haproxy python-jinja2 && yum clean all
 RUN mkdir -p /etc/haproxy/templates
-ADD haproxy.cfg.tmpl /etc/haproxy/templates/haproxy.cfg.tmpl
-ADD start.py /start.py
+COPY haproxy.cfg.tmpl /etc/haproxy/templates/haproxy.cfg.tmpl
+COPY start.py /start.py
 CMD ["/start.py"]
 
diff --git a/docker/centos/binary/heat/heat-api-cfn/Dockerfile b/docker/centos/binary/heat/heat-api-cfn/Dockerfile
index b26302a4f5..450363bc04 100644
--- a/docker/centos/binary/heat/heat-api-cfn/Dockerfile
+++ b/docker/centos/binary/heat/heat-api-cfn/Dockerfile
@@ -6,8 +6,8 @@ RUN yum -y install \
     python-openstackclient \
     && yum clean all
 
-ADD ./start.sh /start.sh
-ADD ./check.sh /check.sh
+COPY ./start.sh /start.sh
+COPY ./check.sh /check.sh
 
 COPY config-internal.sh config-external.sh /opt/kolla/
 
diff --git a/docker/centos/binary/heat/heat-api/Dockerfile b/docker/centos/binary/heat/heat-api/Dockerfile
index e7a4214dd2..ac0e187723 100644
--- a/docker/centos/binary/heat/heat-api/Dockerfile
+++ b/docker/centos/binary/heat/heat-api/Dockerfile
@@ -8,8 +8,8 @@ RUN yum -y install \
     python-openstackclient \
     && yum clean all
 
-ADD ./start.sh /start.sh
-ADD ./check.sh /check.sh
+COPY ./start.sh /start.sh
+COPY ./check.sh /check.sh
 
 COPY config-internal.sh config-external.sh /opt/kolla/
 
diff --git a/docker/centos/binary/heat/heat-engine/Dockerfile b/docker/centos/binary/heat/heat-engine/Dockerfile
index d22d1ae3ae..83f2eba241 100644
--- a/docker/centos/binary/heat/heat-engine/Dockerfile
+++ b/docker/centos/binary/heat/heat-engine/Dockerfile
@@ -9,7 +9,7 @@ RUN yum -y install \
     openstack-heat-engine \
     && yum clean all
 
-ADD ./start.sh /start.sh
+COPY ./start.sh /start.sh
 
 COPY config-internal.sh config-external.sh /opt/kolla/
 
diff --git a/docker/centos/binary/horizon/Dockerfile b/docker/centos/binary/horizon/Dockerfile
index fff2bff43f..6e657c1d11 100644
--- a/docker/centos/binary/horizon/Dockerfile
+++ b/docker/centos/binary/horizon/Dockerfile
@@ -17,6 +17,6 @@ COPY config-internal.sh config-external.sh horizon-bug-1469284.patch /opt/kolla/
 # https://bugs.launchpad.net/kolla/+bug/1469284 becomes available upstream.
 # Review for this bug is at https://review.openstack.org/#/c/167981/
 RUN patch /usr/lib/python2.7/site-packages/openstack_auth/user.py < /opt/kolla/horizon-bug-1469284.patch
-ADD ./start.sh /start.sh
+COPY ./start.sh /start.sh
 
 CMD ["/start.sh"]
diff --git a/docker/centos/binary/magnum/magnum-api/Dockerfile b/docker/centos/binary/magnum/magnum-api/Dockerfile
index 7b0ab74d2c..244ca3da16 100644
--- a/docker/centos/binary/magnum/magnum-api/Dockerfile
+++ b/docker/centos/binary/magnum/magnum-api/Dockerfile
@@ -5,8 +5,8 @@ RUN yum -y install \
     openstack-magnum-api \
     && yum clean all
 
-ADD ./start.sh /start.sh
-ADD ./check.sh /check.sh
+COPY ./start.sh /start.sh
+COPY ./check.sh /check.sh
 
 COPY config-internal.sh config-external.sh /opt/kolla/
 
diff --git a/docker/centos/binary/magnum/magnum-conductor/Dockerfile b/docker/centos/binary/magnum/magnum-conductor/Dockerfile
index 691d02d093..dd19a9d080 100644
--- a/docker/centos/binary/magnum/magnum-conductor/Dockerfile
+++ b/docker/centos/binary/magnum/magnum-conductor/Dockerfile
@@ -9,7 +9,7 @@ RUN yum -y install \
 # Install kubectl binary (ugh)
 RUN cd /tmp && curl -L https://github.com/GoogleCloudPlatform/kubernetes/releases/download/v0.15.0/kubernetes.tar.gz -o /tmp/kubernetes.tar.gz && /usr/bin/tar -xzvf /tmp/kubernetes.tar.gz && cp -a /tmp/kubernetes/platforms/linux/amd64/kubectl /usr/bin/kubectl && rm -rf /tmp/kubernetes
 
-ADD ./start.sh /start.sh
+COPY ./start.sh /start.sh
 
 COPY config-internal.sh config-external.sh /opt/kolla/
 
diff --git a/docker/centos/binary/mariadb-app/Dockerfile b/docker/centos/binary/mariadb-app/Dockerfile
index dc40254548..e1cfee562d 100644
--- a/docker/centos/binary/mariadb-app/Dockerfile
+++ b/docker/centos/binary/mariadb-app/Dockerfile
@@ -10,8 +10,8 @@ RUN yum -y install mariadb \
     && yum clean all
 
 # Add mysql configuration scripts
-ADD config-mysql.sh /opt/kolla/config-mysql.sh
-ADD mysql-entrypoint.sh /opt/kolla/mysql-entrypoint.sh
+COPY config-mysql.sh /opt/kolla/config-mysql.sh
+COPY mysql-entrypoint.sh /opt/kolla/mysql-entrypoint.sh
 
 # start mysql
 ENTRYPOINT ["/opt/kolla/mysql-entrypoint.sh"]
diff --git a/docker/centos/binary/nova-base/Dockerfile b/docker/centos/binary/nova-base/Dockerfile
index d116ac9730..95220cfd85 100644
--- a/docker/centos/binary/nova-base/Dockerfile
+++ b/docker/centos/binary/nova-base/Dockerfile
@@ -7,5 +7,5 @@ RUN yum -y install openstack-nova-common \
      python-nova \
      bridge-utils && yum clean all
 
-ADD config-nova.sh /opt/kolla/config-nova.sh
+COPY config-nova.sh /opt/kolla/config-nova.sh
 
diff --git a/docker/centos/binary/nova-compute/nova-compute/Dockerfile b/docker/centos/binary/nova-compute/nova-compute/Dockerfile
index 4e307a613c..6cdd27fbe3 100644
--- a/docker/centos/binary/nova-compute/nova-compute/Dockerfile
+++ b/docker/centos/binary/nova-compute/nova-compute/Dockerfile
@@ -4,9 +4,9 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
 RUN yum -y install openstack-nova-compute \
         sysfsutils && yum clean all
 
-ADD config-nova-compute.sh /opt/kolla/config-nova-compute.sh
+COPY config-nova-compute.sh /opt/kolla/config-nova-compute.sh
 
-ADD ./start.sh /start.sh
+COPY ./start.sh /start.sh
 
 COPY config-internal.sh config-external.sh /opt/kolla/
 
diff --git a/docker/centos/binary/nova-compute/nova-libvirt/Dockerfile b/docker/centos/binary/nova-compute/nova-libvirt/Dockerfile
index 1dcf9156bd..fd48295754 100644
--- a/docker/centos/binary/nova-compute/nova-libvirt/Dockerfile
+++ b/docker/centos/binary/nova-compute/nova-libvirt/Dockerfile
@@ -11,7 +11,7 @@ RUN yum -y install libvirt-daemon \
 
 VOLUME [ "/sys/fs/cgroup" ]
 
-ADD ./start.sh /start.sh
+COPY ./start.sh /start.sh
 
 COPY config-internal.sh config-external.sh /opt/kolla/
 
diff --git a/docker/centos/binary/nova-compute/nova-network/Dockerfile b/docker/centos/binary/nova-compute/nova-network/Dockerfile
index 061ab1f9eb..70ccc3ad99 100644
--- a/docker/centos/binary/nova-compute/nova-network/Dockerfile
+++ b/docker/centos/binary/nova-compute/nova-network/Dockerfile
@@ -4,8 +4,8 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
 RUN yum -y install openstack-nova-network \
         bridge-utils initscripts && yum clean all
 
-ADD config-nova-network.sh /opt/kolla/config-nova-network.sh
-ADD ./start.sh /start.sh
+COPY config-nova-network.sh /opt/kolla/config-nova-network.sh
+COPY ./start.sh /start.sh
 
 COPY config-internal.sh config-external.sh /opt/kolla/
 
diff --git a/docker/centos/binary/nova-controller/nova-api/Dockerfile b/docker/centos/binary/nova-controller/nova-api/Dockerfile
index fb0581dcee..4e20a50365 100644
--- a/docker/centos/binary/nova-controller/nova-api/Dockerfile
+++ b/docker/centos/binary/nova-controller/nova-api/Dockerfile
@@ -4,8 +4,8 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
 RUN yum -y install \
         openstack-nova-api && yum clean all
 
-ADD ./start.sh /start.sh
-ADD ./check.sh /check.sh
+COPY ./start.sh /start.sh
+COPY ./check.sh /check.sh
 
 COPY config-internal.sh config-external.sh /opt/kolla/
 
diff --git a/docker/centos/binary/nova-controller/nova-conductor/Dockerfile b/docker/centos/binary/nova-controller/nova-conductor/Dockerfile
index 0f4b104b89..1e20095d8a 100644
--- a/docker/centos/binary/nova-controller/nova-conductor/Dockerfile
+++ b/docker/centos/binary/nova-controller/nova-conductor/Dockerfile
@@ -4,7 +4,7 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
 RUN yum -y install \
         openstack-nova-conductor && yum clean all
 
-ADD ./start.sh /start.sh
+COPY ./start.sh /start.sh
 
 COPY config-internal.sh config-external.sh /opt/kolla/
 
diff --git a/docker/centos/binary/nova-controller/nova-consoleauth/Dockerfile b/docker/centos/binary/nova-controller/nova-consoleauth/Dockerfile
index 51331353cb..4291e33105 100644
--- a/docker/centos/binary/nova-controller/nova-consoleauth/Dockerfile
+++ b/docker/centos/binary/nova-controller/nova-consoleauth/Dockerfile
@@ -3,7 +3,7 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
 RUN yum -y install openstack-nova-console && yum clean all
 
-ADD start.sh /start.sh
+COPY start.sh /start.sh
 
 COPY config-internal.sh config-external.sh /opt/kolla/
 
diff --git a/docker/centos/binary/nova-controller/nova-novncproxy/Dockerfile b/docker/centos/binary/nova-controller/nova-novncproxy/Dockerfile
index 3fb1d31ad2..5b7a4bb708 100644
--- a/docker/centos/binary/nova-controller/nova-novncproxy/Dockerfile
+++ b/docker/centos/binary/nova-controller/nova-novncproxy/Dockerfile
@@ -5,7 +5,7 @@ RUN yum -y install \
     novnc openstack-nova-novncproxy && \
     yum clean all
 
-ADD start.sh /start.sh
+COPY start.sh /start.sh
 
 COPY config-internal.sh config-external.sh /opt/kolla/
 
diff --git a/docker/centos/binary/nova-controller/nova-scheduler/Dockerfile b/docker/centos/binary/nova-controller/nova-scheduler/Dockerfile
index 49f34f66b0..0359a87c5a 100644
--- a/docker/centos/binary/nova-controller/nova-scheduler/Dockerfile
+++ b/docker/centos/binary/nova-controller/nova-scheduler/Dockerfile
@@ -4,7 +4,7 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
 RUN yum -y install \
         openstack-nova-scheduler && yum clean all
 
-ADD ./start.sh /start.sh
+COPY ./start.sh /start.sh
 
 COPY config-internal.sh config-external.sh /opt/kolla/
 
diff --git a/docker/centos/binary/swift/swift-account/Dockerfile b/docker/centos/binary/swift/swift-account/Dockerfile
index 6c8d1cc199..4c407ea820 100644
--- a/docker/centos/binary/swift/swift-account/Dockerfile
+++ b/docker/centos/binary/swift/swift-account/Dockerfile
@@ -1,7 +1,7 @@
 FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-base:%%KOLLA_TAG%%
 MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
-ADD ./start.sh /start.sh
+COPY ./start.sh /start.sh
 
 COPY config-internal.sh config-external.sh /opt/kolla/
 
diff --git a/docker/centos/binary/swift/swift-container/Dockerfile b/docker/centos/binary/swift/swift-container/Dockerfile
index 6c8d1cc199..4c407ea820 100644
--- a/docker/centos/binary/swift/swift-container/Dockerfile
+++ b/docker/centos/binary/swift/swift-container/Dockerfile
@@ -1,7 +1,7 @@
 FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-base:%%KOLLA_TAG%%
 MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
-ADD ./start.sh /start.sh
+COPY ./start.sh /start.sh
 
 COPY config-internal.sh config-external.sh /opt/kolla/
 
diff --git a/docker/centos/binary/swift/swift-object/Dockerfile b/docker/centos/binary/swift/swift-object/Dockerfile
index 6c8d1cc199..4c407ea820 100644
--- a/docker/centos/binary/swift/swift-object/Dockerfile
+++ b/docker/centos/binary/swift/swift-object/Dockerfile
@@ -1,7 +1,7 @@
 FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-base:%%KOLLA_TAG%%
 MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
-ADD ./start.sh /start.sh
+COPY ./start.sh /start.sh
 
 COPY config-internal.sh config-external.sh /opt/kolla/
 
diff --git a/docker/centos/binary/swift/swift-proxy-server/Dockerfile b/docker/centos/binary/swift/swift-proxy-server/Dockerfile
index 6c8d1cc199..4c407ea820 100644
--- a/docker/centos/binary/swift/swift-proxy-server/Dockerfile
+++ b/docker/centos/binary/swift/swift-proxy-server/Dockerfile
@@ -1,7 +1,7 @@
 FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-base:%%KOLLA_TAG%%
 MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
-ADD ./start.sh /start.sh
+COPY ./start.sh /start.sh
 
 COPY config-internal.sh config-external.sh /opt/kolla/
 
diff --git a/docker/centos/binary/zaqar/Dockerfile b/docker/centos/binary/zaqar/Dockerfile
index ddb198fe39..0fcce22606 100644
--- a/docker/centos/binary/zaqar/Dockerfile
+++ b/docker/centos/binary/zaqar/Dockerfile
@@ -3,8 +3,8 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
 RUN yum -y install openstack-zaqar && yum clean all
 
-ADD ./start.sh /start.sh
-ADD ./check.sh /check.sh
+COPY ./start.sh /start.sh
+COPY ./check.sh /check.sh
 
 COPY config-internal.sh config-external.sh /opt/kolla/