diff --git a/packer.json.atlas b/packer.atlas.json
similarity index 89%
rename from packer.json.atlas
rename to packer.atlas.json
index e8cfa5b..9db5443 100644
--- a/packer.json.atlas
+++ b/packer.atlas.json
@@ -5,6 +5,18 @@
     "atlas_token": ""
   },
   "provisioners": [
+    {
+      "type": "shell-local",
+      "command": "sudo apt-get update -qq"
+    },
+    {
+      "type": "shell-local",
+      "command": "sudo apt-get install -y ansible git-core"
+    },
+    {
+      "type": "shell-local",
+      "command": "git submodule init ansible"
+    },
     { "type": "shell",
       "inline": [
         "install -m0700 -o {{user `user`}} -g {{user `user`}} -d /home/{{user `user`}}/.ssh",
@@ -102,8 +114,12 @@
         "created_at": "{{timestamp}}",
         "description": "A Vagrant image for Mastodon development",
         "provider": "virtualbox-iso",
-        "version": "{{isotime \"20060102T15_04_05\"}}"
+        "version": "{{isotime \"20060102T15_04_05\"}}.0"
       }
     }
-  ]
+  ],
+  "push": {
+    "name": "mastodon/ubuntu-xenial64",
+    "vcs": true
+  }
 }
diff --git a/packer.json b/packer.json
index ec60a09..c1091b2 100644
--- a/packer.json
+++ b/packer.json
@@ -15,6 +15,7 @@
       "inline": [
         "mount -o loop ${HOME}/VBoxGuestAdditions.iso /mnt",
         "/mnt/VBoxLinuxAdditions.run install",
+        "ln -sf /usr/lib/VBoxGuestAdditions/mount.vboxsf /sbin/mount.vboxsf",
         "umount /mnt",
         "rm ${HOME}/VBoxGuestAdditions.iso"
       ]
@@ -52,13 +53,13 @@
         " console-setup/layoutcode=us ",
         " console-setup/modelcode=pc105 ",
         " debconf/frontend=noninteractive ",
-        " debian-installer=en_US ",
+        " debian-installer=en_US.UTF-8 ",
         " fb=false ",
         " initrd=/install/initrd.gz ",
         " kbd-chooser/method=us ",
         " keyboard-configuration/layout=USA ",
         " keyboard-configuration/variant=USA ",
-        " locale=en_US ",
+        " locale=en_US.UTF-8 ",
         " netcfg/get_domain=vm ",
         " netcfg/get_hostname=vagrant ",
         " grub-installer/bootdev=/dev/sda ",
diff --git a/preseeds/preseed.cfg b/preseeds/preseed.cfg
index 09f1e4b..681f8e0 100644
--- a/preseeds/preseed.cfg
+++ b/preseeds/preseed.cfg
@@ -26,7 +26,7 @@ tasksel tasksel/first multiselect standard, ubuntu-server
 d-i console-setup/ask_detect boolean false
 d-i keyboard-configuration/layoutcode string us
 d-i keyboard-configuration/modelcode string pc105
-d-i debian-installer/locale string en_US
+d-i debian-installer/locale string en_US.UTF-8
 
 # Set the root password
 d-i passwd/root-login boolean true