diff --git a/caddy/Caddyfile b/caddy/Caddyfile
index 24803aa..86cf4e6 100644
--- a/caddy/Caddyfile
+++ b/caddy/Caddyfile
@@ -31,6 +31,7 @@ import unprotected homarr host:17575
 import unprotected jellyseerr host:15055
 import unprotected minio host:9000
 import unprotected gitea host:3003
+import unprotected minio-admin host:9001
 
 import protected sonarr host:18989
 import protected radarr host:17878
@@ -45,7 +46,8 @@ import protected transmission host:9091
 import protected droppy host:8989
 import protected filebrowser host:8002
 import protected jupyter host:9999
-import unprotected minio-admin host:9001
+import protected teslamate host:4000
+import protected tesla host:3004
 
 import sites/root.caddy
 import sites/authentik.caddy
diff --git a/compose.teslamate.yaml b/compose.teslamate.yaml
new file mode 100644
index 0000000..741259d
--- /dev/null
+++ b/compose.teslamate.yaml
@@ -0,0 +1,40 @@
+services:
+  teslamate:
+    image: teslamate/teslamate:2.1.0
+    container_name: teslamate
+    restart: always
+    environment:
+      - ENCRYPTION_KEY=8bzsb7kv9LpFL7tpBexePuZEr6ALCr9d
+      - DATABASE_HOST=host
+      - DATABASE_PORT=11111
+      - DATABASE_USER=teslamate
+      - DATABASE_PASS=teslamate
+      - DATABASE_NAME=teslamate
+      - MQTT_HOST=host
+      - MQTT_USERNAME=teslamate
+      - MQTT_PASSWORD=teslamate
+    ports:
+      - 4000:4000
+    extra_hosts:
+      - host:192.168.2.200
+    volumes:
+      - /opt/teslamate/import:/opt/app/import
+    cap_drop:
+      - all
+
+  teslamate-grafana:
+    image: teslamate/grafana:2.1.0
+    container_name: teslamate-grafana
+    restart: always
+    environment:
+      - DATABASE_HOST=host
+      - DATABASE_PORT=11111
+      - DATABASE_USER=teslamate
+      - DATABASE_PASS=teslamate
+      - DATABASE_NAME=teslamate
+    ports:
+      - 3004:3000
+    extra_hosts:
+      - host:192.168.2.200
+    volumes:
+      - /opt/teslamate/grafana:/var/lib/grafana
diff --git a/compose.yaml b/compose.yaml
index daa807d..9b69eee 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -13,6 +13,7 @@ include:
 - compose.grafana.yaml
 - compose.photoprism.yaml
 - compose.gitea.yaml
+- compose.teslamate.yaml
 
 # Download
 - compose.jackett.yaml
diff --git a/mosquitto/config/passwords.txt b/mosquitto/config/passwords.txt
index 08a8f52..a3c07b6 100644
--- a/mosquitto/config/passwords.txt
+++ b/mosquitto/config/passwords.txt
@@ -1 +1,2 @@
 test:$7$101$5QYeHBvbrYg87CoN$McssDo9+rFd7fjUKHAhBa6tjzTj2+AQQPf6cpnuPkBvkEsRT/XDi12C8POCCXZaodnFX8J8eTyI344RcLJToAw==
+teslamate:$7$101$UxiHk5tZAp1muwRT$3U5x4tKqvoOm2NPLbTSNkYiUImjEgpOUY/HlI0zdgF+mj6wpQoTdK3M70DgYkStjZQTMs/ei+u9zGVLo0zus/w==