diff --git a/.golangci.yml b/.golangci.yml
index 054f1a1a8ac175cc496229c131c3649094d08905..746c44f1f4e2418ebaa68cd0d971a7c9c9b7ef0b 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -77,8 +77,12 @@ linters-settings:
   # Disable error checking, as errorcheck detects more errors and is more configurable.
   gosec:
     excludes:
-      - "G104"
+      - "G115"
+      - "G204"
       - "G304"
+      - "G404"
+      - "G401"
+      - "G501"
 
   funlen:
     lines: 80
@@ -240,7 +244,6 @@ linters:
     - gosimple
     - ineffassign
     - misspell
-    - nakedret
     - staticcheck
     - typecheck
     - unconvert
diff --git a/qemu.go b/qemu.go
index b17a4648dc1e24476519984bbee78a52c2946f48..433302addc5a8c7b023decbd03e4e62dbaa01282 100644
--- a/qemu.go
+++ b/qemu.go
@@ -99,7 +99,7 @@ func (*qemuVMProvider) Build(tx Transaction, v *VM, n *Network) error {
 }
 
 // Enable the telnetPort when debugging image builds.
-//var telnetPort = 2020
+// var telnetPort = 2020
 
 func runVM(vm *VM, network *Network) RunnableTask {
 	// See aux/post-install.sh for how the vmine_ kernel
@@ -115,7 +115,7 @@ func runVM(vm *VM, network *Network) RunnableTask {
 		bootArgs = fmt.Sprintf("%s vmine_ssh_key=%s", bootArgs, strings.Replace(vm.SSHKey, " ", "_", -1))
 	}
 
-	//telnetPort++
+	// telnetPort++
 
 	return newCmd(
 		"/usr/bin/qemu-system-x86_64",
@@ -146,8 +146,8 @@ func runVM(vm *VM, network *Network) RunnableTask {
 		"-m", fmt.Sprintf("%dM", vm.RAM),
 		"-smp", fmt.Sprintf("%d", vm.CPU),
 		// Serial console for debugging.
-		//"-serial", "file:"+vm.Hostname+".log",
-		//"-serial", fmt.Sprintf("telnet:127.0.0.1:%d,server,nowait", telnetPort),
+		// "-serial", "file:"+vm.Hostname+".log",
+		// "-serial", fmt.Sprintf("telnet:127.0.0.1:%d,server,nowait", telnetPort),
 		// Boot parameters.
 		"-kernel", vm.Image.KernelPath,
 		"-initrd", vm.Image.InitrdPath,