diff --git a/Vagrantfile b/Vagrantfile
index 09af375..444d79c 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -42,7 +42,14 @@ boxes = [
     :box => "bento/debian-9",
     :ip => '10.0.0.16',
     :cpu => "50",
-    :ram => "512"
+    :ram => "256"
+  },
+  {
+    :name => "archlinux",
+    :box => "archlinux/archlinux",
+    :ip => '10.0.0.17',
+    :cpu => "50",
+    :ram => "256"
   },
 ]
 
@@ -50,6 +57,8 @@ role = File.basename(File.expand_path(File.dirname(__FILE__)))
 
 Vagrant.configure("2") do |config|
   boxes.each do |box|
+    # If archlinux gives an error with Linux 4.16 Virtualbox guest driver, disable synced folder
+    #config.vm.synced_folder '.', '/vagrant', disabled: true
     config.vm.define box[:name] do |vms|
       vms.vm.box = box[:box]
       vms.vm.hostname = "#{role}-#{box[:name]}"
diff --git a/meta/main.yml b/meta/main.yml
index 5d9ab94..53f398a 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -13,6 +13,9 @@ galaxy_info:
     - trusty
     - xenial
     # - bionic
+  - name: ArchLinux
+    versions:
+    - any
   tags:
   - mail
   - system
diff --git a/tasks/main.yml b/tasks/main.yml
index 16170f1..c1b195e 100755
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -20,7 +20,9 @@
     - sendmail*
   tags:
     - mail
-  when: msmtp_remove_mtas
+  when:
+    - msmtp_remove_mtas
+    - ansible_os_family == "Debian"
 
 - name: Install msmtp and mailx on Debian.
   apt: