diff --git a/public/svgs/mindsdb.svg b/public/svgs/mindsdb.svg
new file mode 100644
index 000000000..53799dd1c
--- /dev/null
+++ b/public/svgs/mindsdb.svg
@@ -0,0 +1,12 @@
+<svg width="264" height="151" viewBox="0 0 264 151" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_13_35)">
+<path d="M186.86 75.8418C189.798 98.8976 192.525 120.544 195.356 142.168C195.691 144.759 195.155 145.673 192.254 145.818C174.783 146.686 174.793 146.755 168.478 130.847C165.848 124.227 163.286 117.581 160.486 111.028C159.869 109.951 159.642 108.7 159.84 107.479C160.039 106.259 160.652 105.14 161.579 104.306C169.843 95.2778 177.892 86.0052 186.86 75.8418Z" fill="#00A587"/>
+<path d="M84.1747 95.1655C86.6767 107.857 89.145 119.785 91.3184 131.767C91.9891 135.476 95.0077 140.188 92.4252 142.696C90.1982 144.851 85.2546 141.802 81.4547 141.94C71.3595 142.317 66.6607 137.651 65.0207 127.854C64.0581 122.102 63.6321 118.119 68.4516 113.664C74.0774 107.825 79.3286 101.647 84.1747 95.1655V95.1655Z" fill="#00A587"/>
+<path d="M112.68 118.314C112.68 111.186 112.569 104.059 112.734 96.9342C112.797 94.136 112.006 93.1922 108.984 93.0932C88.369 92.4223 67.7583 91.6083 47.1521 90.6514C43.9156 90.5029 42.6377 91.407 41.9502 94.555C38.7707 109.134 35.1619 123.626 32.0562 138.222C31.1842 142.32 29.5945 143.831 25.2378 143.366C20.4038 142.873 15.5373 142.763 10.6853 143.036C7.02954 143.218 6.32523 141.716 6.3789 138.585C6.69416 116.694 7.16037 94.8026 6.94572 72.9181C6.90613 66.1838 9.19198 59.6359 13.4288 54.3467C24.832 38.7551 35.8159 22.8829 46.8636 7.0504C47.4595 5.96628 48.3973 5.10199 49.5357 4.58777C50.6742 4.07355 51.9516 3.93721 53.1756 4.19931C94.3679 8.53528 135.576 12.736 176.8 16.8013C179.378 17.1054 181.84 18.0315 183.967 19.4973C208.497 35.1813 232.984 50.9215 257.638 66.4142C261.327 68.724 261.428 70.044 257.883 72.1328C257.12 72.5383 256.438 73.0773 255.871 73.7233C248.77 82.7483 240.443 82.3424 230.381 78.343C218.22 73.522 205.395 70.3245 192.925 66.2261C191.738 65.7528 190.451 65.5735 189.178 65.7041C187.904 65.8347 186.682 66.2712 185.62 66.9751C174.15 73.9839 162.627 80.907 151.052 87.7442C150.009 88.2936 149.119 89.0852 148.458 90.0502C147.797 91.0151 147.385 92.1243 147.259 93.2813C144.72 108.328 141.815 123.31 139.481 138.396C138.81 142.719 137.244 144.089 132.877 143.788C127.332 143.466 121.772 143.457 116.225 143.762C112.935 143.907 112.093 142.772 112.2 139.687C112.415 132.562 112.268 125.428 112.268 118.301L112.68 118.314Z" fill="#00A587"/>
+</g>
+<defs>
+<clipPath id="clip0_13_35">
+<rect width="264" height="151" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/templates/compose/grafana-with-postgresql.yaml b/templates/compose/grafana-with-postgresql.yaml
index 25276468e..5656069fb 100644
--- a/templates/compose/grafana-with-postgresql.yaml
+++ b/templates/compose/grafana-with-postgresql.yaml
@@ -1,39 +1,49 @@
-# documentation: https://grafana.com
-# slogan: Grafana is the open source analytics & monitoring solution for every database.
-# tags: grafana,analytics,monitoring,dashboard
-# logo: svgs/grafana.svg
-# port: 3000
+
+
+# documentation: https://docs.mindsdb.com/what-is-mindsdb
+# slogan: MindsDB is the platform for building AI from enterprise data, enabling smarter organizations.
+# tags: mysql, postgresdb, machine-learning, ai
+# logo: svgs/mindsdb.png
+# port: 47334
 
 services:
-  grafana:
-    image: grafana/grafana-oss
+  mindsdb:
+    image: mindsdb/mindsdb
+    restart: always
+    container_name: mindsdb
     environment:
-      - SERVICE_FQDN_GRAFANA_3000
-      - GF_SERVER_ROOT_URL=${SERVICE_FQDN_GRAFANA}
-      - GF_SERVER_DOMAIN=${SERVICE_FQDN_GRAFANA}
-      - GF_SECURITY_ADMIN_PASSWORD=${SERVICE_PASSWORD_GRAFANA}
-      - GF_DATABASE_TYPE=postgres
-      - GF_DATABASE_HOST=postgresql
-      - GF_DATABASE_USER=$SERVICE_USER_POSTGRES
-      - GF_DATABASE_PASSWORD=$SERVICE_PASSWORD_POSTGRES
-      - GF_DATABASE_NAME=${POSTGRES_DB:-grafana}
+      - SERVICE_FQDN_MINDSDB_47334
+      - SERVICE_FQDN_API_47335=/api
+      - MINDSDB_DOCKER_ENV=true
+      - MINDSDB_STORAGE_DIR=/mindsdb/var
+      - FLASK_DEBUG=1  # This will make sure http requests are logged regardless of log level
+      - OPENAI_API_KEY=$OPENAI_API_KEY
+      - LANGFUSE_HOST=$LANGFUSE_HOST
+      - LANGFUSE_PUBLIC_KEY=$LANGFUSE_PUBLIC_KEY
+      - LANGFUSE_SECRET_KEY=$LANGFUSE_SECRET_KEY
+      - LANGFUSE_RELEASE="local"
+      # - LANGFUSE_DEBUG="True"
+      - LANGFUSE_TIMEOUT="10"
+      - LANGFUSE_SAMPLE_RATE="1.0"
+      - MINDSDB_DB_CON=postgresql://postgres:postgres@postgresql
+    # ports:
+    #   - 47335:47335
+    #   - 47336:47336
     volumes:
-      - grafana-data:/var/lib/grafana
+      - mindsdb-data:/mindsdb/var
     healthcheck:
-      test: ["CMD", "curl", "-f", "http://127.0.0.1:3000/api/health"]
-      interval: 5s
-      timeout: 20s
-      retries: 10
-    depends_on:
-      - postgresql
+      test:  ["CMD", "curl", "-f", "http://localhost:47334/api/util/ping"]
+      interval: 30s
+      timeout: 4s
+      retries: 100
   postgresql:
     image: postgres:16-alpine
     volumes:
       - postgresql-data:/var/lib/postgresql/data
     environment:
-      - POSTGRES_USER=$SERVICE_USER_POSTGRES
-      - POSTGRES_PASSWORD=$SERVICE_PASSWORD_POSTGRES
-      - POSTGRES_DB=${POSTGRES_DB:-grafana}
+      - POSTGRES_USER=postgres
+      - POSTGRES_PASSWORD=postgres
+      - POSTGRES_DB=mindsdb
     healthcheck:
       test: ["CMD-SHELL", "pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}"]
       interval: 5s
diff --git a/templates/compose/mindsdb.yaml b/templates/compose/mindsdb.yaml
new file mode 100644
index 000000000..3628a14d8
--- /dev/null
+++ b/templates/compose/mindsdb.yaml
@@ -0,0 +1,49 @@
+# documentation: https://docs.mindsdb.com/what-is-mindsdb
+# slogan: MindsDB is the platform for building AI from enterprise data, enabling smarter organizations.
+# tags: mysql, postgresdb, machine-learning, ai
+# logo: svgs/mindsdb.png
+# port: 47334
+
+services:
+  mindsdb:
+    image: mindsdb/mindsdb
+    restart: always
+    container_name: mindsdb
+    environment:
+      - SERVICE_FQDN_MINDSDB_47334
+      - SERVICE_FQDN_API_47335=/api
+      - MINDSDB_DOCKER_ENV=true
+      - MINDSDB_STORAGE_DIR=/mindsdb/var
+      - FLASK_DEBUG=1  # This will make sure http requests are logged regardless of log level
+      - OPENAI_API_KEY=$OPENAI_API_KEY
+      - LANGFUSE_HOST=$LANGFUSE_HOST
+      - LANGFUSE_PUBLIC_KEY=$LANGFUSE_PUBLIC_KEY
+      - LANGFUSE_SECRET_KEY=$LANGFUSE_SECRET_KEY
+      - LANGFUSE_RELEASE="local"
+      # - LANGFUSE_DEBUG="True"
+      - LANGFUSE_TIMEOUT="10"
+      - LANGFUSE_SAMPLE_RATE="1.0"
+      - MINDSDB_DB_CON='postgresql://$SERVICE_USER_POSTGRES:$SERVICE_PASSWORD_POSTGRES@postgresql'
+    # ports:
+    #   - 47335:47335
+    #   - 47336:47336
+    volumes:
+      - mindsdb-data:/mindsdb/var
+    healthcheck:
+      test:  ["CMD", "curl", "-f", "http://localhost:47334/api/util/ping"]
+      interval: 30s
+      timeout: 4s
+      retries: 100
+  postgresql:
+    image: postgres:16-alpine
+    volumes:
+      - postgresql-data:/var/lib/postgresql/data
+    environment:
+      - POSTGRES_USER=$SERVICE_USER_POSTGRES
+      - POSTGRES_PASSWORD=$SERVICE_PASSWORD_POSTGRES
+      - POSTGRES_DB=${POSTGRES_DB:-mindsdb}
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}"]
+      interval: 5s
+      timeout: 20s
+      retries: 10