diff --git a/.golangci.yml b/.golangci.yml
index 92d79a6b..fbbb4433 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -9,6 +9,7 @@ issues:
         - dupl
         - maligned
         - goerr113
+        - containedctx
     - path: internal/server/
       linters:
         - dupl
@@ -49,9 +50,12 @@ linters:
     - asciicheck
     - bidichk
     - bodyclose
+    - containedctx
+    - decorder
     - dogsled
     - dupl
     - durationcheck
+    - errchkjson
     - errname
     - exhaustive
     - exportloopref
@@ -71,9 +75,11 @@ linters:
     - gomoddirectives
     - goprintffuncname
     - gosec
+    - grouper
     - ifshort
     - importas
     - lll
+    - maintidx
     - makezero
     - misspell
     - nakedret
diff --git a/cmd/gluetun/main.go b/cmd/gluetun/main.go
index db266497..c01294e8 100644
--- a/cmd/gluetun/main.go
+++ b/cmd/gluetun/main.go
@@ -122,7 +122,7 @@ var (
 	errCommandUnknown = errors.New("command is unknown")
 )
 
-//nolint:gocognit,gocyclo
+//nolint:gocognit,gocyclo,maintidx
 func _main(ctx context.Context, buildInfo models.BuildInformation,
 	args []string, logger logging.ParentLogger, source sources.Source,
 	tun tun.Interface, netLinker netlink.NetLinker, cmder command.RunStarter,
diff --git a/internal/httpproxy/handler.go b/internal/httpproxy/handler.go
index d1028f48..1af06345 100644
--- a/internal/httpproxy/handler.go
+++ b/internal/httpproxy/handler.go
@@ -25,7 +25,7 @@ func newHandler(ctx context.Context, wg *sync.WaitGroup, logger Logger,
 }
 
 type handler struct {
-	ctx                context.Context
+	ctx                context.Context //nolint:containedctx
 	wg                 *sync.WaitGroup
 	client             *http.Client
 	logger             Logger
diff --git a/internal/server/dns.go b/internal/server/dns.go
index 1acfe0a6..20b9f3a0 100644
--- a/internal/server/dns.go
+++ b/internal/server/dns.go
@@ -19,7 +19,7 @@ func newDNSHandler(ctx context.Context, looper dns.Looper,
 }
 
 type dnsHandler struct {
-	ctx    context.Context
+	ctx    context.Context //nolint:containedctx
 	looper dns.Looper
 	warner warner
 }
diff --git a/internal/server/handlerv0.go b/internal/server/handlerv0.go
index 1507ef61..10ab2132 100644
--- a/internal/server/handlerv0.go
+++ b/internal/server/handlerv0.go
@@ -22,7 +22,7 @@ func newHandlerV0(ctx context.Context, logger infoWarner,
 }
 
 type handlerV0 struct {
-	ctx     context.Context
+	ctx     context.Context //nolint:containedctx
 	logger  infoWarner
 	vpn     vpn.Looper
 	dns     dns.Looper
diff --git a/internal/server/openvpn.go b/internal/server/openvpn.go
index ae2a301b..4033d734 100644
--- a/internal/server/openvpn.go
+++ b/internal/server/openvpn.go
@@ -21,7 +21,7 @@ func newOpenvpnHandler(ctx context.Context, looper vpn.Looper,
 }
 
 type openvpnHandler struct {
-	ctx    context.Context
+	ctx    context.Context //nolint:containedctx
 	looper vpn.Looper
 	pf     portforward.Getter
 	warner warner
diff --git a/internal/server/updater.go b/internal/server/updater.go
index ff44c846..4fecaec1 100644
--- a/internal/server/updater.go
+++ b/internal/server/updater.go
@@ -21,7 +21,7 @@ func newUpdaterHandler(
 }
 
 type updaterHandler struct {
-	ctx    context.Context
+	ctx    context.Context //nolint:containedctx
 	looper updater.Looper
 	warner warner
 }
diff --git a/internal/storage/read.go b/internal/storage/read.go
index 95d11622..11c1fc60 100644
--- a/internal/storage/read.go
+++ b/internal/storage/read.go
@@ -38,7 +38,7 @@ var (
 	errDecodeProvider = errors.New("cannot decode servers for provider")
 )
 
-func (s *Storage) extractServersFromBytes(b []byte, hardcoded models.AllServers) ( //nolint:gocognit,gocyclo
+func (s *Storage) extractServersFromBytes(b []byte, hardcoded models.AllServers) ( //nolint:gocognit,gocyclo,maintidx
 	servers models.AllServers, err error) {
 	var versions allVersions
 	if err := json.Unmarshal(b, &versions); err != nil {