diff --git a/meta/main.yml b/meta/main.yml
index 8acf826d168a41270f51d04778390c3e31992112..f2d44cf4bcd473698c58abe38f885a6570033016 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -5,14 +5,14 @@ galaxy_info:
   company: "PARAGON Executive Services GmbH"
   min_ansible_version: 1.5
   platforms:
-   - name: Ubuntu
-     versions:
-      - precise
-      - quantal
-      - raring
-      - saucy
-      - trusty
+    - name: Ubuntu
+      versions:
+        - precise
+        - quantal
+        - raring
+        - saucy
+        - trusty
   categories:
-   - monitoring
+    - monitoring
 
 dependencies: []
diff --git a/tasks/main.yml b/tasks/main.yml
index cef1b35b6c594e03071e7c11d34015ec180962c5..e10ca338a18cb9b52b4cadad52ad6a499910eb75 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -9,7 +9,7 @@
 
 - block:
 
-  - import_tasks: serverdensity.yml
-    when: sd_api_token != ''
+    - import_tasks: serverdensity.yml
+      when: sd_api_token != ''
 
   when: not excluded_roles or "serverdensity" not in excluded_roles
diff --git a/tasks/serverdensity.yml b/tasks/serverdensity.yml
index 5c02d2cdad1ff2f0f667d2671b38529133ceb34c..79b7e7f833315ec6e732572bc945e1ca9a2a2401 100644
--- a/tasks/serverdensity.yml
+++ b/tasks/serverdensity.yml
@@ -5,11 +5,12 @@
   when: sd_uninstallv1
 
 - name: Init SD plugin
-  local_action: serverdensity
+  serverdensity:
     api_token: '{{ sd_api_token }}'
     cleanup: '{{ sd_alert_cleanup }}'
     force: '{{ sd_force_update }}'
     cache: '{{ sd_api_cache_file }}'
+  delegate_to: localhost
   when: sd_update_remote
 
 - name: Install Public Repo Key