diff --git a/docker-compose/baserow/.env b/docker-compose/baserow/.env
new file mode 100644
index 00000000..ea1f7086
--- /dev/null
+++ b/docker-compose/baserow/.env
@@ -0,0 +1,3 @@
+SECRET_KEY: hallowelt
+DATABASE_PASSWORD: hallowelt
+REDIS_PASSWORD: hallowelt
diff --git a/docker-compose/baserow/docker-compose.yml.j2 b/docker-compose/baserow/docker-compose.yml.j2
new file mode 100644
index 00000000..00b0b967
--- /dev/null
+++ b/docker-compose/baserow/docker-compose.yml.j2
@@ -0,0 +1,19 @@
+---
+# https://baserow.io/docs/installation%2Finstall-with-docker-compose
+services:
+  baserow:
+    container_name: baserow
+    image: baserow/baserow:1.27.2
+    environment:
+      BASEROW_PUBLIC_URL: 'http://docker10.mgrote.net:280' # todo
+    ports:
+      - "280:80"
+      - "2443:443"
+    volumes:
+      - baserow_data:/baserow/data
+volumes:
+  baserow_data:
+
+
+# traefik
+# ldap
diff --git a/docker-compose/miniflux/docker-compose.yml.j2 b/docker-compose/miniflux/docker-compose.yml.j2
index 0086cd86..0cfa9cb1 100644
--- a/docker-compose/miniflux/docker-compose.yml.j2
+++ b/docker-compose/miniflux/docker-compose.yml.j2
@@ -32,7 +32,7 @@ services:
 
 ######## Postgres ########
   mf-db17:
-    container_name: "mf-db17"
+    container_name: "mf-db"
     image: "postgres:17.0"
     restart: always
     environment:
diff --git a/host_vars/docker10.mgrote.net.yml b/host_vars/docker10.mgrote.net.yml
index 0574b358..02d596c5 100644
--- a/host_vars/docker10.mgrote.net.yml
+++ b/host_vars/docker10.mgrote.net.yml
@@ -66,6 +66,8 @@ compose_files:
     state: present
   - name: act-runner
     state: present
+  - name: baserow
+    state: present
 
 ### oefenweb.ufw
 ufw_rules: