diff --git a/.golangci.yml b/.golangci.yml
index cb5f21f..4621e5c 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -4,8 +4,21 @@ linters:
   disable:
     - errcheck
   enable:
+    - contextcheck
+    - durationcheck
+    - errname
+    - execinquery
+    - gofmt
+    - ifshort
+    - misspell
+    - nilerr
     - noctx
+    - nolintlint
+    - nosprintfhostport
+    - prealloc
     - rowserrcheck
     - sqlclosecheck
+    - unconvert
     - unused
-    
+    - wastedassign
+    - whitespace
diff --git a/go/cmd/gh-ost/main.go b/go/cmd/gh-ost/main.go
index 9dc5702..cc807cf 100644
--- a/go/cmd/gh-ost/main.go
+++ b/go/cmd/gh-ost/main.go
@@ -270,7 +270,7 @@ func main() {
 	}
 	if *askPass {
 		fmt.Println("Password:")
-		bytePassword, err := term.ReadPassword(int(syscall.Stdin))
+		bytePassword, err := term.ReadPassword(syscall.Stdin)
 		if err != nil {
 			migrationContext.Log.Fatale(err)
 		}
@@ -300,10 +300,9 @@ func main() {
 	acceptSignals(migrationContext)
 
 	migrator := logic.NewMigrator(migrationContext, AppVersion)
-	err := migrator.Migrate()
-	if err != nil {
+	if err := migrator.Migrate(); err != nil {
 		migrator.ExecOnFailureHook()
 		migrationContext.Log.Fatale(err)
 	}
-	fmt.Fprintf(os.Stdout, "# Done\n")
+	fmt.Fprintln(os.Stdout, "# Done")
 }
diff --git a/go/logic/applier.go b/go/logic/applier.go
index 0fbf9f3..79d9083 100644
--- a/go/logic/applier.go
+++ b/go/logic/applier.go
@@ -1042,7 +1042,6 @@ func (this *Applier) buildDMLEventQuery(dmlEvent *binlog.BinlogDMLEvent) (result
 
 // ApplyDMLEventQueries applies multiple DML queries onto the _ghost_ table
 func (this *Applier) ApplyDMLEventQueries(dmlEvents [](*binlog.BinlogDMLEvent)) error {
-
 	var totalDelta int64
 
 	err := func() error {
diff --git a/go/logic/migrator.go b/go/logic/migrator.go
index 159d294..8dc9910 100644
--- a/go/logic/migrator.go
+++ b/go/logic/migrator.go
@@ -978,7 +978,7 @@ func (this *Migrator) printStatus(rule PrintStatusRule, writers ...io.Writer) {
 		state = fmt.Sprintf("throttled, %s", throttleReason)
 	}
 
-	shouldPrintStatus := false
+	var shouldPrintStatus bool
 	if rule == HeuristicPrintStatusRule {
 		if elapsedSeconds <= 60 {
 			shouldPrintStatus = true
@@ -1292,7 +1292,7 @@ func (this *Migrator) executeWriteFuncs() error {
 						if niceRatio := this.migrationContext.GetNiceRatio(); niceRatio > 0 {
 							copyRowsDuration := time.Since(copyRowsStartTime)
 							sleepTimeNanosecondFloat64 := niceRatio * float64(copyRowsDuration.Nanoseconds())
-							sleepTime := time.Duration(time.Duration(int64(sleepTimeNanosecondFloat64)) * time.Nanosecond)
+							sleepTime := time.Duration(int64(sleepTimeNanosecondFloat64)) * time.Nanosecond
 							time.Sleep(sleepTime)
 						}
 					}
diff --git a/go/logic/server.go b/go/logic/server.go
index 5356a82..4b1b870 100644
--- a/go/logic/server.go
+++ b/go/logic/server.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2021 GitHub Inc.
+   Copyright 2022 GitHub Inc.
 	 See https://github.com/github/gh-ost/blob/master/LICENSE
 */
 
@@ -122,8 +122,6 @@ func (this *Server) onServerCommand(command string, writer *bufio.Writer) (err e
 
 // applyServerCommand parses and executes commands by user
 func (this *Server) applyServerCommand(command string, writer *bufio.Writer) (printStatusRule PrintStatusRule, err error) {
-	printStatusRule = NoPrintStatusRule
-
 	tokens := strings.SplitN(command, "=", 2)
 	command = strings.TrimSpace(tokens[0])
 	arg := ""
diff --git a/go/logic/streamer.go b/go/logic/streamer.go
index 3041d7b..dc40ca3 100644
--- a/go/logic/streamer.go
+++ b/go/logic/streamer.go
@@ -59,7 +59,6 @@ func NewEventsStreamer(migrationContext *base.MigrationContext) *EventsStreamer
 // AddListener registers a new listener for binlog events, on a per-table basis
 func (this *EventsStreamer) AddListener(
 	async bool, databaseName string, tableName string, onDmlEvent func(event *binlog.BinlogDMLEvent) error) (err error) {
-
 	this.listenersMutex.Lock()
 	defer this.listenersMutex.Unlock()
 
diff --git a/go/logic/throttler.go b/go/logic/throttler.go
index 849f40f..1e7bc97 100644
--- a/go/logic/throttler.go
+++ b/go/logic/throttler.go
@@ -180,7 +180,6 @@ func (this *Throttler) collectReplicationLag(firstThrottlingCollected chan<- boo
 
 // collectControlReplicasLag polls all the control replicas to get maximum lag value
 func (this *Throttler) collectControlReplicasLag() {
-
 	if atomic.LoadInt64(&this.migrationContext.HibernateUntil) > 0 {
 		return
 	}
diff --git a/go/mysql/instance_key.go b/go/mysql/instance_key.go
index 679bdc9..3d2bff1 100644
--- a/go/mysql/instance_key.go
+++ b/go/mysql/instance_key.go
@@ -35,8 +35,7 @@ const detachHint = "//"
 
 // ParseInstanceKey will parse an InstanceKey from a string representation such as 127.0.0.1:3306
 func NewRawInstanceKey(hostPort string) (*InstanceKey, error) {
-	hostname := ""
-	port := ""
+	var hostname, port string
 	if submatch := ipv4HostPortRegexp.FindStringSubmatch(hostPort); len(submatch) > 0 {
 		hostname = submatch[1]
 		port = submatch[2]
diff --git a/go/sql/builder.go b/go/sql/builder.go
index b24a848..025d4a8 100644
--- a/go/sql/builder.go
+++ b/go/sql/builder.go
@@ -167,7 +167,7 @@ func BuildRangeComparison(columns []string, values []string, args []interface{},
 	if includeEquals {
 		comparison, err := BuildEqualsComparison(columns, values)
 		if err != nil {
-			return "", explodedArgs, nil
+			return "", explodedArgs, err
 		}
 		comparisons = append(comparisons, comparison)
 		explodedArgs = append(explodedArgs, args...)
diff --git a/go/sql/parser.go b/go/sql/parser.go
index eac0bdc..a72af33 100644
--- a/go/sql/parser.go
+++ b/go/sql/parser.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2016 GitHub Inc.
+   Copyright 2022 GitHub Inc.
 	 See https://github.com/github/gh-ost/blob/master/LICENSE
 */
 
@@ -135,7 +135,6 @@ func (this *AlterTableParser) parseAlterToken(alterToken string) (err error) {
 }
 
 func (this *AlterTableParser) ParseAlterStatement(alterStatement string) (err error) {
-
 	this.alterStatementOptions = alterStatement
 	for _, alterTableRegexp := range alterTableExplicitSchemaTableRegexps {
 		if submatch := alterTableRegexp.FindStringSubmatch(this.alterStatementOptions); len(submatch) > 0 {
diff --git a/go/sql/parser_test.go b/go/sql/parser_test.go
index 645989d..79a9b7b 100644
--- a/go/sql/parser_test.go
+++ b/go/sql/parser_test.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2016 GitHub Inc.
+   Copyright 2022 GitHub Inc.
 	 See https://github.com/github/gh-ost/blob/master/LICENSE
 */
 
@@ -40,7 +40,6 @@ func TestParseAlterStatementTrivialRename(t *testing.T) {
 }
 
 func TestParseAlterStatementWithAutoIncrement(t *testing.T) {
-
 	statements := []string{
 		"auto_increment=7",
 		"auto_increment = 7",
@@ -150,7 +149,6 @@ func TestSanitizeQuotesFromAlterStatement(t *testing.T) {
 }
 
 func TestParseAlterStatementDroppedColumns(t *testing.T) {
-
 	{
 		parser := NewAlterTableParser()
 		statement := "drop column b"
@@ -190,7 +188,6 @@ func TestParseAlterStatementDroppedColumns(t *testing.T) {
 }
 
 func TestParseAlterStatementRenameTable(t *testing.T) {
-
 	{
 		parser := NewAlterTableParser()
 		statement := "drop column b"
@@ -230,7 +227,6 @@ func TestParseAlterStatementRenameTable(t *testing.T) {
 }
 
 func TestParseAlterStatementExplicitTable(t *testing.T) {
-
 	{
 		parser := NewAlterTableParser()
 		statement := "drop column b"