diff --git a/Dockerfile b/Dockerfile
index 28f92b6..f8c5bd1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -144,7 +144,8 @@ ADD https://github.com/nelenkov/android-backup-extractor/releases/download/maste
 RUN echo 'alias abe="java -jar /opt/abe/abe.jar"' >> ~/.bashrc
 
 # Generate adb key folder
-RUN mkdir /root/.android && adb keygen /root/.android/adbkey
+RUN echo 'if [ ! -f /root/.android/adbkey ]; then adb keygen /root/.android/adbkey 2&>1 > /dev/null; fi' >> ~/.bashrc
+RUN mkdir /root/.android
 
 # Setup investigations environment
 RUN mkdir /home/cases
diff --git a/Dockerfile.android b/Dockerfile.android
index acf776a..4d2f0c1 100644
--- a/Dockerfile.android
+++ b/Dockerfile.android
@@ -28,6 +28,7 @@ ADD https://github.com/nelenkov/android-backup-extractor/releases/download/maste
 RUN echo 'alias abe="java -jar /opt/abe/abe.jar"' >> ~/.bashrc
 
 # Generate adb key folder
-RUN mkdir /root/.android && adb keygen /root/.android/adbkey
+RUN echo 'if [ ! -f /root/.android/adbkey ]; then adb keygen /root/.android/adbkey 2&>1 > /dev/null; fi' >> ~/.bashrc
+RUN mkdir /root/.android
 
 ENTRYPOINT [ "/usr/local/bin/mvt-android" ]