diff --git a/.golangci.yml b/.golangci.yml
index 307bd50..f70ee84 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -4,6 +4,8 @@ issues:
   max-issues-per-linter: 0
   max-same-issues: 0
 linters:
+  disable:
+    - depguard
   enable:
     - errcheck
     - gosimple
@@ -12,9 +14,15 @@ linters:
     - staticcheck
     - unused
     # Defaults above ours below
+    - copyloopvar
+    - usestdlibvars
+    - whitespace
   presets:
     - bugs
+    - format
+    - import
     - performance
+    - unused
 #linters-settings:
 #  errcheck:
 #    check-type-assertions: true
diff --git a/cmd/cdnsd/main.go b/cmd/cdnsd/main.go
index 6245dcd..29758dc 100644
--- a/cmd/cdnsd/main.go
+++ b/cmd/cdnsd/main.go
@@ -11,14 +11,10 @@ import (
 	"fmt"
 	"log/slog"
 	"net/http"
-	"os"
-	"time"
-
 	// #nosec G108
 	_ "net/http/pprof"
-
-	"github.com/prometheus/client_golang/prometheus/promhttp"
-	"go.uber.org/automaxprocs/maxprocs"
+	"os"
+	"time"
 
 	"github.com/blinklabs-io/cdnsd/internal/config"
 	"github.com/blinklabs-io/cdnsd/internal/dns"
@@ -26,6 +22,8 @@ import (
 	"github.com/blinklabs-io/cdnsd/internal/logging"
 	"github.com/blinklabs-io/cdnsd/internal/state"
 	"github.com/blinklabs-io/cdnsd/internal/version"
+	"github.com/prometheus/client_golang/prometheus/promhttp"
+	"go.uber.org/automaxprocs/maxprocs"
 )
 
 var cmdlineFlags struct {
diff --git a/internal/dns/dns.go b/internal/dns/dns.go
index af38510..a889e0b 100644
--- a/internal/dns/dns.go
+++ b/internal/dns/dns.go
@@ -19,18 +19,15 @@ import (
 
 	"github.com/blinklabs-io/cdnsd/internal/config"
 	"github.com/blinklabs-io/cdnsd/internal/state"
-
 	"github.com/miekg/dns"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
 )
 
-var (
-	metricQueryTotal = promauto.NewCounter(prometheus.CounterOpts{
-		Name: "dns_query_total",
-		Help: "total DNS queries handled",
-	})
-)
+var metricQueryTotal = promauto.NewCounter(prometheus.CounterOpts{
+	Name: "dns_query_total",
+	Help: "total DNS queries handled",
+})
 
 func Start() error {
 	cfg := config.GetConfig()
diff --git a/internal/indexer/indexer.go b/internal/indexer/indexer.go
index a0d6fe3..28a546a 100644
--- a/internal/indexer/indexer.go
+++ b/internal/indexer/indexer.go
@@ -16,23 +16,22 @@ import (
 	"strings"
 	"time"
 
-	"github.com/blinklabs-io/cdnsd/internal/config"
-	"github.com/blinklabs-io/cdnsd/internal/logging"
-	"github.com/blinklabs-io/cdnsd/internal/state"
-	ouroboros "github.com/blinklabs-io/gouroboros"
-	"github.com/prometheus/client_golang/prometheus"
-	"github.com/prometheus/client_golang/prometheus/promauto"
-
 	"github.com/blinklabs-io/adder/event"
 	filter_event "github.com/blinklabs-io/adder/filter/event"
 	input_chainsync "github.com/blinklabs-io/adder/input/chainsync"
 	output_embedded "github.com/blinklabs-io/adder/output/embedded"
 	"github.com/blinklabs-io/adder/pipeline"
 	models "github.com/blinklabs-io/cardano-models"
+	"github.com/blinklabs-io/cdnsd/internal/config"
+	"github.com/blinklabs-io/cdnsd/internal/logging"
+	"github.com/blinklabs-io/cdnsd/internal/state"
+	ouroboros "github.com/blinklabs-io/gouroboros"
 	"github.com/blinklabs-io/gouroboros/cbor"
 	"github.com/blinklabs-io/gouroboros/ledger"
 	ocommon "github.com/blinklabs-io/gouroboros/protocol/common"
 	"github.com/miekg/dns"
+	"github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/client_golang/prometheus/promauto"
 )
 
 const (
diff --git a/internal/logging/logging.go b/internal/logging/logging.go
index 3145c7b..7d8743b 100644
--- a/internal/logging/logging.go
+++ b/internal/logging/logging.go
@@ -48,7 +48,6 @@ func Configure() {
 		Level: level,
 	})
 	globalLogger = slog.New(handler).With("component", "main")
-
 }
 
 func GetLogger() *slog.Logger {
diff --git a/internal/version/version.go b/internal/version/version.go
index dd25da8..ae12acd 100644
--- a/internal/version/version.go
+++ b/internal/version/version.go
@@ -11,8 +11,10 @@ import (
 )
 
 // These are populated at build time
-var Version string
-var CommitHash string
+var (
+	Version    string
+	CommitHash string
+)
 
 func GetVersionString() string {
 	if Version != "" {