diff --git a/.gitignore b/.gitignore
index 8e7f814..7e0cbe1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -137,5 +137,5 @@ test_docs/sample-safe.pdf
share/bin
share/vm
share/container
-install/vm-builder/vm
-install/vm-builder/.vagrant
+vm-builder/vm
+vm-builder/.vagrant
diff --git a/BUILD.md b/BUILD.md
index edee536..63a3b30 100644
--- a/BUILD.md
+++ b/BUILD.md
@@ -54,6 +54,8 @@ Create a .rpm:
## macOS
+_Note for Apple Silicon users:_ Unfortunately the build process requires using a Mac with an Intel chip for now. Building the container image uses Vagrant, which requires VMs, and for now the M1 chip can only run M1 VMs, VirtualBox isn't supported, etc.
+
Ensure you have the git submodules checked out:
```
diff --git a/vm-builder/.vagrant/bundler/global.sol b/vm-builder/.vagrant/bundler/global.sol
deleted file mode 100644
index 6c80468..0000000
--- a/vm-builder/.vagrant/bundler/global.sol
+++ /dev/null
@@ -1 +0,0 @@
-{"dependencies":[["vagrant-vmware-desktop",["= 3.0.1"]]],"checksum":"0ad00f1ec196455770fca952e89c309b84036297f2a9b4b560b24f477e0315e1","vagrant_version":"2.2.19"}
\ No newline at end of file
diff --git a/vm-builder/.vagrant/machines/default/vmware_desktop/1a6cd45d-9c66-466a-8102-8e7fbbe66804/generic-alpine314-vmware-cl1.vmdk b/vm-builder/.vagrant/machines/default/vmware_desktop/1a6cd45d-9c66-466a-8102-8e7fbbe66804/generic-alpine314-vmware-cl1.vmdk
deleted file mode 100644
index 278241c..0000000
Binary files a/vm-builder/.vagrant/machines/default/vmware_desktop/1a6cd45d-9c66-466a-8102-8e7fbbe66804/generic-alpine314-vmware-cl1.vmdk and /dev/null differ
diff --git a/vm-builder/.vagrant/machines/default/vmware_desktop/1a6cd45d-9c66-466a-8102-8e7fbbe66804/generic-alpine314-vmware.nvram b/vm-builder/.vagrant/machines/default/vmware_desktop/1a6cd45d-9c66-466a-8102-8e7fbbe66804/generic-alpine314-vmware.nvram
deleted file mode 100644
index 9aaad80..0000000
Binary files a/vm-builder/.vagrant/machines/default/vmware_desktop/1a6cd45d-9c66-466a-8102-8e7fbbe66804/generic-alpine314-vmware.nvram and /dev/null differ
diff --git a/vm-builder/.vagrant/machines/default/vmware_desktop/1a6cd45d-9c66-466a-8102-8e7fbbe66804/generic-alpine314-vmware.plist b/vm-builder/.vagrant/machines/default/vmware_desktop/1a6cd45d-9c66-466a-8102-8e7fbbe66804/generic-alpine314-vmware.plist
deleted file mode 100644
index 86eee6b..0000000
--- a/vm-builder/.vagrant/machines/default/vmware_desktop/1a6cd45d-9c66-466a-8102-8e7fbbe66804/generic-alpine314-vmware.plist
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
- disallowUpgrade
-
-
-
diff --git a/vm-builder/.vagrant/machines/default/vmware_desktop/1a6cd45d-9c66-466a-8102-8e7fbbe66804/generic-alpine314-vmware.vmsd b/vm-builder/.vagrant/machines/default/vmware_desktop/1a6cd45d-9c66-466a-8102-8e7fbbe66804/generic-alpine314-vmware.vmsd
deleted file mode 100644
index e624ed1..0000000
--- a/vm-builder/.vagrant/machines/default/vmware_desktop/1a6cd45d-9c66-466a-8102-8e7fbbe66804/generic-alpine314-vmware.vmsd
+++ /dev/null
@@ -1,5 +0,0 @@
-.encoding = "UTF-8"
-cloneOf0 = "/Users/user/.vagrant.d/boxes/generic-VAGRANTSLASH-alpine314/3.5.2/vmware_desktop/generic-alpine314-vmware.vmx"
-numCloneOf = "1"
-sentinel0 = "generic-alpine314-vmware-cl1.vmdk"
-numSentinels = "1"
diff --git a/vm-builder/.vagrant/machines/default/vmware_desktop/1a6cd45d-9c66-466a-8102-8e7fbbe66804/generic-alpine314-vmware.vmx b/vm-builder/.vagrant/machines/default/vmware_desktop/1a6cd45d-9c66-466a-8102-8e7fbbe66804/generic-alpine314-vmware.vmx
deleted file mode 100755
index ceb8a5f..0000000
--- a/vm-builder/.vagrant/machines/default/vmware_desktop/1a6cd45d-9c66-466a-8102-8e7fbbe66804/generic-alpine314-vmware.vmx
+++ /dev/null
@@ -1,106 +0,0 @@
-.encoding = "UTF-8"
-bios.bootorder = "hdd,cdrom"
-checkpoint.vmstate = ""
-cleanshutdown = "TRUE"
-config.version = "8"
-cpuid.corespersocket = "1"
-displayname = "vm-builder: default"
-ehci.pcislotnumber = "-1"
-ehci.present = "FALSE"
-ethernet0.addresstype = "generated"
-ethernet0.connectiontype = "nat"
-ethernet0.present = "TRUE"
-ethernet0.virtualdev = "e1000"
-extendedconfigfile = "generic-alpine314-vmware.vmxf"
-filesearchpath = ".;/Users/user/.vagrant.d/boxes/generic-VAGRANTSLASH-alpine314/3.5.2/vmware_desktop"
-floppy0.present = "FALSE"
-guestos = "otherlinux-64"
-gui.fullscreenatpoweron = "FALSE"
-gui.viewmodeatpoweron = "windowed"
-hgfs.linkrootshare = "TRUE"
-hgfs.maprootshare = "TRUE"
-ide0:0.clientdevice = "TRUE"
-ide0:0.devicetype = "cdrom-raw"
-ide0:0.filename = "auto detect"
-ide0:0.present = "TRUE"
-invmteam = "FALSE"
-isolation.tools.hgfs.disable = "FALSE"
-memsize = "2048"
-monitor.phys_bits_used = "42"
-msg.autoanswer = "true"
-numa.autosize.cookie = "20001"
-numa.autosize.vcpu.maxpervirtualnode = "2"
-numvcpus = "2"
-nvme0.present = "FALSE"
-nvram = "generic-alpine314-vmware.nvram"
-parallel0.autodetect = "FALSE"
-parallel0.bidirectional = ""
-parallel0.filename = ""
-parallel0.present = "FALSE"
-parallel0.startconnected = "FALSE"
-pcibridge0.pcislotnumber = "17"
-pcibridge0.present = "TRUE"
-pcibridge4.functions = "8"
-pcibridge4.pcislotnumber = "21"
-pcibridge4.present = "TRUE"
-pcibridge4.virtualdev = "pcieRootPort"
-pcibridge5.functions = "8"
-pcibridge5.pcislotnumber = "22"
-pcibridge5.present = "TRUE"
-pcibridge5.virtualdev = "pcieRootPort"
-pcibridge6.functions = "8"
-pcibridge6.pcislotnumber = "23"
-pcibridge6.present = "TRUE"
-pcibridge6.virtualdev = "pcieRootPort"
-pcibridge7.functions = "8"
-pcibridge7.pcislotnumber = "24"
-pcibridge7.present = "TRUE"
-pcibridge7.virtualdev = "pcieRootPort"
-policy.vm.mvmtid = ""
-powertype.poweroff = "hard"
-powertype.poweron = "hard"
-powertype.reset = "hard"
-powertype.suspend = "hard"
-proxyapps.publishtohost = "FALSE"
-remotedisplay.vnc.enabled = "FALSE"
-remotedisplay.vnc.ip = "127.0.0.1"
-remotedisplay.vnc.port = "5993"
-replay.filename = ""
-replay.supported = "FALSE"
-sata0.present = "FALSE"
-scsi0.pcislotnumber = "16"
-scsi0.present = "TRUE"
-scsi0.virtualdev = "lsilogic"
-scsi0:0.filename = "generic-alpine314-vmware-cl1.vmdk"
-scsi0:0.present = "TRUE"
-scsi0:0.redo = ""
-serial0.autodetect = "FALSE"
-serial0.filename = ""
-serial0.filetype = ""
-serial0.pipe.endpoint = ""
-serial0.present = "FALSE"
-serial0.startconnected = "FALSE"
-serial0.trynorxloss = ""
-serial0.yieldonmsrread = ""
-softpoweroff = "FALSE"
-sound.autodetect = "TRUE"
-sound.filename = "-1"
-sound.present = "FALSE"
-sound.startconnected = "FALSE"
-svga.guestbackedprimaryaware = "TRUE"
-svga.vramsize = "134217728"
-tools.synctime = "TRUE"
-tools.upgrade.policy = "upgradeAtPowerCycle"
-usb.pcislotnumber = "-1"
-usb.present = "FALSE"
-uuid.action = "create"
-uuid.bios = ""
-uuid.location = ""
-vc.uuid = ""
-virtualhw.productcompatibility = "hosted"
-virtualhw.version = "12"
-vmci0.id = "1861462631"
-vmci0.pcislotnumber = "35"
-vmci0.present = "TRUE"
-vmotion.checkpointfbsize = "134217728"
-vmotion.checkpointsvgaprimarysize = "134217728"
diff --git a/vm-builder/.vagrant/machines/default/vmware_desktop/1a6cd45d-9c66-466a-8102-8e7fbbe66804/generic-alpine314-vmware.vmxf b/vm-builder/.vagrant/machines/default/vmware_desktop/1a6cd45d-9c66-466a-8102-8e7fbbe66804/generic-alpine314-vmware.vmxf
deleted file mode 100644
index db1765d..0000000
--- a/vm-builder/.vagrant/machines/default/vmware_desktop/1a6cd45d-9c66-466a-8102-8e7fbbe66804/generic-alpine314-vmware.vmxf
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-52 59 c0 38 41 3e 81 21-fb fe 13 82 cc 38 5e 9d
-generic-alpine314-vmware.vmx
diff --git a/vm-builder/.vagrant/machines/default/vmware_desktop/box_meta b/vm-builder/.vagrant/machines/default/vmware_desktop/box_meta
deleted file mode 100644
index ed10a2b..0000000
--- a/vm-builder/.vagrant/machines/default/vmware_desktop/box_meta
+++ /dev/null
@@ -1 +0,0 @@
-{"name":"generic/alpine314","version":"3.5.2","provider":"vmware_desktop","directory":"boxes/generic-VAGRANTSLASH-alpine314/3.5.2/vmware_desktop"}
\ No newline at end of file
diff --git a/vm-builder/.vagrant/machines/default/vmware_desktop/creator_uid b/vm-builder/.vagrant/machines/default/vmware_desktop/creator_uid
deleted file mode 100644
index 99f9f07..0000000
--- a/vm-builder/.vagrant/machines/default/vmware_desktop/creator_uid
+++ /dev/null
@@ -1 +0,0 @@
-502
\ No newline at end of file
diff --git a/vm-builder/.vagrant/machines/default/vmware_desktop/id b/vm-builder/.vagrant/machines/default/vmware_desktop/id
deleted file mode 100644
index bcc8d87..0000000
--- a/vm-builder/.vagrant/machines/default/vmware_desktop/id
+++ /dev/null
@@ -1 +0,0 @@
-/Users/user/code/dangerzone/install/vm-builder/.vagrant/machines/default/vmware_desktop/1a6cd45d-9c66-466a-8102-8e7fbbe66804/generic-alpine314-vmware.vmx
\ No newline at end of file
diff --git a/vm-builder/.vagrant/machines/default/vmware_desktop/index_uuid b/vm-builder/.vagrant/machines/default/vmware_desktop/index_uuid
deleted file mode 100644
index 132f8de..0000000
--- a/vm-builder/.vagrant/machines/default/vmware_desktop/index_uuid
+++ /dev/null
@@ -1 +0,0 @@
-8055cfc1c36c4fe0af1dc2f53d5369ae
\ No newline at end of file
diff --git a/vm-builder/.vagrant/machines/default/vmware_desktop/vagrant_cwd b/vm-builder/.vagrant/machines/default/vmware_desktop/vagrant_cwd
deleted file mode 100644
index 499ce03..0000000
--- a/vm-builder/.vagrant/machines/default/vmware_desktop/vagrant_cwd
+++ /dev/null
@@ -1 +0,0 @@
-/Users/user/code/dangerzone/install/vm-builder
\ No newline at end of file
diff --git a/vm-builder/.vagrant/rgloader/loader.rb b/vm-builder/.vagrant/rgloader/loader.rb
deleted file mode 100644
index c3c05b0..0000000
--- a/vm-builder/.vagrant/rgloader/loader.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# This file loads the proper rgloader/loader.rb file that comes packaged
-# with Vagrant so that encoded files can properly run with Vagrant.
-
-if ENV["VAGRANT_INSTALLER_EMBEDDED_DIR"]
- require File.expand_path(
- "rgloader/loader", ENV["VAGRANT_INSTALLER_EMBEDDED_DIR"])
-else
- raise "Encoded files can't be read outside of the Vagrant installer."
-end
diff --git a/vm-builder/Vagrantfile b/vm-builder/Vagrantfile
index 8c96f4d..294703d 100644
--- a/vm-builder/Vagrantfile
+++ b/vm-builder/Vagrantfile
@@ -3,7 +3,7 @@
Vagrant.configure("2") do |config|
config.vm.box = "generic/alpine314"
- config.vm.synced_folder "../../dangerzone-converter", "/opt/dangerzone-converter"
+ config.vm.synced_folder "../dangerzone-converter", "/opt/dangerzone-converter"
config.vm.synced_folder ".", "/vagrant"
config.vm.provision "shell", inline: <<-SHELL
apk update