diff --git a/ansible/deploy-controller.sh b/ansible/deploy-controller.sh
index f28ea41..6c25322 100644
--- a/ansible/deploy-controller.sh
+++ b/ansible/deploy-controller.sh
@@ -3,4 +3,4 @@
 # https://www.tauceti.blog/post/kubernetes-the-not-so-hard-way-with-ansible-wireguard/
 # https://github.com/githubixx/ansible-role-wireguard
 
-ansible-playbook -i inventory-wireguard --skip-tags wg-install ./playbook-deploy-controller.yml
+ansible-playbook -i inventory-wireguard --skip-tags wg-install,bare-metal ./playbook-deploy-controller.yml
diff --git a/ansible/playbook-deploy-controller.yml b/ansible/playbook-deploy-controller.yml
index 0a7ef42..3e2a12b 100644
--- a/ansible/playbook-deploy-controller.yml
+++ b/ansible/playbook-deploy-controller.yml
@@ -1,4 +1,4 @@
 ---
 - hosts: controller
   roles:
-    - githubixx.ansible_role_wireguard
+    - wireguard
diff --git a/piframefleet/Dockerfile b/piframefleet/Dockerfile
index 9765305..9321fa0 100644
--- a/piframefleet/Dockerfile
+++ b/piframefleet/Dockerfile
@@ -42,7 +42,6 @@ RUN apt update && apt upgrade -y && \
   curl -fsSL https://filebrowser.org/get.sh | bash && \
   echo "**** ansible ****" && \
   apt install -y python3-apt ansible ansible-lint ansible-doc && \
-  ansible-galaxy install githubixx.ansible_role_wireguard && \
   echo "**** cleanup ****" && \
   rm /opt/arch_detect.sh
   rm /opt/s6-overlay.tar.gz && \
@@ -54,6 +53,9 @@ RUN apt update && apt upgrade -y && \
 # Copy the s6 related 'stuff' to the container
 ADD /piframefleet/root/ /
 
+# Ansible related 'stuff'
+VOLUME /opt/ansible
+
 # Wireguard related 'stuff'
 ENV ENABLE_WIREGUARD=false
 EXPOSE 51820/udp
diff --git a/piframefleet/root/etc/cont-init.d/30-config b/piframefleet/root/etc/cont-init.d/30-config
index b5d3b5f..16f6662 100755
--- a/piframefleet/root/etc/cont-init.d/30-config
+++ b/piframefleet/root/etc/cont-init.d/30-config
@@ -7,6 +7,17 @@ if [ ! -d "/opt/pictures" ] ; then
   mkdir /opt/pictures
 fi
 
+####################
+# Ansible
+####################
+if [ ! -d "/opt/ansible" ] ; then
+  mkdir /opt/ansible
+fi
+if [ ! -d "/opt/ansible/roles" ] ; then
+  mkdir /opt/ansible/roles
+fi
+git clone https://git.kemonine.info/kemonine/ansible-role-wireguard.git /opt/ansible/roles/wireguard
+
 ####################
 # WireGuard
 ####################
diff --git a/piframefleet_run.sh b/piframefleet_run.sh
index 23a7cae..a690f1a 100755
--- a/piframefleet_run.sh
+++ b/piframefleet_run.sh
@@ -23,5 +23,6 @@ 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/ansible:/opt/ansible \
     -v /var/piframefleet/pictures:/opt/pictures \
     piframe/piframefleet:latest