diff --git a/.markdownlint.yaml b/.markdownlint.yaml
deleted file mode 100644
index e826f6e..0000000
--- a/.markdownlint.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-line-length: false
-no-hard-tabs: false
\ No newline at end of file
diff --git a/.yamllint.yaml b/.yamllint.yaml
deleted file mode 100644
index 1e48eeb..0000000
--- a/.yamllint.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-# vim: ft=yaml
----
-yaml-files:
-    - "*.yaml"
-    - "*.yml"
-    - ".yamllint"
-ignore: "dist/helm/"
-extends: "default"
-rules:
-    quoted-strings: "enable"
-    line-length: "disable"
\ No newline at end of file
diff --git a/bittorrent/bittorrent.go b/bittorrent/bittorrent.go
index 13fa958..1dcbae5 100644
--- a/bittorrent/bittorrent.go
+++ b/bittorrent/bittorrent.go
@@ -8,10 +8,11 @@ import (
 	"crypto/sha256"
 	"encoding/hex"
 	"fmt"
-	"github.com/pkg/errors"
-	"github.com/sot-tech/mochi/pkg/log"
 	"net"
 	"time"
+
+	"github.com/pkg/errors"
+	"github.com/sot-tech/mochi/pkg/log"
 )
 
 // PeerIDLen is length of peer id field in bytes
diff --git a/cmd/mochi/main.go b/cmd/mochi/main.go
index 11b6494..053053d 100644
--- a/cmd/mochi/main.go
+++ b/cmd/mochi/main.go
@@ -3,6 +3,11 @@ package main
 import (
 	"context"
 	"errors"
+	"os/signal"
+	"runtime"
+	"strings"
+	"syscall"
+
 	"github.com/sirupsen/logrus"
 	"github.com/sot-tech/mochi/frontend/http"
 	"github.com/sot-tech/mochi/frontend/udp"
@@ -13,10 +18,6 @@ import (
 	"github.com/sot-tech/mochi/pkg/stop"
 	"github.com/sot-tech/mochi/storage"
 	"github.com/spf13/cobra"
-	"os/signal"
-	"runtime"
-	"strings"
-	"syscall"
 )
 
 var e2eCmd *cobra.Command
diff --git a/cmd/mochi/signal_unix.go b/cmd/mochi/signal_unix.go
index 3095824..9dc3fd4 100644
--- a/cmd/mochi/signal_unix.go
+++ b/cmd/mochi/signal_unix.go
@@ -1,5 +1,4 @@
 //go:build darwin || freebsd || linux || netbsd || openbsd || dragonfly || solaris
-// +build darwin freebsd linux netbsd openbsd dragonfly solaris
 
 package main
 
diff --git a/cmd/mochi/signal_windows.go b/cmd/mochi/signal_windows.go
index 521fe72..684169f 100644
--- a/cmd/mochi/signal_windows.go
+++ b/cmd/mochi/signal_windows.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package main
 
diff --git a/frontend/http/writer.go b/frontend/http/writer.go
index 62ec09f..f5be92a 100644
--- a/frontend/http/writer.go
+++ b/frontend/http/writer.go
@@ -2,11 +2,12 @@ package http
 
 import (
 	"errors"
+	"net/http"
+	"time"
+
 	"github.com/anacrolix/torrent/bencode"
 	"github.com/sot-tech/mochi/bittorrent"
 	"github.com/sot-tech/mochi/pkg/log"
-	"net/http"
-	"time"
 )
 
 // WriteError communicates an error to a BitTorrent client over HTTP.
diff --git a/middleware/clientapproval/client_id_test.go b/middleware/clientapproval/client_id_test.go
index 02895e5..18167c5 100644
--- a/middleware/clientapproval/client_id_test.go
+++ b/middleware/clientapproval/client_id_test.go
@@ -1,8 +1,9 @@
 package clientapproval
 
 import (
-	"github.com/sot-tech/mochi/bittorrent"
 	"testing"
+
+	"github.com/sot-tech/mochi/bittorrent"
 )
 
 func TestClientID(t *testing.T) {
diff --git a/middleware/clientapproval/clientapproval.go b/middleware/clientapproval/clientapproval.go
index a2312b3..8bb9086 100644
--- a/middleware/clientapproval/clientapproval.go
+++ b/middleware/clientapproval/clientapproval.go
@@ -6,6 +6,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+
 	"github.com/sot-tech/mochi/bittorrent"
 	"github.com/sot-tech/mochi/middleware"
 	"github.com/sot-tech/mochi/storage"
diff --git a/middleware/clientapproval/clientapproval_test.go b/middleware/clientapproval/clientapproval_test.go
index 50ef4e3..b1da889 100644
--- a/middleware/clientapproval/clientapproval_test.go
+++ b/middleware/clientapproval/clientapproval_test.go
@@ -3,9 +3,10 @@ package clientapproval
 import (
 	"context"
 	"fmt"
+	"testing"
+
 	"github.com/sot-tech/mochi/bittorrent"
 	"github.com/stretchr/testify/require"
-	"testing"
 )
 
 var cases = []struct {
diff --git a/middleware/hooks.go b/middleware/hooks.go
index 7e823c6..03426ba 100644
--- a/middleware/hooks.go
+++ b/middleware/hooks.go
@@ -3,6 +3,7 @@ package middleware
 import (
 	"context"
 	"errors"
+
 	"github.com/sot-tech/mochi/bittorrent"
 	"github.com/sot-tech/mochi/storage"
 )
diff --git a/middleware/jwt/jwt.go b/middleware/jwt/jwt.go
index 3f1a9eb..4c90dde 100644
--- a/middleware/jwt/jwt.go
+++ b/middleware/jwt/jwt.go
@@ -13,6 +13,10 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"net/http"
+	"strings"
+	"time"
+
 	jc "github.com/SermoDigital/jose/crypto"
 	"github.com/SermoDigital/jose/jws"
 	"github.com/SermoDigital/jose/jwt"
@@ -23,9 +27,6 @@ import (
 	"github.com/sot-tech/mochi/pkg/stop"
 	"github.com/sot-tech/mochi/storage"
 	"gopkg.in/yaml.v3"
-	"net/http"
-	"strings"
-	"time"
 )
 
 // Name is the name by which this middleware is registered with Conf.
diff --git a/middleware/logic.go b/middleware/logic.go
index 36e2b94..7a1d7d1 100644
--- a/middleware/logic.go
+++ b/middleware/logic.go
@@ -2,12 +2,13 @@ package middleware
 
 import (
 	"context"
+	"time"
+
 	"github.com/sot-tech/mochi/bittorrent"
 	"github.com/sot-tech/mochi/frontend"
 	"github.com/sot-tech/mochi/pkg/log"
 	"github.com/sot-tech/mochi/pkg/stop"
 	"github.com/sot-tech/mochi/storage"
-	"time"
 )
 
 // ResponseConfig holds the configuration used for the actual response.
diff --git a/middleware/middleware.go b/middleware/middleware.go
index 11a698b..f11abb9 100644
--- a/middleware/middleware.go
+++ b/middleware/middleware.go
@@ -4,9 +4,10 @@ package middleware
 
 import (
 	"errors"
+	"sync"
+
 	"github.com/sot-tech/mochi/storage"
 	"gopkg.in/yaml.v3"
-	"sync"
 )
 
 var (
diff --git a/middleware/pkg/random/xorshift_test.go b/middleware/pkg/random/xorshift_test.go
index ce7f818..d763bb7 100644
--- a/middleware/pkg/random/xorshift_test.go
+++ b/middleware/pkg/random/xorshift_test.go
@@ -1,10 +1,11 @@
 package random
 
 import (
-	_ "github.com/sot-tech/mochi/pkg/rand_seed"
-	"github.com/stretchr/testify/require"
 	"math/rand"
 	"testing"
+
+	_ "github.com/sot-tech/mochi/pkg/rand_seed"
+	"github.com/stretchr/testify/require"
 )
 
 func TestIntn(t *testing.T) {
diff --git a/middleware/torrentapproval/container/container.go b/middleware/torrentapproval/container/container.go
index 1e31673..bd4cfdd 100644
--- a/middleware/torrentapproval/container/container.go
+++ b/middleware/torrentapproval/container/container.go
@@ -2,9 +2,10 @@ package container
 
 import (
 	"errors"
+	"sync"
+
 	"github.com/sot-tech/mochi/bittorrent"
 	"github.com/sot-tech/mochi/storage"
-	"sync"
 )
 
 // DefaultStorageCtxName default ctx name if value from configuration is not set
diff --git a/middleware/torrentapproval/container/directory/directory.go b/middleware/torrentapproval/container/directory/directory.go
index 9eaa31c..ad77258 100644
--- a/middleware/torrentapproval/container/directory/directory.go
+++ b/middleware/torrentapproval/container/directory/directory.go
@@ -6,6 +6,7 @@ package directory
 
 import (
 	"fmt"
+
 	"github.com/anacrolix/torrent/metainfo"
 	"github.com/anacrolix/torrent/util/dirwatch"
 	"github.com/minio/sha256-simd"
diff --git a/middleware/torrentapproval/container/list/list.go b/middleware/torrentapproval/container/list/list.go
index 07f7f34..58a8ba3 100644
--- a/middleware/torrentapproval/container/list/list.go
+++ b/middleware/torrentapproval/container/list/list.go
@@ -4,6 +4,7 @@ package list
 
 import (
 	"fmt"
+
 	"github.com/sot-tech/mochi/bittorrent"
 	"github.com/sot-tech/mochi/middleware/torrentapproval/container"
 	"github.com/sot-tech/mochi/pkg/log"
diff --git a/middleware/torrentapproval/torrentapproval.go b/middleware/torrentapproval/torrentapproval.go
index 930ca31..a15b83a 100644
--- a/middleware/torrentapproval/torrentapproval.go
+++ b/middleware/torrentapproval/torrentapproval.go
@@ -5,6 +5,7 @@ package torrentapproval
 import (
 	"context"
 	"fmt"
+
 	"github.com/sot-tech/mochi/bittorrent"
 	"github.com/sot-tech/mochi/middleware"
 	"github.com/sot-tech/mochi/middleware/torrentapproval/container"
diff --git a/middleware/torrentapproval/torrentapproval_test.go b/middleware/torrentapproval/torrentapproval_test.go
index cbfc2c4..1182c43 100644
--- a/middleware/torrentapproval/torrentapproval_test.go
+++ b/middleware/torrentapproval/torrentapproval_test.go
@@ -3,11 +3,12 @@ package torrentapproval
 import (
 	"context"
 	"fmt"
+	"testing"
+
 	"github.com/sot-tech/mochi/bittorrent"
 	"github.com/sot-tech/mochi/storage/memory"
 	"github.com/stretchr/testify/require"
 	"gopkg.in/yaml.v3"
-	"testing"
 )
 
 var cases = []struct {
diff --git a/middleware/varinterval/varinterval.go b/middleware/varinterval/varinterval.go
index 137982e..dbbd38b 100644
--- a/middleware/varinterval/varinterval.go
+++ b/middleware/varinterval/varinterval.go
@@ -4,13 +4,14 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"sync"
+	"time"
+
 	"github.com/sot-tech/mochi/bittorrent"
 	"github.com/sot-tech/mochi/middleware"
 	"github.com/sot-tech/mochi/middleware/pkg/random"
 	"github.com/sot-tech/mochi/storage"
 	"gopkg.in/yaml.v3"
-	"sync"
-	"time"
 )
 
 // Name is the name by which this middleware is registered with Conf.
diff --git a/middleware/varinterval/varinterval_test.go b/middleware/varinterval/varinterval_test.go
index e618467..74bdeb1 100644
--- a/middleware/varinterval/varinterval_test.go
+++ b/middleware/varinterval/varinterval_test.go
@@ -3,9 +3,10 @@ package varinterval
 import (
 	"context"
 	"fmt"
+	"testing"
+
 	"github.com/sot-tech/mochi/bittorrent"
 	"github.com/stretchr/testify/require"
-	"testing"
 )
 
 var configTests = []struct {
diff --git a/storage/memory/storage_test.go b/storage/memory/storage_test.go
index 0a35218..f37861c 100644
--- a/storage/memory/storage_test.go
+++ b/storage/memory/storage_test.go
@@ -1,10 +1,11 @@
 package memory
 
 import (
-	"github.com/sot-tech/mochi/storage"
-	"github.com/sot-tech/mochi/storage/test"
 	"testing"
 	"time"
+
+	"github.com/sot-tech/mochi/storage"
+	"github.com/sot-tech/mochi/storage/test"
 )
 
 func createNew() storage.Storage {
diff --git a/storage/misc.go b/storage/misc.go
index 5b3be72..adeabe4 100644
--- a/storage/misc.go
+++ b/storage/misc.go
@@ -2,8 +2,9 @@ package storage
 
 import (
 	"encoding/binary"
-	"github.com/sot-tech/mochi/bittorrent"
 	"net"
+
+	"github.com/sot-tech/mochi/bittorrent"
 )
 
 // Pair - some key-value pair, used for BulkPut
diff --git a/storage/redis/redis.go b/storage/redis/redis.go
index 5eb81e9..6cba1cb 100644
--- a/storage/redis/redis.go
+++ b/storage/redis/redis.go
@@ -3,13 +3,14 @@ package redis
 import (
 	"context"
 	"errors"
-	"github.com/go-redsync/redsync/v4"
-	"github.com/go-redsync/redsync/v4/redis/redigo"
-	redigolib "github.com/gomodule/redigo/redis"
 	"net/url"
 	"strconv"
 	"strings"
 	"time"
+
+	"github.com/go-redsync/redsync/v4"
+	"github.com/go-redsync/redsync/v4/redis/redigo"
+	redigolib "github.com/gomodule/redigo/redis"
 )
 
 // redisBackend represents a redis handler.
diff --git a/storage/test/storage_bench.go b/storage/test/storage_bench.go
index 959facc..6328335 100644
--- a/storage/test/storage_bench.go
+++ b/storage/test/storage_bench.go
@@ -1,14 +1,15 @@
 package test
 
 import (
-	"github.com/sot-tech/mochi/bittorrent"
-	"github.com/sot-tech/mochi/pkg/rand_seed"
-	"github.com/sot-tech/mochi/storage"
 	"math/rand"
 	"net"
 	"runtime"
 	"sync/atomic"
 	"testing"
+
+	"github.com/sot-tech/mochi/bittorrent"
+	"github.com/sot-tech/mochi/pkg/rand_seed"
+	"github.com/sot-tech/mochi/storage"
 )
 
 type benchData struct {
diff --git a/storage/test/storage_test_base.go b/storage/test/storage_test_base.go
index b5f3d66..7c0c1dd 100644
--- a/storage/test/storage_test_base.go
+++ b/storage/test/storage_test_base.go
@@ -1,10 +1,11 @@
 package test
 
 import (
+	"testing"
+
 	"github.com/sot-tech/mochi/bittorrent"
 	"github.com/sot-tech/mochi/storage"
 	"github.com/stretchr/testify/require"
-	"testing"
 )
 
 // PeerEqualityFunc is the boolean function to use to check two Peers for
diff --git a/storage/test/storage_test_data.go b/storage/test/storage_test_data.go
index 8a81f91..ca7099c 100644
--- a/storage/test/storage_test_data.go
+++ b/storage/test/storage_test_data.go
@@ -1,8 +1,9 @@
 package test
 
 import (
-	"github.com/sot-tech/mochi/bittorrent"
 	"net"
+
+	"github.com/sot-tech/mochi/bittorrent"
 )
 
 var (