diff --git a/.golangci.yml b/.golangci.yml
index 96e674052dd..d0643633741 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -16,7 +16,7 @@
 linters:
   enable:
   - asciicheck
-  - deadcode
+  - unused
   - depguard
   - errcheck
   - errorlint
diff --git a/pkg/policy/eval.go b/pkg/policy/eval.go
index bc91acd1b35..72a80241f72 100644
--- a/pkg/policy/eval.go
+++ b/pkg/policy/eval.go
@@ -51,7 +51,7 @@ func EvaluatePolicyAgainstJSON(ctx context.Context, name, policyType string, pol
 }
 
 // evaluateCue evaluates a cue policy `evaluator` against `attestation`
-func evaluateCue(ctx context.Context, attestation []byte, evaluator string) error {
+func evaluateCue(_ context.Context, attestation []byte, evaluator string) error {
 	log.Printf("Evaluating attestation: %s", string(attestation))
 	log.Printf("Evaluator: %s", evaluator)
 
@@ -72,7 +72,7 @@ func evaluateCue(ctx context.Context, attestation []byte, evaluator string) erro
 }
 
 // evaluateRego evaluates a rego policy `evaluator` against `attestation`
-func evaluateRego(ctx context.Context, attestation []byte, evaluator string) error {
+func evaluateRego(_ context.Context, attestation []byte, evaluator string) error {
 	log.Printf("Evaluating attestation: %s", string(attestation))
 	log.Printf("Evaluating evaluator: %s", evaluator)
 
diff --git a/test/cmd/getoidctoken/main.go b/test/cmd/getoidctoken/main.go
index 6a94984eac5..f9abec35ead 100644
--- a/test/cmd/getoidctoken/main.go
+++ b/test/cmd/getoidctoken/main.go
@@ -19,6 +19,7 @@ import (
 	"log"
 	"net/http"
 	"os"
+	"time"
 
 	"github.com/kelseyhightower/envconfig"
 )
@@ -52,7 +53,14 @@ func main() {
 		log.Fatalf("failed to process env var: %s", err)
 	}
 	http.HandleFunc("/", tokenWriter(env.FileName))
-	if err := http.ListenAndServe(":8080", nil); err != nil {
+
+	srv := &http.Server{
+		Addr:         ":8080",
+		ReadTimeout:  10 * time.Second,
+		WriteTimeout: 10 * time.Second,
+	}
+
+	if err := srv.ListenAndServe(); err != nil {
 		panic(err)
 	}
 }