diff --git a/collector/Dockerfile b/collector/Dockerfile
index 3c2c317..90f2739 100644
--- a/collector/Dockerfile
+++ b/collector/Dockerfile
@@ -1,3 +1,4 @@
+# syntax=docker/dockerfile:1.3
 # Collector: openbmp/collector
 #
 #  Copyright (c) 2021-2022 Cisco Systems, Inc. and Tim Evens.  All rights reserved.
@@ -13,9 +14,12 @@
 #   Change directories to obmp-docker/collector and run the below from that
 #   directory.
 #
+# Use buildkit - either via export DOCKER_BUILDKIT=1 or by using buildx cli
+#
 #   Example docker build:
-#     tar -cL -C ../../ ./obmp-collector ./obmp-docker/collector \
-#           | docker build --platform linux/amd64 --build-arg VERSION=dev-2.1.0 \
+#     tar -c -C ../../ ./obmp-collector ./obmp-docker/collector \
+#           | docker buildx build --progress=plain \
+#                 --build-arg VERSION=dev-2.1.0 \
 #                 -f obmp-docker/collector/Dockerfile -t openbmp/collector:dev-2.1.0 -
 #
 
@@ -40,13 +44,13 @@ RUN rm -rf build && mkdir -p build && cd build \
 FROM debian:bullseye-slim
 
 # Add files.
-ADD obmp-docker/collector/scripts/install /tmp/
-ADD obmp-docker/collector/scripts/run /usr/sbin/
+ADD --chmod=755 obmp-docker/collector/scripts/install /tmp/
+ADD --chmod=755 obmp-docker/collector/scripts/run /usr/sbin/
 
 ARG VERSION=0
 
 # Copy files from previous stages
-COPY --from=build /usr/bin/openbmpd /usr/bin/
+COPY --chmod=755 --from=build /usr/bin/openbmpd /usr/bin/
 COPY --from=build /usr/etc/openbmp/openbmpd.conf /usr/etc/openbmp/openbmpd.conf
 COPY --from=build /etc/init/openbmpd.conf /etc/init/openbmpd.conf
 COPY --from=build /etc/default/openbmpd.new /etc/default/openbmpd
diff --git a/dev-image/Dockerfile b/dev-image/Dockerfile
index c69ecd4..ff8f674 100644
--- a/dev-image/Dockerfile
+++ b/dev-image/Dockerfile
@@ -7,8 +7,7 @@
 #
 # Author: Tim Evens <tim@openbmp.org>
 #
-# BUILD: docker build --platform linux/amd64 -t openbmp/dev-image .
-#        docker tag openbmp/dev-image openbmp/dev-image:latest
+# BUILD: docker buildx build --progress=plain -t openbmp/dev-image:latest .
 
 FROM debian:bullseye-slim AS build
 
diff --git a/psql-app/Dockerfile b/psql-app/Dockerfile
index e360398..13f815b 100644
--- a/psql-app/Dockerfile
+++ b/psql-app/Dockerfile
@@ -1,3 +1,4 @@
+# syntax=docker/dockerfile:1.3
 # Postgres Backend: openbmp/psql-app
 #
 # Copyright (c) 2021-2022 Cisco Systems, Inc. and Tim Evens.  All rights reserved.
@@ -11,9 +12,12 @@
 #   Change directories to obmp-docker/psql-app and run the below from that
 #   directory.
 #
+# Use buildkit - either via export DOCKER_BUILDKIT=1 or by using buildx cli
+#
 #   Example docker build:
-#     tar -cL -C ../../ ./obmp-psql ./obmp-docker/psql-app ./obmp-java-api-message \
-#           | docker build --platform linux/amd64 --build-arg VERSION=dev-2.1.0 \
+#     tar -c -C ../../ ./obmp-psql ./obmp-docker/psql-app ./obmp-java-api-message \
+#           | docker buildx build --platform linux/amd64 --progress=plain \
+#                 --build-arg VERSION=dev-2.1.0 \
 #                 -f obmp-docker/psql-app/Dockerfile -t openbmp/psql-app:dev-2.1.0 -
 
 # -----------------------------------------------
@@ -45,13 +49,13 @@ FROM openjdk:17-slim
 # Copy files from previous stages
 COPY --from=build /ws/target/obmp-psql-consumer-0.1.0-SNAPSHOT.jar /usr/local/openbmp/obmp-psql-consumer.jar
 COPY --from=build /ws/database/  /usr/local/openbmp/database
-COPY --from=build /ws/cron_scripts/gen-whois/*.py /usr/local/openbmp/
-COPY --from=build /ws/cron_scripts/rpki/*.py /usr/local/openbmp/
-COPY --from=build /ws/scripts/dbip-to-psql.py /usr/local/openbmp/
+COPY  --chmod=755 --from=build /ws/cron_scripts/gen-whois/*.py /usr/local/openbmp/
+COPY  --chmod=755 --from=build /ws/cron_scripts/rpki/*.py /usr/local/openbmp/
+COPY  --chmod=755 --from=build /ws/scripts/dbip-to-psql.py /usr/local/openbmp/
 
 # Add files
-ADD obmp-docker/psql-app/scripts/run /usr/sbin/
-ADD obmp-docker/psql-app/scripts/upgrade_l3vpn.sh /usr/local/openbmp/upgrade_l3vpn.sh
+ADD  --chmod=755 obmp-docker/psql-app/scripts/run /usr/sbin/
+ADD  --chmod=755 obmp-docker/psql-app/scripts/upgrade_l3vpn.sh /usr/local/openbmp/upgrade_l3vpn.sh
 
 #----------------------------------
 # Define persistent data volumes
diff --git a/psql-app/scripts/run b/psql-app/scripts/run
index dfc0777..48cd5d0 100755
--- a/psql-app/scripts/run
+++ b/psql-app/scripts/run
@@ -165,6 +165,8 @@ MAILTO=""
 
 SETVAR
 
+}
+
 # -----------------------------------------------
 # Upgrade SQL
 # -----------------------------------------------