diff --git a/mkosi.conf b/mkosi.conf
index d98c97f86d..980147f760 100644
--- a/mkosi.conf
+++ b/mkosi.conf
@@ -21,6 +21,7 @@ PassEnvironment=
         MESON_OPTIONS
         SYSEXT
         WITH_DEBUG
+        ASAN_OPTIONS
 
 [Output]
 RepartDirectories=mkosi.repart
@@ -85,7 +86,6 @@ Packages=
         attr
         bash-completion
         binutils
-        bpftrace
         coreutils
         curl
         diffutils
diff --git a/mkosi.images/build/mkosi.sync b/mkosi.images/build/mkosi.sync
index 02d66e9939..eeaa73e98f 100755
--- a/mkosi.images/build/mkosi.sync
+++ b/mkosi.images/build/mkosi.sync
@@ -12,6 +12,10 @@ if [[ -d "pkg/$PKG_SUBDIR/.git" ]]; then
         exit 0
     fi
 
+    if [[ -n "$(git -C "pkg/$PKG_SUBDIR" status --porcelain)" ]]; then
+        exit 0
+    fi
+
     if ! git -C "pkg/$PKG_SUBDIR" show-ref --quiet "origin/$GIT_BRANCH"; then
         git -C "pkg/$PKG_SUBDIR" remote set-url origin "$GIT_URL"
         git -C "pkg/$PKG_SUBDIR" fetch origin "$GIT_BRANCH"