diff --git a/apps/dokploy/public/templates/conduit.svg b/apps/dokploy/public/templates/conduit.svg
new file mode 100644
index 00000000..aa7a352c
--- /dev/null
+++ b/apps/dokploy/public/templates/conduit.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="windows-1252"?>
+<!-- Generator: Adobe Illustrator 18.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_2" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
+<path fill="#FFB636" d="M459.866,218.346l-186.7,0.701c-4.619,0.017-7.618-4.861-5.517-8.975L370.845,8.024  c3.103-6.075-4.493-11.949-9.592-7.417L39.948,286.141c-4.221,3.751-1.602,10.732,4.045,10.78l170.444,1.457  c4.443,0.038,7.391,4.619,5.583,8.679L133.317,501.73c-2.688,6.035,4.709,11.501,9.689,7.16l320.937-279.725  C468.25,225.412,465.58,218.325,459.866,218.346z"/>
+</svg>
\ No newline at end of file
diff --git a/apps/dokploy/templates/conduit/docker-compose.yml b/apps/dokploy/templates/conduit/docker-compose.yml
new file mode 100644
index 00000000..f2f1fb34
--- /dev/null
+++ b/apps/dokploy/templates/conduit/docker-compose.yml
@@ -0,0 +1,31 @@
+# From Conduit's official documentation: https://docs.conduit.rs/deploying/docker.html#docker-compose
+version: '3'
+
+services:
+    homeserver:
+        image: registry.gitlab.com/famedly/conduit/matrix-conduit:v0.9.0
+        restart: unless-stopped
+        volumes:
+            - db:/var/lib/matrix-conduit/
+        networks:
+            - dokploy-network
+        environment:
+            CONDUIT_SERVER_NAME: ${MATRIX_SUBDOMAIN}
+            CONDUIT_DATABASE_PATH: /var/lib/matrix-conduit/
+            CONDUIT_DATABASE_BACKEND: rocksdb
+            CONDUIT_PORT: 6167
+            CONDUIT_MAX_REQUEST_SIZE: 20000000 # in bytes, ~20 MB
+            CONDUIT_ALLOW_REGISTRATION: 'true'
+            #CONDUIT_REGISTRATION_TOKEN: '' # require password for registration
+            CONDUIT_ALLOW_FEDERATION: 'true'
+            CONDUIT_ALLOW_CHECK_FOR_UPDATES: 'true'
+            CONDUIT_TRUSTED_SERVERS: '["matrix.org"]'
+            #CONDUIT_MAX_CONCURRENT_REQUESTS: 100
+            CONDUIT_ADDRESS: 0.0.0.0
+            CONDUIT_CONFIG: '' # Ignore this
+volumes:
+    db:
+
+networks:
+  dokploy-network:
+    external: true
diff --git a/apps/dokploy/templates/conduit/index.ts b/apps/dokploy/templates/conduit/index.ts
new file mode 100644
index 00000000..2b9a81ae
--- /dev/null
+++ b/apps/dokploy/templates/conduit/index.ts
@@ -0,0 +1,28 @@
+// EXAMPLE
+import {
+	type DomainSchema,
+	type Schema,
+	type Template,
+	generateRandomDomain,
+} from "../utils";
+
+export function generate(schema: Schema): Template {
+	const matrixSubdomain = generateRandomDomain(schema);
+
+	const domains: DomainSchema[] = [
+		{
+			host: matrixSubdomain,
+			port: 6167,
+			serviceName: "homeserver",
+		},
+	];
+
+	const envs = [
+		`MATRIX_SUBDOMAIN=${matrixSubdomain} # Replace by your server name`,
+	];
+
+	return {
+		envs,
+		domains,
+	};
+}
diff --git a/apps/dokploy/templates/templates.ts b/apps/dokploy/templates/templates.ts
index aa34ecfe..1060a664 100644
--- a/apps/dokploy/templates/templates.ts
+++ b/apps/dokploy/templates/templates.ts
@@ -1209,4 +1209,19 @@ export const templates: TemplateData[] = [
 		tags: ["api", "backend", "pdf", "tools"],
 		load: () => import("./gotenberg/index").then((m) => m.generate),
 	},
+	{
+		id: "conduit",
+		name: "Conduit",
+		version: "v0.9.0",
+		description:
+			"Conduit is a simple, fast and reliable chat server powered by Matrix",
+		logo: "conduit.svg",
+		links: {
+			github: "https://gitlab.com/famedly/conduit",
+			website: "https://conduit.rs/",
+			docs: "https://docs.conduit.rs/",
+		},
+		tags: ["matrix", "communication"],
+		load: () => import("./conduit/index").then((m) => m.generate),
+	},
 ];