diff --git a/.werft/jobs/build/build-and-publish.ts b/.werft/jobs/build/build-and-publish.ts
index eef4d46bb98b88..c2dc45bf840c06 100644
--- a/.werft/jobs/build/build-and-publish.ts
+++ b/.werft/jobs/build/build-and-publish.ts
@@ -35,7 +35,7 @@ export async function buildAndPublish(werft: Werft, jobConfig: JobConfig) {
     exec(
         `LICENCE_HEADER_CHECK_ONLY=true leeway run components:update-license-header || { echo "[build|FAIL] There are some license headers missing. Please run 'leeway run components:update-license-header'."; exit 1; }`,
     );
-    exec(`leeway vet --ignore-warnings`);
+
     exec(
         `leeway build --docker-build-options network=host --werft=true -c remote ${
             dontTest ? "--dont-test" : ""
diff --git a/.werft/jobs/build/validate-changes.ts b/.werft/jobs/build/validate-changes.ts
index 2aa60861ec2508..4bb8eee87e5635 100644
--- a/.werft/jobs/build/validate-changes.ts
+++ b/.werft/jobs/build/validate-changes.ts
@@ -5,7 +5,12 @@ import { JobConfig } from "./job-config";
 export async function validateChanges(werft: Werft, config: JobConfig) {
     werft.phase("validate-changes", "validating changes");
     try {
-        await Promise.all([branchNameCheck(werft, config), preCommitCheck(werft), typecheckWerftJobs(werft)]);
+        await Promise.all([
+            branchNameCheck(werft, config),
+            preCommitCheck(werft),
+            typecheckWerftJobs(werft),
+            leewayVet(werft),
+        ]);
     } catch (err) {
         werft.fail("validate-changes", err);
     }
@@ -60,3 +65,15 @@ export async function typecheckWerftJobs(werft: Werft) {
     }
     werft.done(slice);
 }
+
+export async function leewayVet(werft: Werft) {
+    const slice = "leeway vet --ignore-warnings"
+    try {
+        werft.log(slice, "Running leeway vet")
+        await exec(`leeway vet --ignore-warnings`, {slice, async: true});
+        werft.log(slice, "leeway vet successful")
+    } catch (e) {
+        werft.fail(slice, e)
+    }
+    werft.done(slice);
+}