diff --git a/group_vars/all.yml b/group_vars/all.yml
index 9c6cea23..e27554e2 100644
--- a/group_vars/all.yml
+++ b/group_vars/all.yml
@@ -24,7 +24,6 @@ tautulli_enabled: false
 
 # Media Sourcing
 sonarr_enabled: false         # tv
-couchpotato_enabled: false
 
 get_iplayer_enabled: false
 jackett_enabled: false
@@ -337,17 +336,6 @@ youtubedlmaterial_dl_video_directory: "{{ downloads_root }}/youtube/video"
 youtubedlmaterial_dl_subscriptions_directory: "{{ downloads_root }}/youtube/subscriptions"
 youtubedlmaterial_port_http: "8998"
 
-###
-### Couchpotato
-###
-couchpotato_available_externally: "false"
-couchpotato_config_directory: "{{ docker_home }}/couchpotato/config"
-couchpotato_movies_directory: "{{ movies_root }}"
-couchpotato_downloads_directory: "{{ downloads_root }}"
-couchpotato_torrents_directory: "{{ torrents_root }}"
-couchpotato_user_id: "0"
-couchpotato_group_id: "0"
-couchpotato_port: "5050"
 
 ###
 ### OpenVPN
diff --git a/nas.yml b/nas.yml
index 72c2efbd..eb6bac37 100644
--- a/nas.yml
+++ b/nas.yml
@@ -63,6 +63,11 @@
         - cloudflare_ddns
       when: (cloudflare_ddns_enabled | default(False))
 
+    - role: couchpotato
+      tags:
+        - couchpotato
+      when: (couchpotato_enabled | default(False))
+
     - role: duplicati
       tags:
         - duplicati
diff --git a/roles/couchpotato/defaults/main.yml b/roles/couchpotato/defaults/main.yml
new file mode 100644
index 00000000..7644aba1
--- /dev/null
+++ b/roles/couchpotato/defaults/main.yml
@@ -0,0 +1,16 @@
+---
+couchpotato_enabled: false
+couchpotato_available_externally: "false"
+
+# directories
+couchpotato_config_directory: "{{ docker_home }}/couchpotato/config"
+couchpotato_movies_directory: "{{ movies_root }}"
+couchpotato_downloads_directory: "{{ downloads_root }}"
+couchpotato_torrents_directory: "{{ torrents_root }}"
+
+# uid / gid
+couchpotato_user_id: "0"
+couchpotato_group_id: "0"
+
+# network
+couchpotato_port: "5050"
\ No newline at end of file
diff --git a/tasks/couchpotato.yml b/roles/couchpotato/tasks/main.yml
similarity index 100%
rename from tasks/couchpotato.yml
rename to roles/couchpotato/tasks/main.yml