diff --git a/infra/email.ts b/infra/email.ts
index 33acca19..70a3f381 100644
--- a/infra/email.ts
+++ b/infra/email.ts
@@ -1,6 +1,6 @@
 import { domain } from "./dns";
 
-// export const email = new sst.aws.Email("Mail",{
-//     sender: domain,
-//     dns: sst.cloudflare.dns(),
-// })
\ No newline at end of file
+export const email = new sst.aws.Email("Email",{
+    sender: domain,
+    dns: sst.cloudflare.dns(),
+})
\ No newline at end of file
diff --git a/packages/functions/sst-env.d.ts b/packages/functions/sst-env.d.ts
index b3ba1db8..c1463f67 100644
--- a/packages/functions/sst-env.d.ts
+++ b/packages/functions/sst-env.d.ts
@@ -28,6 +28,17 @@ declare module "sst" {
       "name": string
       "type": "sst.aws.Bus"
     }
+    "Database": {
+      "clusterArn": string
+      "database": string
+      "host": string
+      "password": string
+      "port": number
+      "reader": string
+      "secretArn": string
+      "type": "sst.aws.Aurora"
+      "username": string
+    }
     "DatabaseMigrator": {
       "name": string
       "type": "sst.aws.Function"
@@ -40,6 +51,11 @@ declare module "sst" {
       "type": "sst.sst.Secret"
       "value": string
     }
+    "Email": {
+      "configSet": string
+      "sender": string
+      "type": "sst.aws.Email"
+    }
     "GithubClientID": {
       "type": "sst.sst.Secret"
       "value": string
@@ -48,30 +64,10 @@ declare module "sst" {
       "type": "sst.sst.Secret"
       "value": string
     }
-    "Mail": {
-      "configSet": string
-      "sender": string
-      "type": "sst.aws.Email"
-    }
-    "NestriVpc": {
-      "bastion": string
-      "type": "sst.aws.Vpc"
-    }
     "PolarSecret": {
       "type": "sst.sst.Secret"
       "value": string
     }
-    "Postgres": {
-      "clusterArn": string
-      "database": string
-      "host": string
-      "password": string
-      "port": number
-      "reader": string
-      "secretArn": string
-      "type": "sst.aws.Aurora"
-      "username": string
-    }
     "Steam": {
       "service": string
       "type": "sst.aws.Service"
@@ -87,6 +83,10 @@ declare module "sst" {
       "site": string
       "type": "sst.sst.Linkable"
     }
+    "VPC": {
+      "bastion": string
+      "type": "sst.aws.Vpc"
+    }
     "Web": {
       "type": "sst.aws.StaticSite"
       "url": string
diff --git a/sst-env.d.ts b/sst-env.d.ts
index b3ba1db8..c1463f67 100644
--- a/sst-env.d.ts
+++ b/sst-env.d.ts
@@ -28,6 +28,17 @@ declare module "sst" {
       "name": string
       "type": "sst.aws.Bus"
     }
+    "Database": {
+      "clusterArn": string
+      "database": string
+      "host": string
+      "password": string
+      "port": number
+      "reader": string
+      "secretArn": string
+      "type": "sst.aws.Aurora"
+      "username": string
+    }
     "DatabaseMigrator": {
       "name": string
       "type": "sst.aws.Function"
@@ -40,6 +51,11 @@ declare module "sst" {
       "type": "sst.sst.Secret"
       "value": string
     }
+    "Email": {
+      "configSet": string
+      "sender": string
+      "type": "sst.aws.Email"
+    }
     "GithubClientID": {
       "type": "sst.sst.Secret"
       "value": string
@@ -48,30 +64,10 @@ declare module "sst" {
       "type": "sst.sst.Secret"
       "value": string
     }
-    "Mail": {
-      "configSet": string
-      "sender": string
-      "type": "sst.aws.Email"
-    }
-    "NestriVpc": {
-      "bastion": string
-      "type": "sst.aws.Vpc"
-    }
     "PolarSecret": {
       "type": "sst.sst.Secret"
       "value": string
     }
-    "Postgres": {
-      "clusterArn": string
-      "database": string
-      "host": string
-      "password": string
-      "port": number
-      "reader": string
-      "secretArn": string
-      "type": "sst.aws.Aurora"
-      "username": string
-    }
     "Steam": {
       "service": string
       "type": "sst.aws.Service"
@@ -87,6 +83,10 @@ declare module "sst" {
       "site": string
       "type": "sst.sst.Linkable"
     }
+    "VPC": {
+      "bastion": string
+      "type": "sst.aws.Vpc"
+    }
     "Web": {
       "type": "sst.aws.StaticSite"
       "url": string