diff --git a/.husky/pre-commit b/.husky/pre-commit
deleted file mode 100755
index c6a7938b7c5a11..00000000000000
--- a/.husky/pre-commit
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
-yarn lint-staged
-
-yarn app-store:build && git add packages/app-store/*.generated.*
diff --git a/.husky/pre-push b/.husky/pre-push
new file mode 100755
index 00000000000000..f9a539162e1f32
--- /dev/null
+++ b/.husky/pre-push
@@ -0,0 +1,22 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+set -e
+
+echo "Info: Running lint-staged"
+yarn lint-staged
+
+echo "Info: Running app-store:build"
+yarn app-store:build && git add packages/app-store/*.generated.*
+
+git stash -q --keep-index
+
+# Check for new file changes after running the above commands
+if ! git diff --cached --quiet; then
+  echo "Error: The build process modified files. Please commit the changes and try again."
+  git stash pop -q
+  exit 1
+fi
+
+# Restore stashed changes if nothing went wrong.
+git stash pop -q
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index b09839e929a783..487c568dc8967c 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -182,7 +182,6 @@ git checkout HEAD~1 yarn.lock
 git commit -m "Revert yarn.lock changes"
 ```
 
-_NB_: You may have to bypass the pre-commit hook with by appending `--no-verify` to the git commit
 If you've pushed the commit with the `yarn.lock`:
 
 1.  Correct the commit locally using the above method.
diff --git a/package.json b/package.json
index b8ddd812f61141..a67af097965d46 100644
--- a/package.json
+++ b/package.json
@@ -58,7 +58,6 @@
     "lint:report": "turbo run lint:report",
     "lint": "turbo run lint",
     "postinstall": "husky install && turbo run post-install",
-    "pre-commit": "lint-staged",
     "predev": "echo 'Checking env files'",
     "prisma": "yarn workspace @calcom/prisma prisma",
     "start": "turbo run start --scope=\"@calcom/web\"",