diff --git a/README.md b/README.md
index e4baad97..f20b333c 100644
--- a/README.md
+++ b/README.md
@@ -123,6 +123,9 @@
 | navidrome | deluan/navidrome:latest |
 | netalertx | jokobsk/netalertx:latest |
 | nextcloud | nextcloud/all-in-one:latest |
+| nocodb | nocodb/nocodb:latest |
+| nocodb-pg-db | postgres:16-alpine |
+| nocodb-valkey | docker.io/bitnami/valkey:latest |
 | ollama | ollama/ollama |
 | ombi | lscr.io/linuxserver/ombi:latest |
 | omnitools | iib0011/omni-tools:latest |
diff --git a/docker-compose.yml b/docker-compose.yml
index 3306fb95..764fb5fd 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4241,6 +4241,72 @@ services:
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
       - nextcloud_aio_mastercontainer:/mnt/docker-aio-config
+  nocodb:
+    container_name: nocodb
+    depends_on:
+      nocodb-pg-db:
+        condition: service_healthy
+        required: true
+      nocodb-valkey:
+        condition: service_healthy
+        required: true
+    environment:
+      NC_DB: pg://nocodb-pg-db:5432?u=nocodb&p=${NOCODB_PG_PASSWORD}&d=nocodb
+      NC_ADMIN_EMAIL: noreply@${MY_TLD}
+      NC_ADMIN_PASSWORD: ${NOCODB_ADMIN_PASSWORD}
+      NC_PUBLIC_URL: https://nocodb.${MY_TLD}
+      NC_AUTH_JWT_SECRET: ${NOCODB_AUTH_JWT_SECRET}
+      NC_REDIS_URL: redis://nocodb-valkey:6379
+      NC_SMTP_HOST: postal-smtp
+      NC_SMTP_PORT: 25
+      NC_SMTP_SECURE: true
+      NC_SMTP_USERNAME: ${POSTAL_NC_SMTP_AUTH_USER}
+      NC_SMTP_PASSWORD: ${POSTAL_NC_SMTP_AUTH_PASSWORD}
+      NC_SMTP_FROM: noreply@${MY_TLD}
+    image: "nocodb/nocodb:latest"
+    labels:
+      homepage.group: Code/DevOps
+      homepage.name: NocoDB
+      homepage.href: https://nocodb.${MY_TLD}
+      homepage.icon: nocodb.svg
+      homepage.description: Turn any SQL-based database into a smart spreadsheet
+      swag: enable
+      swag_port: 8080
+      swag_proto: http
+      swag_url: nocodb.${MY_TLD}
+      swag.uptime-kuma.enabled: true
+      swag.uptime-kuma.name: NocoDB
+      swag.uptime-kuma.monitor.url: https://nocodb.${MY_TLD}
+      swag.uptime-kuma.monitor.interval: 300
+      swag.uptime-kuma.monitor.retryInterval: 60
+      swag.uptime-kuma.monitor.maxretries: 5
+    ports:
+      - 8946:8080
+    restart: unless-stopped
+    volumes:
+      - nocodb_data:/usr/app/data
+  nocodb-pg-db:
+    container_name: nocodb-pg-db
+    environment:
+      POSTGRES_DB: nocodb
+      POSTGRES_PASSWORD: ${NOCODB_PG_PASSWORD}
+      POSTGRES_USER: nocodb
+    expose:
+      - 5432
+    healthcheck:
+      interval: 10s
+      retries: 10
+      test: "pg_isready -U \"$$POSTGRES_USER\" -d \"$$POSTGRES_DB\""
+      timeout: 2s
+    image: postgres:16-alpine
+    restart: unless-stopped
+    volumes:
+      - nocodb_pg_data:/var/lib/postgresql/data
+  nocodb-valkey:
+    container_name: nocodb-valkey
+    << : *valkey-params
+    volumes:
+      - nocodb_valkey_data:/data/valkey
   ollama:
     container_name: ollama
     image: ollama/ollama
@@ -7084,6 +7150,12 @@ volumes:
     name: n8n-data
   nextcloud_aio_mastercontainer:
     name: nextcloud_aio_mastercontainer
+  nocodb_data:
+    name: nocodb_data
+  nocodb_pg_data:
+    name: nocodb_pg_data
+  nocodb_valkey_data:
+    name: nocodb_valkey_data
   ollama:
     name: ollama
   paperless-ngx-data: