diff --git a/eth/integrity/e3_ef_files.go b/eth/integrity/e3_ef_files.go
index 6103acfa9d7..516330cb572 100644
--- a/eth/integrity/e3_ef_files.go
+++ b/eth/integrity/e3_ef_files.go
@@ -21,18 +21,13 @@ import (
 	"time"
 
 	"github.com/erigontech/erigon-lib/kv"
-	"github.com/erigontech/erigon-lib/kv/temporal"
 	"github.com/erigontech/erigon-lib/state"
 	"golang.org/x/sync/errgroup"
 )
 
-func E3EfFiles(ctx context.Context, chainDB kv.RwDB, agg *state.Aggregator, failFast bool, fromStep uint64) error {
+func E3EfFiles(ctx context.Context, db kv.TemporalRwDB, failFast bool, fromStep uint64) error {
 	logEvery := time.NewTicker(20 * time.Second)
 	defer logEvery.Stop()
-	db, err := temporal.New(chainDB, agg)
-	if err != nil {
-		return err
-	}
 	g := &errgroup.Group{}
 	for _, idx := range []kv.InvertedIdx{kv.AccountsHistoryIdx, kv.StorageHistoryIdx, kv.CodeHistoryIdx, kv.CommitmentHistoryIdx, kv.ReceiptHistoryIdx, kv.LogTopicIdx, kv.LogAddrIdx, kv.TracesFromIdx, kv.TracesToIdx} {
 		idx := idx
diff --git a/eth/integrity/e3_history_no_system_txs.go b/eth/integrity/e3_history_no_system_txs.go
index 511433b966d..15c9934a39f 100644
--- a/eth/integrity/e3_history_no_system_txs.go
+++ b/eth/integrity/e3_history_no_system_txs.go
@@ -28,7 +28,6 @@ import (
 	"github.com/erigontech/erigon-lib/kv"
 	"github.com/erigontech/erigon-lib/kv/order"
 	"github.com/erigontech/erigon-lib/kv/rawdbv3"
-	"github.com/erigontech/erigon-lib/kv/temporal"
 	"github.com/erigontech/erigon-lib/log/v3"
 	"github.com/erigontech/erigon-lib/state"
 	"github.com/erigontech/erigon/turbo/services"
@@ -36,14 +35,11 @@ import (
 )
 
 // E3 History - usually don't have anything attributed to 1-st system txs (except genesis)
-func E3HistoryNoSystemTxs(ctx context.Context, chainDB kv.RwDB, blockReader services.FullBlockReader, agg *state.Aggregator) error {
+func E3HistoryNoSystemTxs(ctx context.Context, db kv.TemporalRwDB, blockReader services.FullBlockReader) error {
 	count := atomic.Uint64{}
 	logEvery := time.NewTicker(20 * time.Second)
 	defer logEvery.Stop()
-	db, err := temporal.New(chainDB, agg)
-	if err != nil {
-		return err
-	}
+	agg := db.(state.HasAgg).Agg().(*state.Aggregator)
 	g := &errgroup.Group{}
 	for j := 0; j < 256; j++ {
 		j := j
diff --git a/eth/integrity/no_gaps_bor_events.go b/eth/integrity/no_gaps_bor_events.go
index c9bf0566ebb..b8dd3187b41 100644
--- a/eth/integrity/no_gaps_bor_events.go
+++ b/eth/integrity/no_gaps_bor_events.go
@@ -16,7 +16,7 @@ import (
 	"github.com/erigontech/erigon/turbo/services"
 )
 
-func NoGapsInBorEvents(ctx context.Context, db kv.RoDB, blockReader services.FullBlockReader, from, to uint64, failFast bool) (err error) {
+func NoGapsInBorEvents(ctx context.Context, db kv.TemporalRoDB, blockReader services.FullBlockReader, from, to uint64, failFast bool) (err error) {
 	defer func() {
 		log.Info("[integrity] NoGapsInBorEvents: done", "err", err)
 	}()
diff --git a/eth/integrity/snap_blocks_read.go b/eth/integrity/snap_blocks_read.go
index 28e927727a5..16057d82cdf 100644
--- a/eth/integrity/snap_blocks_read.go
+++ b/eth/integrity/snap_blocks_read.go
@@ -28,7 +28,7 @@ import (
 	"github.com/erigontech/erigon/turbo/services"
 )
 
-func SnapBlocksRead(ctx context.Context, db kv.RoDB, blockReader services.FullBlockReader, from, to uint64, failFast bool) error {
+func SnapBlocksRead(ctx context.Context, db kv.TemporalRoDB, blockReader services.FullBlockReader, from, to uint64, failFast bool) error {
 	defer log.Info("[integrity] SnapBlocksRead: done")
 	logEvery := time.NewTicker(10 * time.Second)
 	defer logEvery.Stop()
diff --git a/turbo/app/snapshots_cmd.go b/turbo/app/snapshots_cmd.go
index 468af598840..169f5b417b6 100644
--- a/turbo/app/snapshots_cmd.go
+++ b/turbo/app/snapshots_cmd.go
@@ -563,11 +563,11 @@ func doIntegrity(cliCtx *cli.Context) error {
 				return err
 			}
 		case integrity.InvertedIndex:
-			if err := integrity.E3EfFiles(ctx, db, agg, failFast, fromStep); err != nil {
+			if err := integrity.E3EfFiles(ctx, db, failFast, fromStep); err != nil {
 				return err
 			}
 		case integrity.HistoryNoSystemTxs:
-			if err := integrity.E3HistoryNoSystemTxs(ctx, db, blockReader, agg); err != nil {
+			if err := integrity.E3HistoryNoSystemTxs(ctx, db, blockReader); err != nil {
 				return err
 			}
 		case integrity.NoBorEventGaps: