diff --git a/cache/metadata/metadata.go b/cache/metadata/metadata.go
index 7eb9c4aad6d2..addcf81eb3ce 100644
--- a/cache/metadata/metadata.go
+++ b/cache/metadata/metadata.go
@@ -41,7 +41,7 @@ func NewStore(dbPath string) (*Store, error) {
 			)
 		}
 	}
-	db, err := boltutil.Open(dbPath, 0600, nil)
+	db, err := boltutil.Open(dbPath, 0600, &bolt.Options{NoFreelistSync: true})
 	if err != nil {
 		return nil, errors.Wrapf(err, "failed to open database file %s", dbPath)
 	}
diff --git a/solver/bboltcachestorage/storage.go b/solver/bboltcachestorage/storage.go
index dc9cd84b8aa6..585917a5ea5a 100644
--- a/solver/bboltcachestorage/storage.go
+++ b/solver/bboltcachestorage/storage.go
@@ -26,7 +26,8 @@ type Store struct {
 
 func NewStore(dbPath string) (*Store, error) {
 	db, err := boltutil.SafeOpen(dbPath, 0600, &bolt.Options{
-		NoSync: true,
+		NoSync:         true,
+		NoFreelistSync: true,
 	})
 	if err != nil {
 		return nil, err
diff --git a/worker/runc/runc.go b/worker/runc/runc.go
index 4441060f4f26..3397b110e9d9 100644
--- a/worker/runc/runc.go
+++ b/worker/runc/runc.go
@@ -95,7 +95,9 @@ func NewWorkerOpt(root string, snFactory SnapshotterFactory, rootless bool, proc
 		return opt, err
 	}
 
-	db, err := bolt.Open(filepath.Join(root, "containerdmeta.db"), 0644, nil)
+	db, err := bolt.Open(filepath.Join(root, "containerdmeta.db"), 0644, &bolt.Options{
+		NoFreelistSync: true,
+	})
 	if err != nil {
 		return opt, err
 	}