diff --git a/pkg/dbmanager/metrics.go b/pkg/dbmanager/metrics.go
index 7219f5c..07f458a 100644
--- a/pkg/dbmanager/metrics.go
+++ b/pkg/dbmanager/metrics.go
@@ -4,10 +4,11 @@ import (
 	"sync"
 	"time"
 
-	"github.com/bitechdev/ResolveSpec/pkg/dbtrace"
-	"github.com/bitechdev/ResolveSpec/pkg/logger"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
+
+	"github.com/bitechdev/ResolveSpec/pkg/dbtrace"
+	"github.com/bitechdev/ResolveSpec/pkg/logger"
 )
 
 var (
diff --git a/pkg/security/keystore_database.go b/pkg/security/keystore_database.go
index 7dda23c..f0643e1 100644
--- a/pkg/security/keystore_database.go
+++ b/pkg/security/keystore_database.go
@@ -11,9 +11,10 @@ import (
 	"sync"
 	"time"
 
+	"golang.org/x/sync/singleflight"
+
 	"github.com/bitechdev/ResolveSpec/pkg/cache"
 	"github.com/bitechdev/ResolveSpec/pkg/dbtrace"
-	"golang.org/x/sync/singleflight"
 )
 
 // DatabaseKeyStoreOptions configures DatabaseKeyStore.
diff --git a/pkg/security/providers.go b/pkg/security/providers.go
index 5c66809..1b5b3d1 100644
--- a/pkg/security/providers.go
+++ b/pkg/security/providers.go
@@ -11,10 +11,11 @@ import (
 	"sync"
 	"time"
 
+	"golang.org/x/sync/singleflight"
+
 	"github.com/bitechdev/ResolveSpec/pkg/cache"
 	"github.com/bitechdev/ResolveSpec/pkg/dbtrace"
 	"github.com/bitechdev/ResolveSpec/pkg/logger"
-	"golang.org/x/sync/singleflight"
 )
 
 // Production-Ready Authenticators