diff --git a/templates/compose/grafana-with-postgresql.yaml b/templates/compose/grafana-with-postgresql.yaml
new file mode 100644
index 000000000..78c44db32
--- /dev/null
+++ b/templates/compose/grafana-with-postgresql.yaml
@@ -0,0 +1,40 @@
+# documentation: https://grafana.com/docs/grafana/latest/installation/docker/
+# slogan: Grafana is the open source analytics & monitoring solution for every database.
+# tags: grafana,analytics,monitoring,dashboard
+
+services:
+  grafana:
+    image: grafana/grafana-oss
+    environment:
+      - SERVICE_FQDN_GRAFANA
+      - 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}
+    volumes:
+      - grafana-data:/var/lib/grafana
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:3000/api/health"]
+      interval: 5s
+      timeout: 5s
+      retries: 10
+    depends_on:
+      - postgresql
+  postgresql:
+    image: postgres:15-alpine
+    volumes:
+      - postgresql-data:/var/lib/postgresql/data
+    environment:
+      - POSTGRES_USER=$SERVICE_USER_POSTGRES
+      - POSTGRES_PASSWORD=$SERVICE_PASSWORD_POSTGRES
+      - POSTGRES_DB=${POSTGRES_DB:-grafana}
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}"]
+      interval: 5s
+      timeout: 5s
+      retries: 10
+
diff --git a/templates/compose/grafana.yaml b/templates/compose/grafana.yaml
new file mode 100644
index 000000000..eb39909be
--- /dev/null
+++ b/templates/compose/grafana.yaml
@@ -0,0 +1,19 @@
+# documentation: https://grafana.com/docs/grafana/latest/installation/docker/
+# slogan: Grafana is the open source analytics & monitoring solution for every database.
+# tags: grafana,analytics,monitoring,dashboard
+
+services:
+  grafana:
+    image: grafana/grafana-oss
+    environment:
+      - SERVICE_FQDN_GRAFANA
+      - GF_SERVER_ROOT_URL=${SERVICE_FQDN_GRAFANA}
+      - GF_SERVER_DOMAIN=${SERVICE_FQDN_GRAFANA}
+      - GF_SECURITY_ADMIN_PASSWORD=${SERVICE_PASSWORD_GRAFANA}
+    volumes:
+      - grafana-data:/var/lib/grafana
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:3000/api/health"]
+      interval: 5s
+      timeout: 5s
+      retries: 10
diff --git a/templates/compose/openblocks.yaml b/templates/compose/openblocks.yaml
new file mode 100644
index 000000000..dda798628
--- /dev/null
+++ b/templates/compose/openblocks.yaml
@@ -0,0 +1,27 @@
+# documentation: https://docs.openblocks.dev/self-hosting
+# slogan: OpenBlocks is a self-hosted, open-source, low-code platform for building internal tools.
+# tags: openblocks,low,code,platform,open,source,low,code
+
+services:
+  openblocks:
+    image: openblocksdev/openblocks-ce
+    environment:
+      - SERVICE_FQDN_OPENBLOCKS
+      - REDIS_ENABLED=true
+      - MONGODB_ENABLED=true
+      - API_SERVICE_ENABLED=true
+      - NODE_SERVICE_ENABLED=true
+      - PUID=1000
+      - PGID=1000
+      - MONGODB_URI=mongodb://localhost:27017/openblocks?authSource=admin
+      - REDIS_URL=redis://localhost:6379
+      - JS_EXECUTOR_URI=http://localhost:6060
+      - ENABLE_USER_SIGN_UP=${ENABLE_USER_SIGN_UP:-true}
+      - ENCRYPTION_PASSWORD=$SERVICE_
+    volumes:
+      - openblocks-data:/openblocks-stacks
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:3000/api/health"]
+      interval: 5s
+      timeout: 5s
+      retries: 10