diff --git a/group_vars/all.yml b/group_vars/all.yml
index 81631cfc..f64d79a5 100644
--- a/group_vars/all.yml
+++ b/group_vars/all.yml
@@ -41,7 +41,6 @@ youtubedlmaterial_enabled: false
 mylar_enabled: false
 
 # Music
-airsonic_enabled: false
 mymediaforalexa_enabled: false
 
 # News
@@ -505,16 +504,6 @@ miniflux_admin_username: admin
 miniflux_admin_password: supersecure
 miniflux_port: "8070"
 
-###
-### Airsonic
-###
-airsonic_available_externally: "false"
-airsonic_data_directory: "{{ docker_home }}/airsonic"
-airsonic_music_directory: "{{ music_root }}"
-airsonic_podcasts_directory: "{{ podcasts_root }}"
-airsonic_port: "4040"
-
-
 ###
 ### CloudCmd
 ###
diff --git a/nas.yml b/nas.yml
index 4e3c620d..144a296c 100644
--- a/nas.yml
+++ b/nas.yml
@@ -43,6 +43,11 @@
     ###
     ### Applications
     ###
+    - role: airsonic
+      tags:
+        - airsonic
+      when: (airsonic_enabled | default(False))
+
     - role: emby
       tags:
         - emby
@@ -182,10 +187,6 @@
     when: (guacamole_enabled | default(False))
     tags: guacamole
 
-  - import_tasks: tasks/airsonic.yml
-    when: (airsonic_enabled | default(False))
-    tags: airsonic
-
   - import_tasks: tasks/cloudflare_ddns.yml
     when: (cloudflare_ddns_enabled | default(False))
     tags: cloudflare_ddns
diff --git a/roles/airsonic/defaults/main.yml b/roles/airsonic/defaults/main.yml
new file mode 100644
index 00000000..ce8786dc
--- /dev/null
+++ b/roles/airsonic/defaults/main.yml
@@ -0,0 +1,11 @@
+---
+airsonic_enabled: false
+airsonic_available_externally: "false"
+
+# directories
+airsonic_data_directory: "{{ docker_home }}/airsonic"
+airsonic_music_directory: "{{ music_root }}"
+airsonic_podcasts_directory: "{{ podcasts_root }}"
+
+# network
+airsonic_port: "4040"
\ No newline at end of file
diff --git a/tasks/airsonic.yml b/roles/airsonic/tasks/main.yml
similarity index 100%
rename from tasks/airsonic.yml
rename to roles/airsonic/tasks/main.yml