diff --git a/main.go b/main.go
index 6b873fd..0863ad7 100644
--- a/main.go
+++ b/main.go
@@ -659,10 +659,15 @@ func (b *BuildManager) syncWorker() {
 		}
 		wg.Wait()
 
+		err := logHK()
+		if err != nil {
+			log.Warningf("log-housekeeping failed: %v", err)
+		}
+
 		// fetch updates between sync runs
 		b.alpmMutex.Lock()
 		check(alpmHandle.Release())
-		err := setupChroot()
+		err = setupChroot()
 		for err != nil {
 			log.Warningf("Unable to upgrade chroot, trying again later.")
 			time.Sleep(time.Minute)
diff --git a/utils.go b/utils.go
index 0fca7c8..b2a1b4b 100644
--- a/utils.go
+++ b/utils.go
@@ -866,7 +866,7 @@ func housekeeping(repo string, wg *sync.WaitGroup) error {
 	}
 
 	// check all dbpackages for existence
-	dbpackages, err := db.DbPackage.Query().All(context.Background())
+	dbpackages, err := db.DbPackage.Query().Where(dbpackage.RepositoryEQ(dbpackage.Repository(repo))).All(context.Background())
 	if err != nil {
 		return err
 	}
@@ -889,6 +889,10 @@ func housekeeping(repo string, wg *sync.WaitGroup) error {
 		}
 	}
 
+	return nil
+}
+
+func logHK() error {
 	// check if package for log exists and if error can be fixed by rebuild
 	logFiles, err := Glob(filepath.Join(conf.Basedir.Repo, logDir, "/**/*.log"))
 	if err != nil {
@@ -927,7 +931,6 @@ func housekeeping(repo string, wg *sync.WaitGroup) error {
 			}
 		}
 	}
-
 	return nil
 }