diff --git a/apps/api/src/lib.ts b/apps/api/src/lib.ts
index dced7c145..07a7445b0 100644
--- a/apps/api/src/lib.ts
+++ b/apps/api/src/lib.ts
@@ -15,6 +15,7 @@ export async function migrateServicesToNewTemplate() {
             if (service.type === 'ghost' && service.ghost) await ghost(service)
             if (service.type === 'meilisearch' && service.meiliSearch) await meilisearch(service)
             if (service.type === 'umami' && service.umami) await umami(service)
+            if (service.type === 'hasura' && service.hasura) await hasura(service)
             await createVolumes(service);
         }
     } catch (error) {
@@ -22,6 +23,24 @@ export async function migrateServicesToNewTemplate() {
 
     }
 }
+async function hasura(service: any) {
+    const { postgresqlUser, postgresqlPassword, postgresqlDatabase, graphQLAdminPassword } = service.hasura
+
+    const secrets = [
+        `HASURA_GRAPHQL_ADMIN_PASSWORD@@@${graphQLAdminPassword}`,
+        `HASURA_GRAPHQL_METADATA_DATABASE_URL@@@${encrypt(`postgres://${postgresqlUser}:${decrypt(postgresqlPassword)}@$$generate_fqdn:5432/${postgresqlDatabase}`)}`,
+        `POSTGRES_PASSWORD@@@${postgresqlPassword}`,
+    ]
+    const settings = [
+        `POSTGRES_USER@@@${postgresqlUser}`,
+        `POSTGRES_DB@@@${postgresqlDatabase}`,
+    ]
+    await migrateSecrets(secrets, service);
+    await migrateSettings(settings, service);
+
+    // Remove old service data
+    // await prisma.service.update({ where: { id: service.id }, data: { wordpress: { delete: true } } })
+}
 async function umami(service: any) {
     const { postgresqlUser, postgresqlPassword, postgresqlDatabase, umamiAdminPassword, hashSalt } = service.umami
 
@@ -30,10 +49,9 @@ async function umami(service: any) {
         `HASH_SALT@@@${hashSalt}`,
         `POSTGRES_PASSWORD@@@${postgresqlPassword}`,
         `ADMIN_PASSWORD@@@${umamiAdminPassword}`,
-
+        `DATABASE_URL@@@${encrypt(`postgres://${postgresqlUser}:${decrypt(postgresqlPassword)}@$$generate_fqdn:5432/${postgresqlDatabase}`)}`,
     ]
     const settings = [
-        `DATABASE_URL@@@${encrypt(`postgres://${postgresqlUser}:${decrypt(postgresqlPassword)}@$$generate_fqdn:5432/${postgresqlDatabase}`)}`,
         `POSTGRES_USER@@@${postgresqlUser}`,
         `POSTGRES_DB@@@${postgresqlDatabase}`,
     ]
diff --git a/apps/api/src/lib/templates.ts b/apps/api/src/lib/templates.ts
index 3ee20c84c..d175e6a0d 100644
--- a/apps/api/src/lib/templates.ts
+++ b/apps/api/src/lib/templates.ts
@@ -1,4 +1,79 @@
 export default [
+    {
+        "templateVersion": "1.0.0",
+        "serviceDefaultVersion": "v2.13.0",
+        "name": "hasura",
+        "displayName": "Hasura",
+        "description": "Instant realtime GraphQL APIs on any Postgres application, existing or new.",
+        "services": {
+            "$$id": {
+                "name": "Hasura",
+                "depends_on": [
+                    "$$id-postgresql"
+                ],
+                "image": "hasura/graphql-engine:$$core_version",
+                "volumes": [],
+                "environment": [
+                    "HASURA_GRAPHQL_METADATA_DATABASE_URL=$$secret_hasura_metadata_database_url",
+                    "HASURA_GRAPHQL_ADMIN_PASSWORD=$$secret_hasura_admin_password",
+                ],
+                "ports": [
+                    "8080"
+                ]
+            },
+            "$$id-postgresql": {
+                "name": "PostgreSQL",
+                "depends_on": [],
+                "image": "postgres:12-alpine",
+                "volumes": [
+                    "$$id-postgresql-data:/var/lib/postgresql/data",
+                ],
+                "environment": [
+                    "POSTGRES_USER=$$config_postgres_user",
+                    "POSTGRES_PASSWORD=$$secret_postgres_password",
+                    "POSTGRES_DB=$$config_postgres_db",
+                ],
+                "ports": []
+            }
+        },
+        "variables": [
+            {
+                "id": "$$secret_hasura_metadata_database_url",
+                "name": "HASURA_GRAPHQL_METADATA_DATABASE_URL",
+                "label": "Hasura Metadata Database URL",
+                "defaultValue": "postgresql://$$config_postgres_user:$$secret_postgres_password@$$id-postgresql:5432/$$config_postgres_db",
+                "description": ""
+            },
+            {
+                "id": "$$secret_hasura_admin_password",
+                "name": "HASURA_GRAPHQL_ADMIN_PASSWORD",
+                "label": "Hasura Admin Password",
+                "defaultValue": "$$generate_password",
+                "description": ""
+            },
+            {
+                "id": "$$config_postgres_user",
+                "name": "POSTGRES_USER",
+                "label": "PostgreSQL User",
+                "defaultValue": "$$generate_username",
+                "description": "",
+            },
+            {
+                "id": "$$secret_postgres_password",
+                "name": "POSTGRES_PASSWORD",
+                "label": "PostgreSQL Password",
+                "defaultValue": "$$generate_password",
+                "description": "",
+            },
+            {
+                "id": "$$config_postgres_db",
+                "name": "POSTGRES_DB",
+                "label": "PostgreSQL Database",
+                "defaultValue": "hasura",
+                "description": "",
+            },
+        ]
+    },
     {
         "templateVersion": "1.0.0",
         "serviceDefaultVersion": "postgresql-v1.38.0",
@@ -223,7 +298,7 @@ export default [
             {
                 "id": "$$secret_admin_password",
                 "name": "ADMIN_PASSWORD",
-                "label": "Admin Password",
+                "label": "Initial Admin Password",
                 "defaultValue": "$$generate_password",
                 "description": "",
                 "extras": {