diff --git a/src/routes/(console)/project-[project]/sites/create-site/manual/+page.svelte b/src/routes/(console)/project-[project]/sites/create-site/manual/+page.svelte
index cadd541ba..2e2e3dafb 100644
--- a/src/routes/(console)/project-[project]/sites/create-site/manual/+page.svelte
+++ b/src/routes/(console)/project-[project]/sites/create-site/manual/+page.svelte
@@ -98,7 +98,22 @@
                 undefined
             );
 
-            trackEvent(Submit.SiteCreate, {});
+            trackEvent(Submit.SiteCreate, {
+                source: 'manual',
+                framework: framework.key
+            });
+
+            //Add variables
+            await Promise.all(
+                Object.keys(variables).map(async (key) => {
+                    await sdk.forProject.sites.createVariable(
+                        site.$id,
+                        key,
+                        variables[key].value,
+                        variables[key].secret
+                    );
+                })
+            );
 
             const { deployments } = await sdk.forProject.sites.listDeployments(site.$id, [
                 Query.limit(1)
diff --git a/src/routes/(console)/project-[project]/sites/create-site/repositories/repository-[repository]/+page.svelte b/src/routes/(console)/project-[project]/sites/create-site/repositories/repository-[repository]/+page.svelte
index 5992a01e1..b8fd6b47c 100644
--- a/src/routes/(console)/project-[project]/sites/create-site/repositories/repository-[repository]/+page.svelte
+++ b/src/routes/(console)/project-[project]/sites/create-site/repositories/repository-[repository]/+page.svelte
@@ -83,8 +83,22 @@
                 silentMode,
                 rootDir
             );
+            trackEvent(Submit.SiteCreate, {
+                source: 'repository',
+                framework: framework.key
+            });
 
-            trackEvent(Submit.SiteCreate, {});
+            //Add variables
+            await Promise.all(
+                Object.keys(variables).map(async (key) => {
+                    await sdk.forProject.sites.createVariable(
+                        site.$id,
+                        key,
+                        variables[key].value,
+                        variables[key].secret
+                    );
+                })
+            );
 
             const { deployments } = await sdk.forProject.sites.listDeployments(site.$id, [
                 Query.limit(1)
diff --git a/src/routes/(console)/project-[project]/sites/create-site/templates/template-[template]/+page.svelte b/src/routes/(console)/project-[project]/sites/create-site/templates/template-[template]/+page.svelte
index 93cc529dc..90697d3f8 100644
--- a/src/routes/(console)/project-[project]/sites/create-site/templates/template-[template]/+page.svelte
+++ b/src/routes/(console)/project-[project]/sites/create-site/templates/template-[template]/+page.svelte
@@ -147,9 +147,23 @@
                 );
 
                 trackEvent(Submit.SiteCreate, {
-                    source: 'template'
+                    source: 'template',
+                    framework: framework.key,
+                    template: data.template.name
                 });
 
+                //Add variables
+                await Promise.all(
+                    Object.keys(variables).map(async (key) => {
+                        await sdk.forProject.sites.createVariable(
+                            site.$id,
+                            key,
+                            variables[key].value,
+                            variables[key].secret
+                        );
+                    })
+                );
+
                 const { deployments } = await sdk.forProject.sites.listDeployments(site.$id, [
                     Query.limit(1)
                 ]);