diff --git a/.gitignore b/.gitignore
index d485fdc..8d7d730 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 .terraform
 *.tfstate
 tests/inventory
+tests/test.retry
diff --git a/tasks/main.yml b/tasks/main.yml
index 5731904..ffe50a1 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -9,3 +9,4 @@
   - import_tasks: ../tasks/tools/nodejs.yml
   - import_tasks: ../tasks/filesystem.yml
   - import_tasks: ../tasks/smoke-test.yml
+  - import_tasks: ../tasks/tools/waypoint.yml
diff --git a/tasks/tools/waypoint.yml b/tasks/tools/waypoint.yml
new file mode 100644
index 0000000..d299575
--- /dev/null
+++ b/tasks/tools/waypoint.yml
@@ -0,0 +1,14 @@
+---
+
+- name: Add Hashicorp GPG apt Key
+  apt_key:
+    url: https://apt.releases.hashicorp.com/gpg
+    state: present
+
+- name: Add Hashicorp Repository
+  apt_repository:
+    repo: deb [arch=amd64] https://apt.releases.hashicorp.com bionic main
+    state: present
+
+- name: Update apt and install Waypoint
+  apt: update_cache=yes name=waypoint state=latest