diff --git a/Dockerfile b/Dockerfile
index b1ae5d5..d9a73e9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,7 +18,7 @@ ENV VERSION_PATH=$VERSION_PATH
 USER $USER
 WORKDIR $WORKDIR
 
-ADD keys/*.asc /builder/keys/
+ADD --chown=buildbot:buildbot keys/*.asc /builder/keys/
 COPY --chmod=0755 setup.sh /builder/setup.sh
 
 ARG RUN_SETUP=0
diff --git a/Dockerfile.rootfs b/Dockerfile.rootfs
index 1157520..64807a6 100644
--- a/Dockerfile.rootfs
+++ b/Dockerfile.rootfs
@@ -13,7 +13,7 @@ ENV VERSION_PATH=$VERSION_PATH
 USER root
 WORKDIR /builder/rootfs
 
-ADD keys/*.asc /builder/keys/
+ADD --chown=buildbot:buildbot keys/*.asc /builder/keys/
 COPY --chmod=0755 setup.sh /builder/setup.sh
 
 RUN /builder/setup.sh
diff --git a/setup.sh b/setup.sh
index 45d8e65..ab4bbbf 100644
--- a/setup.sh
+++ b/setup.sh
@@ -10,7 +10,7 @@ DOWNLOAD_PATH="$VERSION_PATH/targets/$TARGET"
 wget "$UPSTREAM_URL/$DOWNLOAD_PATH/sha256sums" -O sha256sums
 wget "$UPSTREAM_URL/$DOWNLOAD_PATH/sha256sums.asc" -O sha256sums.asc
 
-cat /builder/keys/*.asc | gpg --import && rm -rf /builder/keys/
+gpg --import /builder/keys/*.asc && rm -rf /builder/keys/
 gpg --with-fingerprint --verify sha256sums.asc sha256sums
 
 # determine archive name