diff --git a/pkg/cluster/service.go b/pkg/cluster/service.go
index 0d3bec3b..94ee2704 100644
--- a/pkg/cluster/service.go
+++ b/pkg/cluster/service.go
@@ -234,7 +234,8 @@ func ListToolchainClusterConfigs(cl client.Client, namespace string, timeout tim
 	}
 	var configs []*Config
 	for _, cluster := range toolchainClusters.Items {
-		clusterConfig, err := NewClusterConfig(cl, &cluster, timeout) // nolint:gosec
+		cluster := cluster
+		clusterConfig, err := NewClusterConfig(cl, &cluster, timeout)
 		if err != nil {
 			return nil, err
 		}
diff --git a/pkg/template/processor.go b/pkg/template/processor.go
index a1ec4194..b8ae1921 100644
--- a/pkg/template/processor.go
+++ b/pkg/template/processor.go
@@ -2,7 +2,7 @@ package template
 
 import (
 	"fmt"
-	"math/rand" //nolint:gosec
+	"math/rand"
 	"time"
 
 	templatev1 "github.com/openshift/api/template/v1"
@@ -36,6 +36,7 @@ func (p Processor) Process(tmpl *templatev1.Template, values map[string]string,
 			v.Generate = ""
 		}
 	}
+
 	// convert the template into a set of objects
 	tmplProcessor := templateprocessing.NewProcessor(map[string]generator.Generator{
 		"expression": generator.NewExpressionValueGenerator(rand.New(rand.NewSource(time.Now().UnixNano()))), //nolint:gosec
diff --git a/pkg/template/template_test.go b/pkg/template/template_test.go
index 90aeeb97..755ec786 100644
--- a/pkg/template/template_test.go
+++ b/pkg/template/template_test.go
@@ -35,9 +35,9 @@ func TestLoadObjectsFromEmbedFS(t *testing.T) {
 		require.NotNil(t, allObjects)
 		require.NotNil(t, hostFolderObjects)
 		require.NotNil(t, memberFolderObjects)
-		require.Equal(t, 4, len(allObjects), "invalid number of expected total objects")
-		require.Equal(t, 3, len(hostFolderObjects), "invalid number of expected objects from host folder")
-		require.Equal(t, 1, len(memberFolderObjects), "invalid number of expected objects from member folder")
+		require.Len(t, allObjects, 4, "invalid number of expected total objects")
+		require.Len(t, hostFolderObjects, 3, "invalid number of expected objects from host folder")
+		require.Len(t, memberFolderObjects, 1, "invalid number of expected objects from member folder")
 		// check match for the expected objects
 		checkExpectedObjects(t, allObjects)
 	})
@@ -81,7 +81,7 @@ func checkExpectedObjects(t *testing.T, objects []*unstructured.Unstructured) {
 		Kind:     "Role",
 		Name:     "toolchaincluster-host",
 	}, roleBinding.RoleRef)
-	require.Equal(t, 1, len(roleBinding.Subjects))
+	require.Len(t, roleBinding.Subjects, 1)
 	require.Equal(t, rbac.Subject{
 		Kind: "ServiceAccount",
 		Name: "toolchaincluster-host",