diff --git a/packages/app-store/apps.browser.generated.tsx b/packages/app-store/apps.browser.generated.tsx
index 4dd1597af4..d483e35122 100644
--- a/packages/app-store/apps.browser.generated.tsx
+++ b/packages/app-store/apps.browser.generated.tsx
@@ -23,7 +23,7 @@ export const EventTypeAddonMap = {
   fathom: dynamic(() => import("./fathom/components/EventTypeAppCardInterface")),
   ga4: dynamic(() => import("./ga4/components/EventTypeAppCardInterface")),
   giphy: dynamic(() => import("./giphy/components/EventTypeAppCardInterface")),
-  "google-tag-manager": dynamic(() => import("./google-tag-manager/components/EventTypeAppCardInterface")),
+  gtm: dynamic(() => import("./gtm/components/EventTypeAppCardInterface")),
   plausible: dynamic(() => import("./plausible/components/EventTypeAppCardInterface")),
   qr_code: dynamic(() => import("./qr_code/components/EventTypeAppCardInterface")),
   rainbow: dynamic(() => import("./rainbow/components/EventTypeAppCardInterface")),
diff --git a/packages/app-store/apps.keys-schemas.generated.ts b/packages/app-store/apps.keys-schemas.generated.ts
index b2dc90884c..403584009b 100644
--- a/packages/app-store/apps.keys-schemas.generated.ts
+++ b/packages/app-store/apps.keys-schemas.generated.ts
@@ -6,8 +6,8 @@ import { appKeysSchema as dailyvideo_zod_ts } from "./dailyvideo/zod";
 import { appKeysSchema as fathom_zod_ts } from "./fathom/zod";
 import { appKeysSchema as ga4_zod_ts } from "./ga4/zod";
 import { appKeysSchema as giphy_zod_ts } from "./giphy/zod";
-import { appKeysSchema as google_tag_manager_zod_ts } from "./google-tag-manager/zod";
 import { appKeysSchema as googlecalendar_zod_ts } from "./googlecalendar/zod";
+import { appKeysSchema as gtm_zod_ts } from "./gtm/zod";
 import { appKeysSchema as hubspot_zod_ts } from "./hubspot/zod";
 import { appKeysSchema as larkcalendar_zod_ts } from "./larkcalendar/zod";
 import { appKeysSchema as office365calendar_zod_ts } from "./office365calendar/zod";
@@ -31,8 +31,8 @@ export const appKeysSchemas = {
   fathom: fathom_zod_ts,
   ga4: ga4_zod_ts,
   giphy: giphy_zod_ts,
-  "google-tag-manager": google_tag_manager_zod_ts,
   googlecalendar: googlecalendar_zod_ts,
+  gtm: gtm_zod_ts,
   hubspot: hubspot_zod_ts,
   larkcalendar: larkcalendar_zod_ts,
   office365calendar: office365calendar_zod_ts,
diff --git a/packages/app-store/apps.metadata.generated.ts b/packages/app-store/apps.metadata.generated.ts
index 8e10507fdd..f0da2045b3 100644
--- a/packages/app-store/apps.metadata.generated.ts
+++ b/packages/app-store/apps.metadata.generated.ts
@@ -18,9 +18,9 @@ import facetime_config_json from "./facetime/config.json";
 import fathom_config_json from "./fathom/config.json";
 import ga4_config_json from "./ga4/config.json";
 import { metadata as giphy__metadata_ts } from "./giphy/_metadata";
-import google_tag_manager_config_json from "./google-tag-manager/config.json";
 import { metadata as googlecalendar__metadata_ts } from "./googlecalendar/_metadata";
 import { metadata as googlevideo__metadata_ts } from "./googlevideo/_metadata";
+import gtm_config_json from "./gtm/config.json";
 import { metadata as hubspot__metadata_ts } from "./hubspot/_metadata";
 import { metadata as huddle01video__metadata_ts } from "./huddle01video/_metadata";
 import { metadata as jitsivideo__metadata_ts } from "./jitsivideo/_metadata";
@@ -79,9 +79,9 @@ export const appStoreMetadata = {
   fathom: fathom_config_json,
   ga4: ga4_config_json,
   giphy: giphy__metadata_ts,
-  "google-tag-manager": google_tag_manager_config_json,
   googlecalendar: googlecalendar__metadata_ts,
   googlevideo: googlevideo__metadata_ts,
+  gtm: gtm_config_json,
   hubspot: hubspot__metadata_ts,
   huddle01video: huddle01video__metadata_ts,
   jitsivideo: jitsivideo__metadata_ts,
diff --git a/packages/app-store/apps.schemas.generated.ts b/packages/app-store/apps.schemas.generated.ts
index e72d373ba1..d9d55a918a 100644
--- a/packages/app-store/apps.schemas.generated.ts
+++ b/packages/app-store/apps.schemas.generated.ts
@@ -6,8 +6,8 @@ import { appDataSchema as dailyvideo_zod_ts } from "./dailyvideo/zod";
 import { appDataSchema as fathom_zod_ts } from "./fathom/zod";
 import { appDataSchema as ga4_zod_ts } from "./ga4/zod";
 import { appDataSchema as giphy_zod_ts } from "./giphy/zod";
-import { appDataSchema as google_tag_manager_zod_ts } from "./google-tag-manager/zod";
 import { appDataSchema as googlecalendar_zod_ts } from "./googlecalendar/zod";
+import { appDataSchema as gtm_zod_ts } from "./gtm/zod";
 import { appDataSchema as hubspot_zod_ts } from "./hubspot/zod";
 import { appDataSchema as larkcalendar_zod_ts } from "./larkcalendar/zod";
 import { appDataSchema as office365calendar_zod_ts } from "./office365calendar/zod";
@@ -31,8 +31,8 @@ export const appDataSchemas = {
   fathom: fathom_zod_ts,
   ga4: ga4_zod_ts,
   giphy: giphy_zod_ts,
-  "google-tag-manager": google_tag_manager_zod_ts,
   googlecalendar: googlecalendar_zod_ts,
+  gtm: gtm_zod_ts,
   hubspot: hubspot_zod_ts,
   larkcalendar: larkcalendar_zod_ts,
   office365calendar: office365calendar_zod_ts,
diff --git a/packages/app-store/apps.server.generated.ts b/packages/app-store/apps.server.generated.ts
index 1f46fbd5af..87df8e62fc 100644
--- a/packages/app-store/apps.server.generated.ts
+++ b/packages/app-store/apps.server.generated.ts
@@ -18,9 +18,9 @@ export const apiHandlers = {
   fathom: import("./fathom/api"),
   ga4: import("./ga4/api"),
   giphy: import("./giphy/api"),
-  "google-tag-manager": import("./google-tag-manager/api"),
   googlecalendar: import("./googlecalendar/api"),
   googlevideo: import("./googlevideo/api"),
+  gtm: import("./gtm/api"),
   hubspot: import("./hubspot/api"),
   huddle01video: import("./huddle01video/api"),
   jitsivideo: import("./jitsivideo/api"),
diff --git a/packages/app-store/google-tag-manager/config.json b/packages/app-store/google-tag-manager/config.json
deleted file mode 100644
index 98a2c186b4..0000000000
--- a/packages/app-store/google-tag-manager/config.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "name": "Google Tag Manager",
-  "slug": "google-tag-manager",
-  "type": "google-tag-manager_analytics",
-  "imageSrc": "icon.svg",
-  "logo": "icon.svg",
-  "url": "https://tagmanager.google.com",
-  "variant": "analytics",
-  "categories": [
-    "analytics"
-  ],
-  "publisher": "Black Lemon",
-  "email": "support@blacklemon.dk",
-  "description": "App to install Google Tag Manager",
-  "extendsFeature": "EventType",
-  "appData": {
-    "tag": {
-      "scripts": [
-        {
-          "content":"(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src='https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);})(window,document,'script','dataLayer','GTM-{TRACKING_ID}');"
-        }
-      ]
-    }
-  },
-  "isTemplate": false,
-  "__createdUsingCli": true,
-  "__template": "booking-pages-tag"
-}
\ No newline at end of file
diff --git a/packages/app-store/google-tag-manager/static/1.jpeg b/packages/app-store/google-tag-manager/static/1.jpeg
deleted file mode 100644
index d3ba68492d..0000000000
Binary files a/packages/app-store/google-tag-manager/static/1.jpeg and /dev/null differ
diff --git a/packages/app-store/google-tag-manager/static/icon.svg b/packages/app-store/google-tag-manager/static/icon.svg
deleted file mode 100644
index 262d8167e1..0000000000
--- a/packages/app-store/google-tag-manager/static/icon.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 122.87 122.89"><defs><style>.cls-1{fill:#8ab4f8;}.cls-2{fill:#4285f4;}.cls-3{fill:#246fdb;}</style></defs><title>google-tag-manager</title><polygon class="cls-1" points="72.13 118.22 50.8 96.86 96.63 50.56 118.35 72.28 72.13 118.22 72.13 118.22"/><path class="cls-2" d="M72.29,26.23,50.56,4.5,4.5,50.56a15.35,15.35,0,0,0,0,21.71h0l46.06,46.06,21.31-21.4L37.07,61.45,72.29,26.23Z"/><path class="cls-1" d="M118.35,50.56,72.29,4.5A15.36,15.36,0,0,0,50.56,26.22L96.65,72.28a15.36,15.36,0,0,0,21.72-21.72Z"/><path class="cls-3" d="M76.48,107.66a15.23,15.23,0,1,0-15.22,15.23,15.22,15.22,0,0,0,15.22-15.23Z"/></svg>
\ No newline at end of file
diff --git a/packages/app-store/gtm/DESCRIPTION.md b/packages/app-store/gtm/DESCRIPTION.md
new file mode 100644
index 0000000000..713cc5ee34
--- /dev/null
+++ b/packages/app-store/gtm/DESCRIPTION.md
@@ -0,0 +1,7 @@
+---
+items:
+  - 1.jpg
+  - 2.jpg
+---
+
+App to install Google Tag Manager. Google Tag Manager is a tag management system that has the same functionality as the Google tag and lets you configure and instantly deploy tags on your website or mobile app from an easy-to-use web-based interface.
diff --git a/packages/app-store/google-tag-manager/api/add.ts b/packages/app-store/gtm/api/add.ts
similarity index 100%
rename from packages/app-store/google-tag-manager/api/add.ts
rename to packages/app-store/gtm/api/add.ts
diff --git a/packages/app-store/google-tag-manager/api/index.ts b/packages/app-store/gtm/api/index.ts
similarity index 100%
rename from packages/app-store/google-tag-manager/api/index.ts
rename to packages/app-store/gtm/api/index.ts
diff --git a/packages/app-store/google-tag-manager/components/EventTypeAppCardInterface.tsx b/packages/app-store/gtm/components/EventTypeAppCardInterface.tsx
similarity index 100%
rename from packages/app-store/google-tag-manager/components/EventTypeAppCardInterface.tsx
rename to packages/app-store/gtm/components/EventTypeAppCardInterface.tsx
diff --git a/packages/app-store/gtm/config.json b/packages/app-store/gtm/config.json
new file mode 100644
index 0000000000..8560bf05fc
--- /dev/null
+++ b/packages/app-store/gtm/config.json
@@ -0,0 +1,26 @@
+{
+  "name": "Google Tag Manager",
+  "slug": "gtm",
+  "type": "gtm_analytics",
+  "imageSrc": "icon.svg",
+  "logo": "icon.svg",
+  "url": "https://tagmanager.google.com",
+  "variant": "analytics",
+  "categories": ["analytics"],
+  "publisher": "Black Lemon",
+  "email": "support@blacklemon.dk",
+  "description": "App to install Google Tag Manager",
+  "extendsFeature": "EventType",
+  "appData": {
+    "tag": {
+      "scripts": [
+        {
+          "content": "(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src='https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);})(window,document,'script','dataLayer','GTM-{TRACKING_ID}');"
+        }
+      ]
+    }
+  },
+  "isTemplate": false,
+  "__createdUsingCli": true,
+  "__template": "booking-pages-tag"
+}
diff --git a/packages/app-store/google-tag-manager/index.ts b/packages/app-store/gtm/index.ts
similarity index 100%
rename from packages/app-store/google-tag-manager/index.ts
rename to packages/app-store/gtm/index.ts
diff --git a/packages/app-store/google-tag-manager/package.json b/packages/app-store/gtm/package.json
similarity index 87%
rename from packages/app-store/google-tag-manager/package.json
rename to packages/app-store/gtm/package.json
index 22238d43b7..d0481ec20b 100644
--- a/packages/app-store/google-tag-manager/package.json
+++ b/packages/app-store/gtm/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "private": true,
-  "name": "@calcom/google-tag-manager",
+  "name": "@calcom/gtm",
   "version": "0.0.0",
   "main": "./index.ts",
   "dependencies": {
diff --git a/packages/app-store/gtm/static/1.jpg b/packages/app-store/gtm/static/1.jpg
new file mode 100644
index 0000000000..31f552b771
Binary files /dev/null and b/packages/app-store/gtm/static/1.jpg differ
diff --git a/packages/app-store/gtm/static/2.jpg b/packages/app-store/gtm/static/2.jpg
new file mode 100644
index 0000000000..c485a39664
Binary files /dev/null and b/packages/app-store/gtm/static/2.jpg differ
diff --git a/packages/app-store/gtm/static/icon.svg b/packages/app-store/gtm/static/icon.svg
new file mode 100644
index 0000000000..6e811c338b
--- /dev/null
+++ b/packages/app-store/gtm/static/icon.svg
@@ -0,0 +1,13 @@
+<svg width="123" height="123" viewBox="0 0 123 123" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1_2)">
+<path d="M72.13 118.22L50.8 96.86L96.63 50.56L118.35 72.28L72.13 118.22Z" fill="#8AB4F8"/>
+<path d="M72.29 26.23L50.56 4.5L4.5 50.56C3.07435 51.9854 1.94344 53.6777 1.17187 55.5402C0.400302 57.4027 0.00317764 59.399 0.00317764 61.415C0.00317764 63.431 0.400302 65.4273 1.17187 67.2898C1.94344 69.1523 3.07435 70.8446 4.5 72.27L50.56 118.33L71.87 96.93L37.07 61.45L72.29 26.23Z" fill="#4285F4"/>
+<path d="M118.35 50.56L72.29 4.5C69.4097 1.61842 65.5028 -0.000957846 61.4285 -0.0018955C57.3543 -0.00283315 53.4466 1.61475 50.565 4.495C47.6834 7.37525 46.064 11.2822 46.0631 15.3565C46.0622 19.4307 47.6798 23.3384 50.56 26.22L96.65 72.28C99.5445 75.0911 103.429 76.6503 107.464 76.6208C111.498 76.5914 115.359 74.9755 118.212 72.1224C121.065 69.2693 122.681 65.4082 122.711 61.3735C122.74 57.3388 121.181 53.4545 118.37 50.56H118.35Z" fill="#8AB4F8"/>
+<path d="M76.48 107.66C76.48 104.647 75.5865 101.702 73.9126 99.1976C72.2386 96.6928 69.8595 94.7408 67.076 93.5884C64.2925 92.4359 61.2297 92.1349 58.2751 92.7234C55.3205 93.3118 52.6068 94.7633 50.4772 96.8943C48.3477 99.0253 46.8979 101.74 46.3114 104.695C45.7249 107.65 46.0279 110.712 47.1822 113.495C48.3364 116.278 50.2901 118.656 52.7959 120.328C55.3018 122 58.2474 122.892 61.26 122.89C63.2596 122.89 65.2395 122.496 67.0868 121.73C68.934 120.965 70.6123 119.843 72.0257 118.429C73.4391 117.014 74.56 115.335 75.3243 113.488C76.0886 111.64 76.4813 109.66 76.48 107.66Z" fill="#246FDB"/>
+</g>
+<defs>
+<clipPath id="clip0_1_2">
+<rect width="122.87" height="122.89" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/packages/app-store/google-tag-manager/zod.ts b/packages/app-store/gtm/zod.ts
similarity index 100%
rename from packages/app-store/google-tag-manager/zod.ts
rename to packages/app-store/gtm/zod.ts
diff --git a/packages/app-store/sylapsvideo/DESCRIPTION.md b/packages/app-store/sylapsvideo/DESCRIPTION.md
index 4468f41f64..683c7f4cb3 100644
--- a/packages/app-store/sylapsvideo/DESCRIPTION.md
+++ b/packages/app-store/sylapsvideo/DESCRIPTION.md
@@ -1,6 +1,6 @@
 ---
 items:
-  - /api/app-store/sylaps/sylaps1.png
+  - 1.jpg
 ---
 
 Free Audio and Video Conferencing, Online Collaboration, Screen Sharing on web browser, mobile and desktop.
diff --git a/packages/app-store/sylapsvideo/config.json b/packages/app-store/sylapsvideo/config.json
index e7ed99d558..4e0f836aed 100644
--- a/packages/app-store/sylapsvideo/config.json
+++ b/packages/app-store/sylapsvideo/config.json
@@ -2,7 +2,7 @@
   "/*": "Don't modify slug - If required, do it using cli edit command",
   "name": "Sylaps",
   "title": "Sylaps",
-  "slug": "sylaps",
+  "slug": "sylapsvideo",
   "type": "sylaps_video",
   "imageSrc": "icon.svg",
   "logo": "icon.svg",
diff --git a/packages/app-store/sylapsvideo/static/1.jpg b/packages/app-store/sylapsvideo/static/1.jpg
new file mode 100644
index 0000000000..de1f39e48d
Binary files /dev/null and b/packages/app-store/sylapsvideo/static/1.jpg differ
diff --git a/packages/app-store/sylapsvideo/static/sylaps1.png b/packages/app-store/sylapsvideo/static/sylaps1.png
deleted file mode 100644
index 4127fb7546..0000000000
Binary files a/packages/app-store/sylapsvideo/static/sylaps1.png and /dev/null differ
diff --git a/packages/prisma/migrations/20230412094052_fix_apps/migration.sql b/packages/prisma/migrations/20230412094052_fix_apps/migration.sql
new file mode 100644
index 0000000000..3cfa447adb
--- /dev/null
+++ b/packages/prisma/migrations/20230412094052_fix_apps/migration.sql
@@ -0,0 +1,2 @@
+-- This is an empty migration.
+UPDATE "App" SET "dirName" = 'gtm', "slug" = 'gtm' WHERE "slug" = 'google-tag-manager';
\ No newline at end of file
diff --git a/packages/prisma/seed-app-store.config.json b/packages/prisma/seed-app-store.config.json
index 7f071d3d8b..b5e9f2b04d 100644
--- a/packages/prisma/seed-app-store.config.json
+++ b/packages/prisma/seed-app-store.config.json
@@ -220,10 +220,10 @@
     "isTemplate": false
   },
   {
-    "dirName": "google-tag-manager",
+    "dirName": "gtm",
     "categories": ["analytics"],
-    "slug": "google-tag-manager",
-    "type": "google-tag-manager_analytics",
+    "slug": "gtm",
+    "type": "gtm_analytics",
     "isTemplate": false
   },
   {
diff --git a/packages/trpc/server/routers/viewer/apps.tsx b/packages/trpc/server/routers/viewer/apps.tsx
index b2e1fb71ce..bfd28c172b 100644
--- a/packages/trpc/server/routers/viewer/apps.tsx
+++ b/packages/trpc/server/routers/viewer/apps.tsx
@@ -126,6 +126,7 @@ export const appsRouter = router({
         },
         update: {
           enabled: !input.enabled,
+          dirName: appMetadata?.dirName || appMetadata?.slug || "",
         },
         create: {
           slug: input.slug,
diff --git a/yarn.lock b/yarn.lock
index 81069dc0dc..9d990e44e0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4373,15 +4373,6 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@calcom/google-tag-manager@workspace:packages/app-store/google-tag-manager":
-  version: 0.0.0-use.local
-  resolution: "@calcom/google-tag-manager@workspace:packages/app-store/google-tag-manager"
-  dependencies:
-    "@calcom/lib": "*"
-    "@calcom/types": "*"
-  languageName: unknown
-  linkType: soft
-
 "@calcom/googlecalendar@workspace:packages/app-store/googlecalendar":
   version: 0.0.0-use.local
   resolution: "@calcom/googlecalendar@workspace:packages/app-store/googlecalendar"
@@ -4402,6 +4393,15 @@ __metadata:
   languageName: unknown
   linkType: soft
 
+"@calcom/gtm@workspace:packages/app-store/gtm":
+  version: 0.0.0-use.local
+  resolution: "@calcom/gtm@workspace:packages/app-store/gtm"
+  dependencies:
+    "@calcom/lib": "*"
+    "@calcom/types": "*"
+  languageName: unknown
+  linkType: soft
+
 "@calcom/hubspot@workspace:packages/app-store/hubspot":
   version: 0.0.0-use.local
   resolution: "@calcom/hubspot@workspace:packages/app-store/hubspot"