diff --git a/Dockerfile b/Dockerfile
index 40bc53b..ecdfd4d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -20,7 +20,7 @@ ENV DEBIAN_FRONTEND noninteractive
 
 # Add Aptly repository
 RUN echo "deb http://repo.aptly.info/ squeeze main" > /etc/apt/sources.list.d/aptly.list
-RUN apt-key adv --keyserver keys.gnupg.net --recv-keys E083A3782A194991
+RUN apt-key adv --keyserver keys.gnupg.net --recv-keys 9E3E53F19C7DE460
 
 # Add Nginx repository
 RUN echo "deb http://nginx.org/packages/ubuntu/ trusty nginx" > /etc/apt/sources.list.d/nginx.list
@@ -44,7 +44,7 @@ RUN apt-get -q update                  \
 COPY assets/aptly.conf /etc/aptly.conf
 
 # Enable Aptly Bash completions
-RUN wget https://github.com/aptly-dev/aptly-bash-completion/raw/master/aptly \
+RUN wget https://github.com/smira/aptly/raw/master/bash_completion.d/aptly \
   -O /etc/bash_completion.d/aptly \
   && echo "if ! shopt -oq posix; then\n\
   if [ -f /usr/share/bash-completion/bash_completion ]; then\n\
diff --git a/assets/update_mirror.sh b/assets/update_mirror.sh
index accdc45..f05052d 100755
--- a/assets/update_mirror.sh
+++ b/assets/update_mirror.sh
@@ -48,8 +48,6 @@ done
 
 echo ${SNAPSHOTARRAY[@]}
 
-#### I STOPPED HERE
-
 # Merge snapshots into a single snapshot with updates applied
 echo "Merging snapshots into one.." 
 aptly snapshot merge -latest                 \
@@ -76,5 +74,4 @@ if [[ ! -f /opt/aptly/public/aptly_repo_signing.key ]]; then
 fi
 
 # Generate Aptly Graph
-aptly graph
-cp `ls -rt /tmp/aptly-graph*.png | tail -n1` /opt/aptly/public/aptly_graph.png
+aptly graph -output /opt/aptly/public/aptly_graph.png