diff --git a/playbook.yml b/playbook.yml
index a34236e..a35b5dd 100644
--- a/playbook.yml
+++ b/playbook.yml
@@ -35,7 +35,7 @@
     - { role: redshift, tags: ['redshift'] }
     - { role: rtorrent, tags: ['rtorrent'] }
     - { role: virtualbox, tags: ['virtualbox'] }
-    - { role: vagrant, tags: ['vagrant'] }
+    - { role: hashicorp, tags: ['hashicorp'] }
     - { role: yubikey, tags: ['yubikey'] }
     - { role: virtualenv, tags: ['virtualenv'] }
     - { role: backup, tags: ['backup'] }
diff --git a/roles/hashicorp/tasks/main.yml b/roles/hashicorp/tasks/main.yml
new file mode 100644
index 0000000..45bc786
--- /dev/null
+++ b/roles/hashicorp/tasks/main.yml
@@ -0,0 +1,12 @@
+---
+- name: Install vagrant
+  pacman: name=vagrant state=present
+
+- name: Install terraform, consul, and vault
+  aur: name={{ item }} user={{ user.name }}
+  with_items:
+    - terraform-bin
+    - consul
+    - vault-bin
+  tags:
+    - aur
diff --git a/roles/vagrant/tasks/main.yml b/roles/vagrant/tasks/main.yml
deleted file mode 100644
index 4c5acfa..0000000
--- a/roles/vagrant/tasks/main.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-- name: Install vagrant
-  pacman: name=vagrant state=present