diff --git a/deploy.yml b/deploy.yml
index 3f1277f583..819a38ec6c 100644
--- a/deploy.yml
+++ b/deploy.yml
@@ -9,7 +9,7 @@
   vars:
     dynamic_user: false
   roles:
-    - { role: remote-user, tags: [remote-user, always] }
+    - { role: connection, tags: [connection, always] }
 
 - name: Deploy WP site
   hosts: web:&{{ env }}
diff --git a/roles/remote-user/tasks/main.yml b/roles/connection/tasks/main.yml
similarity index 100%
rename from roles/remote-user/tasks/main.yml
rename to roles/connection/tasks/main.yml
diff --git a/rollback.yml b/rollback.yml
index f7d35c2d14..a74b318f0e 100644
--- a/rollback.yml
+++ b/rollback.yml
@@ -9,7 +9,7 @@
   vars:
     dynamic_user: false
   roles:
-    - { role: remote-user, tags: [remote-user, always] }
+    - { role: connection, tags: [connection, always] }
 
 - name: Rollback a Deploy
   hosts: web:&{{ env }}
diff --git a/server.yml b/server.yml
index d7dfe43a40..ec5df22001 100644
--- a/server.yml
+++ b/server.yml
@@ -7,7 +7,7 @@
   hosts: web:&{{ env }}
   gather_facts: false
   roles:
-    - { role: remote-user, tags: [remote-user, always] }
+    - { role: connection, tags: [connection, always] }
 
 - name: Install prerequisites
   hosts: web:&{{ env }}
diff --git a/xdebug-tunnel.yml b/xdebug-tunnel.yml
index 347d319773..7a0b3cd481 100644
--- a/xdebug-tunnel.yml
+++ b/xdebug-tunnel.yml
@@ -3,7 +3,7 @@
   hosts: "{{ xdebug_tunnel_inventory_host }}"
   gather_facts: false
   roles:
-    - { role: remote-user, tags: [remote-user, always] }
+    - { role: connection, tags: [connection, always] }
 
 - name: Enable or Disable Xdebug and SSH Tunnel
   hosts: "{{ xdebug_tunnel_inventory_host }}"