diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index af842a8e16..3edecfe1b6 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -29,6 +29,9 @@ packages/features/ee/impersonation @sean-brydon @calcom/core
packages/features/ee/payments @alannnc @calcom/core
packages/features/ee/workflows @CarinaWolli @calcom/core
packages/features/tips @PeerRich @calcom/core
-packages/ui @calcom/ui
+# Trivial changes should be mergeable by core team as well
+# Major UI changes must be reviewed by UI team
+# Critical changes even if major can still be merged by core team if needed.
+packages/ui @calcom/ui @calcom/core
packages/config @calcom/core
packages/app-store/routing-forms @hariombalhara @calcom/core
diff --git a/.infisical.json b/.infisical.json
deleted file mode 100644
index c7fe4ccd1f..0000000000
--- a/.infisical.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "workspaceId": "63ea8121b6e2b0543ba79616",
- "defaultEnvironment": "dev",
- "gitBranchToEnvironmentMapping": {
- "main": "staging",
- "production": "prod"
- }
-}
diff --git a/apps/docs/pages/availability.mdx b/apps/docs/pages/availability.mdx
index 878d38a398..413101f259 100644
--- a/apps/docs/pages/availability.mdx
+++ b/apps/docs/pages/availability.mdx
@@ -21,7 +21,7 @@ This will tell you when your calendar shows you as busy, so you can understand w
2. To the right of your screen a box saying 'Something doesn't look right?' will appear. Press the button 'Launch Troubleshooter'.
3. After pressing this, your availability will appear according to your calendar and inform you of the times booked up for that day!
-By doing this you will know understand why certain times are available and others are blocked.
+By doing this you will now understand why certain times are available and others are blocked.
## In team settings availability set to only Mondays but the calendar shows availability on other days as well
It’s showing as available on days other than Monday because only you have set your availability to only Mondays, whereas the rest of the team haven't made that setting.
diff --git a/apps/docs/pages/faq.mdx b/apps/docs/pages/faq.mdx
index a7305ea3e3..dcc176fc30 100644
--- a/apps/docs/pages/faq.mdx
+++ b/apps/docs/pages/faq.mdx
@@ -12,6 +12,6 @@ As it stands this is currently not possible. We always keep an eye on the limita
## How to quickly block further bookings?
1. Click on the lower left corner of your dashboard where your username is displayed.
-2. That initates a dropdown menu. Click on `Set youself as away`.
+2. That initiates a dropdown menu. Click on `Set yourself as away`.
This is a method to disable your Cal.com account which won't allow any bookings once initiated. However, bookings made before turning on *away mode* will still be booked.
diff --git a/apps/web/components/apps/App.tsx b/apps/web/components/apps/App.tsx
index 5f2306b2b3..3f866ebee5 100644
--- a/apps/web/components/apps/App.tsx
+++ b/apps/web/components/apps/App.tsx
@@ -35,7 +35,6 @@ const Component = ({
email,
tos,
privacy,
- isProOnly,
teamsPlanRequired,
descriptionItems,
isTemplate,
@@ -151,7 +150,6 @@ const Component = ({
{!isGlobal && (