diff --git a/roles/client/tasks/main.yml b/roles/client/tasks/main.yml
index 3c47058..f34ce98 100644
--- a/roles/client/tasks/main.yml
+++ b/roles/client/tasks/main.yml
@@ -63,7 +63,9 @@
 
 - name: Add machine as innernet peer
   tags: [peers]
-  include_tasks: add_peer_server.yml
+  include_role:
+    name: server
+    tasks_from: add_peer
   args:
     apply:
       tags: [peers]
diff --git a/roles/client/tasks/add_peer_server.yml b/roles/server/tasks/add_peer.yml
similarity index 100%
rename from roles/client/tasks/add_peer_server.yml
rename to roles/server/tasks/add_peer.yml
diff --git a/roles/server/tasks/main.yml b/roles/server/tasks/main.yml
index 01b8e38..a37a50e 100644
--- a/roles/server/tasks/main.yml
+++ b/roles/server/tasks/main.yml
@@ -84,9 +84,7 @@
 
 - name: Add manually defined peers
   tags: [peers]
-  include_role:
-    name: client
-    tasks_from: add_peer_server
+  include_tasks: add_peer.yml
   args:
     apply:
       tags: [peers]