diff --git a/cmd/cc-metric-store/main.go b/cmd/cc-metric-store/main.go
index c1c03e7..b69d78e 100644
--- a/cmd/cc-metric-store/main.go
+++ b/cmd/cc-metric-store/main.go
@@ -83,13 +83,11 @@ func runServer(ctx context.Context) error {
 	errChan := make(chan error, 1)
 
 	// Start HTTP server
-	wg.Add(1)
-	go func() {
-		defer wg.Done()
+	wg.Go(func() {
 		if err := srv.Start(ctx); err != nil {
 			errChan <- err
 		}
-	}()
+	})
 
 	// Handle shutdown signals
 	wg.Add(1)
diff --git a/internal/api/authentication.go b/internal/api/authentication.go
index 3f91054..8cf3da9 100644
--- a/internal/api/authentication.go
+++ b/internal/api/authentication.go
@@ -39,7 +39,7 @@ func authHandler(next http.Handler, publicKey ed25519.PublicKey) http.Handler {
 		// In case expiration and so on are specified, the Parse function
 		// already returns an error for expired tokens.
 		var err error
-		token, err = jwt.Parse(rawtoken, func(t *jwt.Token) (interface{}, error) {
+		token, err = jwt.Parse(rawtoken, func(t *jwt.Token) (any, error) {
 			if t.Method != jwt.SigningMethodEdDSA {
 				return nil, errors.New("only Ed25519/EdDSA supported")
 			}
diff --git a/internal/api/nodeprovider.go b/internal/api/nodeprovider.go
index 2f57f3f..36b6325 100644
--- a/internal/api/nodeprovider.go
+++ b/internal/api/nodeprovider.go
@@ -15,15 +15,15 @@ import (
 // BackendNodeProvider implements metricstore.NodeProvider by querying
 // the cc-backend /api/jobs/used_nodes endpoint.
 type BackendNodeProvider struct {
-	backendUrl string
+	backendURL string
 	client     *http.Client
 }
 
 // NewBackendNodeProvider creates a new BackendNodeProvider that queries
 // the given cc-backend URL for used nodes information.
-func NewBackendNodeProvider(backendUrl string) *BackendNodeProvider {
+func NewBackendNodeProvider(backendURL string) *BackendNodeProvider {
 	return &BackendNodeProvider{
-		backendUrl: backendUrl,
+		backendURL: backendURL,
 		client: &http.Client{
 			Timeout: 10 * time.Second,
 		},
@@ -33,7 +33,7 @@ func NewBackendNodeProvider(backendUrl string) *BackendNodeProvider {
 // GetUsedNodes returns a map of cluster names to sorted lists of unique hostnames
 // that are currently in use by jobs that started before the given timestamp.
 func (p *BackendNodeProvider) GetUsedNodes(ts int64) (map[string][]string, error) {
-	url := fmt.Sprintf("%s/api/jobs/used_nodes?ts=%d", p.backendUrl, ts)
+	url := fmt.Sprintf("%s/api/jobs/used_nodes?ts=%d", p.backendURL, ts)
 
 	resp, err := p.client.Get(url)
 	if err != nil {