diff --git a/public/svgs/rybbit.svg b/public/svgs/rybbit.svg
new file mode 100644
index 000000000..5715b29bd
--- /dev/null
+++ b/public/svgs/rybbit.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 191.16 144.69"><path fill="#FFF" d="M127.29 118.47c.91-2.62 4.71-7.47 10.12-12.69 6.8-6.56 15.9-13.49 23.29-18.39-9.95 26.6-9.53 39.61 30.46 57.28-8.67.04-34.1 0-43.73 0-7.81-4.95-22.3-19.93-20.13-26.2Z"/><path fill="#FFF" d="M113.68 42.32c8.45 0 14.93-7.08 14.93-15.53 0-6.19-3.36-11.53-9.08-13.9-5.72-2.37-12.52-1.27-16.67 3.32-3.91 4.33-5.68 10.95-3.32 16.67 2.37 5.72 7.95 9.44 14.13 9.44Zm24.03-25.52c15.38.04 48.87 11.91 48.87 18 0 12.63-13.28 34-19.32 39.03 3.1-7.58 6.5-17.77 6.54-26.73-9.85 2.38-21.94 7.12-32.89 14.25-11.78 7.68-22.36 18-28.79 29.71-6.75 12.27-8.49 23.37-5.37 32.95 2.54 7.81 8.48 14.63 16.69 20.66H82.18c-5.46-5.46-9.15-12.24-9.03-23.63.07-7.17 1.64-16.23 6.46-25.84-25.96 27.78-20.91 44.54-30.62 46.43-9.49 1.84-25.15-13.11-31.29-19.56 2.55 6.95 12.06 17.92 20.77 22.6H3.93c-5.91-22.5-5.03-54.5 1.79-77.44 7.12 4.9 16.15 15.05 21.43 22.46 11.09-27.4 40.19-55.7 59.47-64.98C87.59 10.67 98.99-.03 113.09 0c11.29-.02 20.69 6.64 24.63 16.8Z"/><circle cx="117.09" cy="27.09" r="7.59" fill="#FFF"/></svg>
\ No newline at end of file
diff --git a/templates/compose/rybbit.yaml b/templates/compose/rybbit.yaml
new file mode 100644
index 000000000..3c8f7564c
--- /dev/null
+++ b/templates/compose/rybbit.yaml
@@ -0,0 +1,133 @@
+# documentation: https://rybbit.io/docs
+# slogan: Open-source, privacy-first web analytics.
+# tags: analytics,web,privacy,self-hosted,clickhouse,postgres
+# logo: svgs/rybbit.svg
+# port: 3002
+
+services:
+  rybbit:
+    image: 'ghcr.io/rybbit-io/rybbit-client:v1.6.1'
+    environment:
+      - SERVICE_URL_RYBBIT_3002
+      - NODE_ENV=production
+      - 'NEXT_PUBLIC_BACKEND_URL=${SERVICE_URL_RYBBIT}'
+      - 'NEXT_PUBLIC_DISABLE_SIGNUP=${DISABLE_SIGNUP:-false}'
+    depends_on:
+      - rybbit_backend
+    healthcheck:
+      test: ["CMD-SHELL", "nc -z 127.0.0.1 3002"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+      start_period: 10s
+
+  rybbit_backend:
+    image: 'ghcr.io/rybbit-io/rybbit-backend:v1.6.1'
+    environment:
+      - NODE_ENV=production
+      - TRUST_PROXY=true
+      - 'BASE_URL=${SERVICE_URL_RYBBIT}'
+      # --- Coolify-Managed Secrets ---
+      - 'CLICKHOUSE_PASSWORD=${SERVICE_PASSWORD_CLICKHOUSE}'
+      - 'POSTGRES_PASSWORD=${SERVICE_PASSWORD_POSTGRES}'
+      - 'BETTER_AUTH_SECRET=${SERVICE_BASE64_64_BACKEND}'
+      # --- User Settings ---
+      - 'DISABLE_SIGNUP=${DISABLE_SIGNUP:-false}'
+      - 'DISABLE_TELEMETRY=${DISABLE_TELEMETRY:-true}'
+      # --- Internal Config ---
+      - 'CLICKHOUSE_HOST=http://rybbit_clickhouse:8123'
+      - 'CLICKHOUSE_USER=${CLICKHOUSE_USER:-default}'
+      - 'CLICKHOUSE_DB=${CLICKHOUSE_DB:-analytics}'
+      - POSTGRES_HOST=rybbit_postgres
+      - POSTGRES_PORT=5432
+      - 'POSTGRES_DB=${POSTGRES_DB:-analytics}'
+      - 'POSTGRES_USER=${POSTGRES_USER:-frog}'
+    depends_on:
+      rybbit_clickhouse:
+        condition: service_healthy
+      rybbit_postgres:
+        condition: service_healthy
+    healthcheck:
+      test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://127.0.0.1:3001/api/health"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+      start_period: 10s
+
+  rybbit_postgres:
+    image: 'postgres:17.4'
+    environment:
+      - 'POSTGRES_DB=${POSTGRES_DB:-analytics}'
+      - 'POSTGRES_USER=${POSTGRES_USER:-frog}'
+      - 'POSTGRES_PASSWORD=${SERVICE_PASSWORD_POSTGRES}'
+    volumes:
+      - 'postgres_data:/var/lib/postgresql/data'
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+
+  rybbit_clickhouse:
+    image: 'clickhouse/clickhouse-server:25.4.2'
+    environment:
+      - 'CLICKHOUSE_DB=${CLICKHOUSE_DB:-analytics}'
+      - 'CLICKHOUSE_USER=${CLICKHOUSE_USER:-default}'
+      - 'CLICKHOUSE_PASSWORD=${SERVICE_PASSWORD_CLICKHOUSE}'
+    healthcheck:
+      test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://localhost:8123/ping"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+      start_period: 10s
+    volumes:
+      - 'clickhouse_data:/var/lib/clickhouse'
+      - type: bind
+        source: ./clickhouse_config/enable_json.xml
+        target: /etc/clickhouse-server/config.d/enable_json.xml
+        content: |
+          <clickhouse>
+              <settings>
+                  <enable_json_type>1</enable_json_type>
+              </settings>
+          </clickhouse>
+      - type: bind
+        source: ./clickhouse_config/logging_rules.xml
+        target: /etc/clickhouse-server/config.d/logging_rules.xml
+        content: |
+          <clickhouse>
+              <logger>
+                  <level>warning</level>
+                  <console>true</console>
+              </logger>
+              <query_thread_log remove="remove"/>
+              <query_log remove="remove"/>
+              <text_log remove="remove"/>
+              <trace_log remove="remove"/>
+              <metric_log remove="remove"/>
+              <asynchronous_metric_log remove="remove"/>
+              <session_log remove="remove"/>
+              <part_log remove="remove"/>
+              <latency_log remove="remove"/>
+              <processors_profile_log remove="remove"/>
+          </clickhouse>
+      - type: bind
+        source: ./clickhouse_config/network.xml
+        target: /etc/clickhouse-server/config.d/network.xml
+        content: |
+          <clickhouse>
+              <listen_host>0.0.0.0</listen_host>
+          </clickhouse>
+      - type: bind
+        source: ./clickhouse_config/user_logging.xml
+        target: /etc/clickhouse-server/config.d/user_logging.xml
+        content: |
+          <clickhouse>
+              <profiles>
+                  <default>
+                      <log_queries>0</log_queries>
+                      <log_query_threads>0</log_query_threads>
+                      <log_processors_profiles>0</log_processors_profiles>
+                  </default>
+              </profiles>
+          </clickhouse>
\ No newline at end of file