diff --git a/pottwal.yml b/pottwal.yml
index 8d72f2a..939f3a8 100644
--- a/pottwal.yml
+++ b/pottwal.yml
@@ -8,7 +8,7 @@
     data_dir: "/srv/data"
 
     gitea_host_port: 9091
-    uritools_host_port: 8080
+
     shlink_host_port: 8083
     shlink_domain_name: sl.n39.eu
 
@@ -32,6 +32,13 @@
     - role: penguineer.dehydrated_cron
     - role: dd24-dyndns-cron
       # variables are set in the inventory
+    - role: cleanuri
+      vars:
+        cleanuri_ui_domain: uritools.n39.eu
+        cleanuri_ui_host_port: 8090
+        cleanuri_api_domain: uritools-api.n39.eu
+        cleanuri_api_host_port: 8091
+        # RabbitMQ setup can be found in the inventory
 
   tasks:
 
@@ -89,25 +96,6 @@
           - 3142:3142
 
 
-    - name: Ensure container for URI tools is running
-      docker_container:
-        name: uritools
-        image: mrtux/clean_uri:0.4.1
-        pull: true
-        state: started
-        detach: yes
-        ports:
-          - "127.0.0.1:{{ uritools_host_port }}:8080"
-        restart_policy: unless-stopped
-
-    - name: Setup proxy site uritools.n39.eu
-      include_role:
-        name: setup-http-site-proxy
-      vars:
-        site_name: uritools.n39.eu
-        proxy_port: "{{ uritools_host_port }}"
-
-
     - name: Ensure container for shlink is running
       docker_container:
         name: shlink