diff --git a/Dockerfile b/Dockerfile
index e5f49b8..a5ec859 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -63,6 +63,7 @@ ENV HOSTNAME ${HOSTNAME}
 ENV MODE ${MODE}
 
 COPY assets/packages /opt/packages
+COPY assets/gpg/* /opt/aptly/
 
 RUN /opt/startup.sh
 
diff --git a/assets/gpg/.empty b/assets/gpg/.empty
new file mode 100644
index 0000000..e69de29
diff --git a/assets/startup.sh b/assets/startup.sh
index 8752c0e..fe2543f 100755
--- a/assets/startup.sh
+++ b/assets/startup.sh
@@ -16,7 +16,6 @@ if [[ ! -f /opt/aptly/aptly.sec ]] || [[ ! -f /opt/aptly/aptly.pub ]]; then
   echo "Generating new gpg keys"
   cp -a /dev/urandom /dev/random
   /opt/gpg_batch.sh
-  mkdir -p /opt/aptly
   # If your system doesn't have a lot of entropy this may, take a long time
   # Google how-to create "artificial" entropy if this gets stuck
   gpg -v --batch --gen-key /opt/gpg_batch