diff --git a/data/homeserver.yaml b/data/homeserver.yaml
index 3a40839..a3e02f8 100644
--- a/data/homeserver.yaml
+++ b/data/homeserver.yaml
@@ -62,3 +62,8 @@ oidc_providers:
 
 # Föderation aktivieren
 federation_domain_whitelist: []
+
+# Appservice Registrierungen
+app_service_config_files:
+  - /data/whatsapp-registration.yaml
+
diff --git a/data/whatsapp-registration.yaml b/data/whatsapp-registration.yaml
new file mode 100644
index 0000000..5134ff6
--- /dev/null
+++ b/data/whatsapp-registration.yaml
@@ -0,0 +1,11 @@
+id: whatsapp
+url: http://matrix_whatsapp:29318
+as_token: "0a3c59d1cbf443b88cca6147def3c8e83da2fc074d584cfeb3f4b8487e8f3418"
+hs_token: "55a049f147eb43a1897cdd5dc49961fbe8694fe52f3a447bbd12abee1905ae10"
+sender_localpart: whatsappbot
+namespaces:
+  users:
+    - exclusive: true
+      regex: '@whatsapp_.*:mischlabs\.de'
+  aliases: []
+  rooms: []
diff --git a/docker-compose.yml b/docker-compose.yml
index 6d5e8d5..7b37267 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -36,3 +36,15 @@ services:
       - "${ELEMENT_PORT:-8088}:80"
     volumes:
       - ./element-config.json:/app/config.json
+
+  whatsapp:
+    image: dock.mau.dev/mautrix/whatsapp:latest
+    container_name: matrix_whatsapp
+    restart: unless-stopped
+    depends_on:
+      - synapse
+    volumes:
+      - ./data/whatsapp:/data
+    environment:
+      - TZ=Europe/Berlin
+