diff --git a/main.yml b/main.yml
index 00d43b0..1e0b18b 100644
--- a/main.yml
+++ b/main.yml
@@ -39,3 +39,6 @@
 
 - name: Pottwal specific setup
   import_playbook: pottwal.yml
+
+- name: Unifi specific setup
+  import_playbook: unifi.yml
diff --git a/roles/unifi-controller-docker/tasks/main.yml b/roles/unifi-controller-docker/tasks/main.yml
deleted file mode 100644
index 555370f..0000000
--- a/roles/unifi-controller-docker/tasks/main.yml
+++ /dev/null
@@ -1,27 +0,0 @@
----
-- name: Install python docker package
-  apt:
-    name: python3-docker
-    state: present
-
-- name: Setup the docker container for unifi-controller
-  docker_container:
-    name: unifi-controller
-    image: "jacobalberty/unifi:v6.5.55"
-    state: started
-    restart_policy: unless-stopped
-    container_default_behavior: no_defaults
-    env:
-        TZ: "Europe/Berlin"
-    ports:
-    # These fixed ports are needed.
-    # https://help.ui.com/hc/en-us/articles/218506997-UniFi-Ports-Used
-    - "8080:8080/tcp" # Device command/control
-    - "8443:8443/tcp" # Web interface + API
-    - "8843:8843/tcp" # HTTPS portal
-    - "8880:8880/tcp" # HTTP portal
-    - "3478:3478/udp" # STUN service
-    - "6789:6789/tcp" # Speed Test (unifi5 only)
-    volumes:
-    - "/srv/data/unifi-controller/data:/unifi/data"
-    - "/srv/data/unifi-controller/log:/unifi/log"
diff --git a/unifi.yml b/unifi.yml
index 8cc5695..7cbbc01 100644
--- a/unifi.yml
+++ b/unifi.yml
@@ -4,6 +4,29 @@
   become: true
   vars:
     ansible_python_interpreter: /usr/bin/python3
-  roles:
-  - unifi-controller-docker
-  tasks: []
+  tasks:
+    - name: Install python docker package
+      apt:
+        name: python3-docker
+        state: present
+    - name: Setup the docker container for unifi-controller
+      docker_container:
+        name: unifi-controller
+        image: "jacobalberty/unifi:v6.5.55"
+        state: started
+        restart_policy: unless-stopped
+        container_default_behavior: no_defaults
+        env:
+          TZ: "Europe/Berlin"
+        # These fixed ports are needed.
+        # https://help.ui.com/hc/en-us/articles/218506997-UniFi-Ports-Used
+        ports:
+          - "8080:8080/tcp" # Device command/control
+          - "8443:8443/tcp" # Web interface + API
+          - "8843:8843/tcp" # HTTPS portal
+          - "8880:8880/tcp" # HTTP portal
+          - "3478:3478/udp" # STUN service
+          - "6789:6789/tcp" # Speed Test (unifi5 only)
+        volumes:
+          - "/srv/data/unifi-controller/data:/unifi/data"
+          - "/srv/data/unifi-controller/log:/unifi/log"