diff --git a/test/Makefile b/test/Makefile
index e261386a..b1680a90 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -10,3 +10,7 @@ run:
 		--name homelab \
 		release:20.10
 	multipass shell homelab
+
+clean:
+	multipass delete homelab
+	multipass purge
diff --git a/test/multipass-cloud-init.yaml b/test/multipass-cloud-init.yaml
index 3c840119..faadbbf0 100644
--- a/test/multipass-cloud-init.yaml
+++ b/test/multipass-cloud-init.yaml
@@ -4,4 +4,12 @@ runcmd:
   - snap install --classic kubectl terraform
   - snap install lxd terraform
   - snap install kubectl --classic
-  - snap install terraform --classic
+  - curl -fsSL https://apt.releases.hashicorp.com/gpg | sudo apt-key add -
+  - apt-add-repository "deb [arch=$(dpkg --print-architecture)] https://apt.releases.hashicorp.com $(lsb_release -cs) main"
+  - apt install terraform
+  - sudo apt-get update
+  - sudo apt-get install -y apt-transport-https
+  - curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | sudo apt-key add -
+  - echo "deb https://apt.kubernetes.io/ kubernetes-xenial main" | sudo tee -a /etc/apt/sources.list.d/kubernetes.list
+  - sudo apt-get update
+  - sudo apt-get install -y kubectl