diff --git a/tasks/main.yml b/tasks/main.yml
index 527b75414e85f7454afcb1208c39405abb33be81..462ef4a6a7e4858c2340baa915ce0a5a4613b42f 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -16,6 +16,8 @@
 
   - name: "Tunnel keys"
     include_tasks: tunnel_keys.yml
+    when: ssh_tunnel is defined
+    tags: 'Keys'
 
   - name: "User keys"
     include: user_keys.yml