diff --git a/.gitignore b/.gitignore
index 580dcf8..a826ab7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /secrets.yml
+*.ovpn
diff --git a/group_vars/all/vars.yml b/group_vars/all/vars.yml
index 9307da2..d1431e1 100644
--- a/group_vars/all/vars.yml
+++ b/group_vars/all/vars.yml
@@ -4,7 +4,9 @@
 user: tudattr
 timezone: Europe/Berlin
 local_domain: borg.land
+local_subdomains: "@"
 remote_domain: tudattr.dev
+remote_subdomains: "www,plex,status,"
 rclone_config: "/root/.config/rclone/"
 puid: 1000
 pgid: 1000
@@ -104,7 +106,7 @@ cupsd_config: "{{ docker_dir }}/cupsd/"
 # Uptime Kuma
 #
 
-kuma_host: "uptime"
+kuma_host: "status"
 kuma_port: "3001"
 kuma_config: "{{ docker_dir }}/kuma/"
 
@@ -200,7 +202,6 @@ grafana_data: "{{docker_data_dir}}/grafana/"
 grafana_log: "{{docker_dir}}/grafana/logs/"
 grafana_config: "{{docker_dir}}/grafana/config/"
 
-
 #
 # netdata
 #
@@ -215,8 +216,9 @@ netdata_cache: "{{ docker_data_dir }}/netdata/cache"
 #
 
 swag_port: "443"
-swag_config: "{{ docker_dir }}/swag/config/"
-swag_subdomains: "www,plex,status,"
+swag_host: "swag"
+swag_config: "{{ docker_dir }}/{{ swag_host }}/config/"
+swag_subdomains: "{{ remote_subdomains }}"
 swag_email: "me+swag@tudattr.dev"
 swag_site_confs:
   - "templates/mii/swag/site-confs/plex.subdomain.conf"
@@ -230,7 +232,7 @@ swag_remote_site_confs: "{{swag_config}}/nginx/site-confs/"
 plex_host: "plex"
 plex_ip: "172.16.69.12"
 plex_port: "32400"
-plex_config: "{{docker_data_dir}}/plex/config"
+plex_config: "{{docker_data_dir}}/{{ plex_host }}/config"
 plex_tv: "/media/series"
 plex_movies: "/media/movies"
 plex_music: "/media/songs"
@@ -257,9 +259,9 @@ arr_downloads: "{{ docker_data_dir }}/arr_downloads"
 
 sonarr_port: "8989"
 sonarr_host: "sonarr"
-sonarr_config: "{{ docker_dir }}/sonarr/config"
+sonarr_config: "{{ docker_dir }}/{{ sonarr_host }}/config"
 sonarr_media: "{{ plex_tv }}"
-sonarr_downloads: "{{ arr_downloads }}/sonarr"
+sonarr_downloads: "{{ arr_downloads }}/{{ sonarr_host }}"
 
 #
 # Radarr
@@ -267,9 +269,9 @@ sonarr_downloads: "{{ arr_downloads }}/sonarr"
 
 radarr_port: "7878"
 radarr_host: "radarr"
-radarr_config: "{{ docker_dir }}/radarr/config"
+radarr_config: "{{ docker_dir }}/{{ radarr_host }}/config"
 radarr_media: "{{ plex_movies }}"
-radarr_downloads: "{{ arr_downloads }}/radarr"
+radarr_downloads: "{{ arr_downloads }}/{{ radarr_host }}"
 
 #
 # Lidarr
@@ -277,9 +279,9 @@ radarr_downloads: "{{ arr_downloads }}/radarr"
 
 lidarr_port: "8686"
 lidarr_host: "lidarr"
-lidarr_config: "{{ docker_dir }}/lidarr/config"
+lidarr_config: "{{ docker_dir }}/{{ lidarr_host }}/config"
 lidarr_media: "{{ plex_music }}"
-lidarr_downloads: "{{ arr_downloads }}/lidarr"
+lidarr_downloads: "{{ arr_downloads }}/{{ lidarr_host }}"
 
 #
 # Prowlarr
@@ -287,4 +289,12 @@ lidarr_downloads: "{{ arr_downloads }}/lidarr"
 
 prowlarr_port: "9696"
 prowlarr_host: "prowlarr"
-prowlarr_config: "{{ docker_dir }}/prowlarr/config"
+prowlarr_config: "{{ docker_dir }}/{{ prowlarr_host }}/config"
+
+#
+# bin
+#
+
+bin_port: "6162"
+bin_host: "bin"
+bin_upload: "{{ docker_data_dir }}/{{bin_host}}/upload"
diff --git a/roles/docker/tasks/aya01_compose.yml b/roles/docker/tasks/aya01_compose.yml
index 9b1d790..1275fd1 100644
--- a/roles/docker/tasks/aya01_compose.yml
+++ b/roles/docker/tasks/aya01_compose.yml
@@ -48,6 +48,10 @@
   tags:
     - prowlarr
 
+- include_tasks: bin.yml
+  tags:
+    - bin
+
 - name: Copy the compose file
   template: 
     src: templates/aya01/compose.yaml
diff --git a/roles/docker/tasks/bin.yml b/roles/docker/tasks/bin.yml
new file mode 100644
index 0000000..69459a6
--- /dev/null
+++ b/roles/docker/tasks/bin.yml
@@ -0,0 +1,9 @@
+---
+- name: Create bin-config directory
+  file:
+    path: "{{ bin_upload }}"
+    owner: "{{ puid }}"
+    group: "{{ pgid }}"
+    mode: '755'
+    state: directory
+  become: true
diff --git a/roles/docker/templates/aya01/compose.yaml b/roles/docker/templates/aya01/compose.yaml
index 15c7917..33fb284 100644
--- a/roles/docker/templates/aya01/compose.yaml
+++ b/roles/docker/templates/aya01/compose.yaml
@@ -290,6 +290,27 @@ services:
       - "traefik.http.routers.{{prowlarr_host}}.rule=Host(`{{ prowlarr_host }}.{{ aya01_host }}.{{local_domain}}`)"
       - "traefik.http.services.{{prowlarr_host}}.loadbalancer.server.port={{ prowlarr_port }}"
 
+  pastebin:
+    image: wantguns/bin
+    container_name: pastebin
+    restart: always
+    networks:
+      - net
+    ports:
+      - "{{ bin_port }}:{{ bin_port }}"
+    environment:
+      - PUID={{ puid }}
+      - PGID={{ pgid }}
+      - TZ={{ timezone }}
+      - ROCKET_PORT={{ bin_port }}
+      - HOST_URL={{ bin_host }}.{{ aya01_host }}.{{ local_domain }}
+    volumes:
+      - {{ bin_upload }}:/app/upload
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.{{ bin_host }}.rule=Host(`{{ bin_host }}.{{ aya01_host }}.{{ local_domain }}`)"
+      - "traefik.http.services.{{ bin_host }}.loadbalancer.server.port={{ bin_port }}"
+
 networks:
   zoneminder:
     driver: bridge
diff --git a/roles/docker/templates/mii/swag/site-confs/plex.subdomain.conf b/roles/docker/templates/mii/swag/site-confs/plex.subdomain.conf
index ce93ee6..a81b779 100644
--- a/roles/docker/templates/mii/swag/site-confs/plex.subdomain.conf
+++ b/roles/docker/templates/mii/swag/site-confs/plex.subdomain.conf
@@ -2,7 +2,7 @@ server {
     listen 443 ssl;
     listen [::]:443 ssl;
 
-    server_name plex.tudattr.dev;
+    server_name {{ plex_host }}.{{ remote_domain }};
 
     include /config/nginx/ssl.conf;
 
diff --git a/roles/docker/templates/mii/swag/site-confs/uptime-kuma.subdomain.conf b/roles/docker/templates/mii/swag/site-confs/uptime-kuma.subdomain.conf
index 23c5812..1a7f2c8 100644
--- a/roles/docker/templates/mii/swag/site-confs/uptime-kuma.subdomain.conf
+++ b/roles/docker/templates/mii/swag/site-confs/uptime-kuma.subdomain.conf
@@ -2,7 +2,7 @@ server {
     listen 443 ssl;
     listen [::]:443 ssl;
 
-    server_name status.tudattr.dev;
+    server_name {{ kuma_host }}.{{ remote_domain }};
 
     include /config/nginx/ssl.conf;
 
@@ -10,7 +10,7 @@ server {
 
     location / {
         include /config/nginx/resolver.conf;
-        proxy_pass http://uptime.aya01.borg.land;
+        proxy_pass http://{{ kuma_host }}.{{ aya01_host }}.{{ local_domain }};
         proxy_set_header   Upgrade $http_upgrade;
         proxy_set_header   Connection "upgrade";
     }
diff --git a/roles/docker/templates/pi/ddns-updater/data/config.json b/roles/docker/templates/pi/ddns-updater/data/config.json
index d633d6a..26211f9 100644
--- a/roles/docker/templates/pi/ddns-updater/data/config.json
+++ b/roles/docker/templates/pi/ddns-updater/data/config.json
@@ -2,8 +2,8 @@
     "settings": [
         {
             "provider": "namecheap",
-            "domain": "borg.land",
-            "host": "@",
+            "domain": "{{ local_domain }}",
+            "host": "{{ local_subdomains }}",
             "password": "{{ vault_ddns_borgland_password }}",
             "provider_ip": true
         }