diff --git a/piframefleet/root/etc/cont-init.d/30-config b/piframefleet/root/etc/cont-init.d/30-config
index bedbc23..cca0e8c 100755
--- a/piframefleet/root/etc/cont-init.d/30-config
+++ b/piframefleet/root/etc/cont-init.d/30-config
@@ -13,6 +13,12 @@ fi
 if [ ! -d "/opt/ansible" ] ; then
   mkdir /opt/ansible
 fi
+if [ ! -d "/opt/ansible/.git" ] ; then
+  git clone https://git.kemonine.info/PiFrame/ansible.git /opt/ansible/
+else
+  cd /opt/ansible
+  git pull
+fi
 if [ ! -f "/opt/ansible/ssh.key" ] ; then
   ssh-keygen -t rsa -b 4096 -f /opt/ansible/ssh.key -N ''
   echo "
@@ -22,12 +28,6 @@ cat /opt/ansible/ssh.key.pub
 echo "-------------------------------------
 "
 fi
-if [ ! -d "/opt/ansible/.git" ] ; then
-  git clone https://git.kemonine.info/PiFrame/ansible.git /opt/ansible/
-else
-  cd /opt/ansible
-  git pull
-fi
 
 ####################
 # WireGuard
diff --git a/piframefleet_run.sh b/piframefleet_run.sh
index f0de8dd..8162457 100755
--- a/piframefleet_run.sh
+++ b/piframefleet_run.sh
@@ -23,7 +23,7 @@ sudo docker run -it \
     -v /lib/modules:/lib/modules:ro \
     -v /var/piframefleet/syncthing:/opt/syncthing \
     -v /var/piframefleet/filebrowser:/opt/filebrowser \
-    -v /var/piframefleet/wireguard:/var/wireguard \
+    -v /var/piframefleet/wireguard:/opt/wireguard \
     -v /var/piframefleet/ansible:/opt/ansible \
     -v /var/piframefleet/pictures:/opt/pictures \
     piframe/piframefleet:latest