diff --git a/dockers/docker-database/Dockerfile.j2 b/dockers/docker-database/Dockerfile.j2
index cc8cd9bb20..cca7cd5359 100644
--- a/dockers/docker-database/Dockerfile.j2
+++ b/dockers/docker-database/Dockerfile.j2
@@ -2,7 +2,11 @@ FROM docker-base
 
 RUN apt-get update
 
-COPY debs/ debs
+COPY \
+{% for deb in docker_database_debs.split(' ') -%}
+debs/{{ deb }}{{' '}}
+{%- endfor -%}
+debs/
 
 ## Install redis-tools dependencies
 ## TODO: implicitly install dependencies
diff --git a/dockers/docker-fpm/Dockerfile.j2 b/dockers/docker-fpm/Dockerfile.j2
index 3007d8e1e5..ae638d078a 100644
--- a/dockers/docker-fpm/Dockerfile.j2
+++ b/dockers/docker-fpm/Dockerfile.j2
@@ -4,7 +4,11 @@ RUN apt-get update
 
 RUN apt-get install -y libdbus-1-3 libdaemon0 libjansson4
 
-COPY debs/ debs
+COPY \
+{% for deb in docker_fpm_debs.split(' ') -%}
+debs/{{ deb }}{{' '}}
+{%- endfor -%}
+debs/
 
 RUN dpkg -i \
 {% for deb in docker_fpm_debs.split(' ') -%}
diff --git a/dockers/docker-lldp-sv2/Dockerfile.j2 b/dockers/docker-lldp-sv2/Dockerfile.j2
index 833e467373..9fdb3244e6 100644
--- a/dockers/docker-lldp-sv2/Dockerfile.j2
+++ b/dockers/docker-lldp-sv2/Dockerfile.j2
@@ -1,6 +1,11 @@
 FROM docker-base
 
-COPY debs /debs
+COPY \
+{% for deb in docker_lldp_sv2_debs.split(' ') -%}
+debs/{{ deb }}{{' '}}
+{%- endfor -%}
+debs/
+
 COPY python-wheels /python-wheels
 
 RUN apt-get update && apt-get install -y python-pip supervisor libbsd0 libevent-2.0-5 libjansson4 libwrap0 libxml2 libpci3 libperl5.20
diff --git a/dockers/docker-orchagent/Dockerfile.j2 b/dockers/docker-orchagent/Dockerfile.j2
index 8b82102993..cea7cb1a3a 100755
--- a/dockers/docker-orchagent/Dockerfile.j2
+++ b/dockers/docker-orchagent/Dockerfile.j2
@@ -8,7 +8,11 @@ RUN apt-get install -f -y ifupdown bridge-utils libdbus-1-3 libdaemon0 libjansso
 ## TODO: implicitly install dependencies
 RUN apt-get -y install libjemalloc1
 
-COPY debs /debs
+COPY \
+{% for deb in docker_orchagent_debs.split(' ') -%}
+debs/{{ deb }}{{' '}}
+{%- endfor -%}
+debs/
 
 RUN dpkg -i \
 {% for deb in docker_orchagent_debs.split(' ') -%}
diff --git a/dockers/docker-ptf/Dockerfile.j2 b/dockers/docker-ptf/Dockerfile.j2
index 85732eae35..ea86fd6c3c 100644
--- a/dockers/docker-ptf/Dockerfile.j2
+++ b/dockers/docker-ptf/Dockerfile.j2
@@ -3,7 +3,11 @@ FROM debian:jessie
 MAINTAINER Pavel Shirshov
 
 ## Copy dependencies
-COPY debs /debs
+COPY \
+{% for deb in docker_ptf_debs.split(' ') -%}
+debs/{{ deb }}{{' '}}
+{%- endfor -%}
+debs/
 
 ## Make apt-get non-interactive
 ENV DEBIAN_FRONTEND=noninteractive
diff --git a/dockers/docker-snmp-sv2/Dockerfile.j2 b/dockers/docker-snmp-sv2/Dockerfile.j2
index 9d8c068064..93436e5782 100644
--- a/dockers/docker-snmp-sv2/Dockerfile.j2
+++ b/dockers/docker-snmp-sv2/Dockerfile.j2
@@ -1,6 +1,11 @@
 FROM docker-base
 
-COPY debs /debs
+COPY \
+{% for deb in docker_snmp_sv2_debs.split(' ') -%}
+debs/{{ deb }}{{' '}}
+{%- endfor -%}
+debs/
+
 COPY python-wheels /python-wheels
 
 # enable -O for all Python calls
diff --git a/dockers/docker-teamd/Dockerfile.j2 b/dockers/docker-teamd/Dockerfile.j2
index 3cbb500750..ad0d4cdfe5 100644
--- a/dockers/docker-teamd/Dockerfile.j2
+++ b/dockers/docker-teamd/Dockerfile.j2
@@ -2,7 +2,11 @@ FROM docker-base
 
 RUN apt-get update && apt-get install -f -y libdbus-1-3 libdaemon0 libjansson4
 
-COPY debs /debs
+COPY \
+{% for deb in docker_teamd_debs.split(' ') -%}
+debs/{{ deb }}{{' '}}
+{%- endfor -%}
+debs/
 
 RUN dpkg -i \
 {% for deb in docker_teamd_debs.split(' ') -%}
diff --git a/platform/broadcom/docker-syncd-brcm/Dockerfile.j2 b/platform/broadcom/docker-syncd-brcm/Dockerfile.j2
index 89204c03d9..0050cf9b1b 100755
--- a/platform/broadcom/docker-syncd-brcm/Dockerfile.j2
+++ b/platform/broadcom/docker-syncd-brcm/Dockerfile.j2
@@ -2,7 +2,11 @@ FROM docker-base
 
 RUN apt-get update
 
-COPY debs /debs
+COPY \
+{% for deb in docker_syncd_brcm_debs.split(' ') -%}
+debs/{{ deb }}{{' '}}
+{%- endfor -%}
+debs/
 
 RUN dpkg -i \
 {% for deb in docker_syncd_brcm_debs.split(' ') -%}
diff --git a/platform/cavium/docker-syncd-cavm/Dockerfile.j2 b/platform/cavium/docker-syncd-cavm/Dockerfile.j2
index 840399ac59..9c66649420 100755
--- a/platform/cavium/docker-syncd-cavm/Dockerfile.j2
+++ b/platform/cavium/docker-syncd-cavm/Dockerfile.j2
@@ -2,7 +2,11 @@ FROM docker-base
 
 RUN apt-get update
 
-COPY debs /debs
+COPY \
+{% for deb in docker_syncd_cavm_debs.split(' ') -%}
+debs/{{ deb }}{{' '}}
+{%- endfor -%}
+debs/
 
 RUN apt-get -y install libpcap-dev libxml2-dev python-dev swig libsensors4-dev libjemalloc1
 
diff --git a/platform/mellanox/docker-syncd-mlnx/Dockerfile.j2 b/platform/mellanox/docker-syncd-mlnx/Dockerfile.j2
index b5a58b0a05..d296ab4e82 100755
--- a/platform/mellanox/docker-syncd-mlnx/Dockerfile.j2
+++ b/platform/mellanox/docker-syncd-mlnx/Dockerfile.j2
@@ -2,7 +2,11 @@ FROM docker-base
 
 RUN apt-get update
 
-COPY debs /debs
+COPY \
+{% for deb in docker_syncd_mlnx_debs.split(' ') -%}
+debs/{{ deb }}{{' '}}
+{%- endfor -%}
+debs/
 
 RUN apt-get install -y libxml2
 
diff --git a/platform/p4/docker-sonic-p4/Dockerfile.j2 b/platform/p4/docker-sonic-p4/Dockerfile.j2
index 3cf775ea97..f285f8f075 100644
--- a/platform/p4/docker-sonic-p4/Dockerfile.j2
+++ b/platform/p4/docker-sonic-p4/Dockerfile.j2
@@ -4,7 +4,11 @@ RUN apt-get update
 
 RUN apt-get install -y net-tools ethtool tcpdump ifupdown bridge-utils python-ply libqt5core5a libqt5network5 libboost-program-options1.55.0 libboost-system1.55.0 libboost-thread1.55.0 libgmp10 libjudydebian1 libnanomsg0 libdaemon0 libjansson4 libjemalloc1
 
-COPY debs /debs
+COPY \
+{% for deb in docker_sonic_p4_debs.split(' ') -%}
+debs/{{ deb }}{{' '}}
+{%- endfor -%}
+debs/
 
 RUN dpkg -i \
 {% for deb in docker_sonic_p4_debs.split(' ') -%}