diff --git a/config.toml b/config.toml
index 3f3431c..a248fe8 100644
--- a/config.toml
+++ b/config.toml
@@ -30,4 +30,4 @@ minconn = 5
 [asynq]
 concurrency = 25
 debug       = false
-dsn         = "redis://localhost:6379/0"
+dsn         = "redis://redis:6379/0"
diff --git a/internal/keystore/keystore_pg_test.go b/internal/keystore/keystore_pg_test.go
index cf3d490..94e9a1a 100644
--- a/internal/keystore/keystore_pg_test.go
+++ b/internal/keystore/keystore_pg_test.go
@@ -7,47 +7,59 @@ import (
 	"github.com/grassrootseconomics/cic-custodial/pkg/keypair"
 	"github.com/grassrootseconomics/cic-custodial/pkg/logg"
 	"github.com/grassrootseconomics/cic-custodial/pkg/postgres"
+	"github.com/jackc/pgx/v5/pgxpool"
 	"github.com/stretchr/testify/suite"
+	"github.com/zerodha/logf"
 )
 
 const (
 	testDsn = "postgres://postgres:postgres@localhost:5432/cic_custodial"
 )
 
-type ItKeystoreSuite struct {
+type itKeystoreSuite struct {
 	suite.Suite
-	Keystore Keystore
+	keystore Keystore
+	pgPool   *pgxpool.Pool
+	logg     logf.Logger
 }
 
 func TestItKeystoreSuite(t *testing.T) {
-	suite.Run(t, new(ItKeystoreSuite))
+	suite.Run(t, new(itKeystoreSuite))
 }
 
-func (s *ItKeystoreSuite) SetupSuite() {
+func (s *itKeystoreSuite) SetupSuite() {
+	logg := logg.NewLogg(logg.LoggOpts{
+		Debug:  true,
+		Caller: true,
+	})
+
 	pgPool, err := postgres.NewPostgresPool(postgres.PostgresPoolOpts{
 		DSN: testDsn,
 	})
 	s.Require().NoError(err)
+	s.pgPool = pgPool
+	s.logg = logg
 
-	ks, err := NewPostgresKeytore(Opts{
+	s.keystore, err = NewPostgresKeytore(Opts{
 		PostgresPool: pgPool,
-		Logg: logg.NewLogg(logg.LoggOpts{
-			Debug:  true,
-			Caller: true,
-		}),
+		Logg:         logg,
 	})
 	s.Require().NoError(err)
-	s.Keystore = ks
 }
 
-func (s *ItKeystoreSuite) Test_Write_And_Load_KeyPair() {
+func (s *itKeystoreSuite) TearDownSuite() {
+	_, err := s.pgPool.Exec(context.Background(), "DROP TABLE IF EXISTS keystore")
+	s.Require().NoError(err)
+}
+
+func (s *itKeystoreSuite) Test_Write_And_Load_KeyPair() {
 	ctx := context.Background()
 	keypair, err := keypair.Generate()
 	s.NoError(err)
 
-	err = s.Keystore.WriteKeyPair(ctx, keypair)
+	err = s.keystore.WriteKeyPair(ctx, keypair)
 	s.NoError(err)
 
-	_, err = s.Keystore.LoadPrivateKey(ctx, keypair.Public)
+	_, err = s.keystore.LoadPrivateKey(ctx, keypair.Public)
 	s.NoError(err)
 }
diff --git a/internal/keystore/migrations.go b/internal/keystore/migrations.go
index 976fa27..c183e01 100644
--- a/internal/keystore/migrations.go
+++ b/internal/keystore/migrations.go
@@ -8,7 +8,7 @@ import (
 )
 
 func applyMigration(dbPool *pgxpool.Pool) error {
-	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+	ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
 	defer cancel()
 
 	_, err := dbPool.Exec(ctx, `