diff --git a/Dockerfile b/Dockerfile
index 6f8b434..13f1d26 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,9 @@
 #build linux binary first
-FROM newrelic/infrastructure
+FROM newrelic/infrastructure:1.5.0
+ENV NRIA_IS_FORWARD_ONLY true
 
 COPY configs/nri-docker-config.yml /etc/newrelic-infra/integrations.d/
 COPY configs/nri-docker-def-linux.yml /var/db/newrelic-infra/custom-integrations/
 
 #update binary path if required
-COPY ./bin/linuxnri-docker /var/db/newrelic-infra/custom-integrations/
\ No newline at end of file
+COPY ./bin/linux/nri-docker /var/db/newrelic-infra/custom-integrations/
\ No newline at end of file
diff --git a/build/package/create-tar.sh b/build/package/create-tar.sh
index 8d39a6f..7ea9777 100755
--- a/build/package/create-tar.sh
+++ b/build/package/create-tar.sh
@@ -13,11 +13,11 @@ mkdir -p ${BUILD_DIR}
 
 cp ./bin/${OS}/* ${BUILD_DIR}/
 cp ./README.md ${BUILD_DIR}/
-cp ./Dockerfile ${BUILD_DIR}/
 [ -f "./scripts/install_${OS}.sh" ] && cp ./scripts/install_${OS}.sh ${BUILD_DIR}/
 [ -f "./scripts/install_${OS}.bat" ] && cp ./scripts/install_${OS}.bat ${BUILD_DIR}/
 cp ./configs/nri-docker-config.yml ${BUILD_DIR}/
 cp ./configs/nri-docker-def-${OS}.yml ${BUILD_DIR}/${COMMAND}-definition.yml
+cp ./configs/Dockerfile-${OS} ${BUILD_DIR}/Dockerfile
 
 # Create the gzip
 tar -C ${TEMPDIR} -czf ${OUTPUT_NAME}.tar.gz ${OUTPUT_NAME}/
diff --git a/configs/Dockerfile-linux b/configs/Dockerfile-linux
new file mode 100644
index 0000000..5bb5c0a
--- /dev/null
+++ b/configs/Dockerfile-linux
@@ -0,0 +1,9 @@
+#build linux binary first
+FROM newrelic/infrastructure:1.5.0
+ENV NRIA_IS_FORWARD_ONLY true 
+
+COPY nri-docker-config.yml /etc/newrelic-infra/integrations.d/
+COPY nri-docker-def-linux.yml /var/db/newrelic-infra/custom-integrations/
+
+#update binary path if required
+COPY ./nri-docker /var/db/newrelic-infra/custom-integrations/
\ No newline at end of file