diff --git a/.drone.yml b/.drone.yml
new file mode 100644
index 0000000..47080d2
--- /dev/null
+++ b/.drone.yml
@@ -0,0 +1,38 @@
+---
+kind: pipeline
+name: deploy to swarm-test.autonomic.zone
+steps:
+  - name: deployment
+    image: git.coopcloud.tech/coop-cloud/stack-ssh-deploy:latest
+    settings:
+      host: swarm-test.autonomic.zone
+      stack: example_com  # UPDATE ME
+      generate_secrets: true
+      purge: true
+      deploy_key:
+        from_secret: drone_ssh_swarm_test
+      networks:
+        - proxy
+    environment:
+      DOMAIN: example.swarm-test.autonomic.zone # UPDATE ME
+      STACK_NAME: example_com  # UPDATE ME
+      LETS_ENCRYPT_ENV: production
+trigger:
+  branch:
+    - main
+---
+kind: pipeline
+name: generate recipe catalogue
+steps:
+  - name: release a new version
+    image: plugins/downstream
+    settings:
+      server: https://build.coopcloud.tech
+      token:
+        from_secret: drone_abra-bot_token
+      fork: true
+      repositories:
+        - coop-cloud/auto-recipes-catalogue-json
+
+trigger:
+  event: tag
diff --git a/.env.sample b/.env.sample
new file mode 100644
index 0000000..39cc22d
--- /dev/null
+++ b/.env.sample
@@ -0,0 +1,8 @@
+TYPE=wireguard-ui
+
+DOMAIN=wireguard-ui.example.com
+
+## Domain aliases
+#EXTRA_DOMAINS=', `www.wireguard-ui.example.com`'
+
+LETS_ENCRYPT_ENV=production
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..7a6353d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.envrc
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..efaea31
--- /dev/null
+++ b/README.md
@@ -0,0 +1,24 @@
+# wireguard-ui
+
+> One line description of the recipe
+
+<!-- metadata -->
+
+* **Category**: Apps
+* **Status**: 0
+* **Image**: [`wireguard-ui`](https://hub.docker.com/r/wireguard-ui), 4, upstream
+* **Healthcheck**: No
+* **Backups**: No
+* **Email**: No
+* **Tests**: No
+* **SSO**: No
+
+<!-- endmetadata -->
+
+## Quick start
+
+* `abra app new wireguard-ui --secrets`
+* `abra app config <app-name>`
+* `abra app deploy <app-name>`
+
+For more, see [`docs.coopcloud.tech`](https://docs.coopcloud.tech).
diff --git a/compose.yml b/compose.yml
index a7d49c0..5c0dcd2 100644
--- a/compose.yml
+++ b/compose.yml
@@ -1,27 +1,37 @@
-version: "3"
-
 services:
-  wg:
-    build: .
-    #image: ngoduykhanh/wireguard-ui:latest
-    container_name: wgui
+  wireguard:
+    image: linuxserver/wireguard:latest
+    container_name: wireguard
     cap_add:
       - NET_ADMIN
-    network_mode: host
+    volumes:
+      - ./config:/config
+    ports:
+      - "5000:5000"
+      - "51820:51820/udp"
+
+  wireguard-ui:
+    image: ngoduykhanh/wireguard-ui:latest
+    container_name: wireguard-ui
+    depends_on:
+      - wireguard
+    cap_add:
+      - NET_ADMIN
+    network_mode: service:wireguard
     environment:
       - SENDGRID_API_KEY
       - EMAIL_FROM_ADDRESS
       - EMAIL_FROM_NAME
       - SESSION_SECRET
-      - WGUI_USERNAME=alpha
-      - WGUI_PASSWORD=this-unusual-password
+      - WGUI_USERNAME=admin
+      - WGUI_PASSWORD=admin
       - WG_CONF_TEMPLATE
-      - WGUI_MANAGE_START=false
-      - WGUI_MANAGE_RESTART=false
+      - WGUI_MANAGE_START=true
+      - WGUI_MANAGE_RESTART=true
     logging:
       driver: json-file
       options:
         max-size: 50m
     volumes:
       - ./db:/app/db
-      - /etc/wireguard:/etc/wireguard
+      - ./config:/etc/wireguard
diff --git a/release/.git-keep-me b/release/.git-keep-me
new file mode 100644
index 0000000..e69de29