diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4dd2274ae..4733d5192 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,7 +1,7 @@
 version: 2.1
 
 orbs:
-  architect: giantswarm/architect@0.7.0
+  architect: giantswarm/architect@0.8.8
 
 workflows:
   workflow:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b8f59265b..f0a14b055 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - Replace custom `time.Time` wrapper `DeepCopyTime` with Kubernetes built-in `metav1.Time`.
+- Update `architect-orb` to `v0.8.8`.
 
 ## [0.2.6] - 2020-04-15
 
diff --git a/go.mod b/go.mod
index 7002d622f..b3af85865 100644
--- a/go.mod
+++ b/go.mod
@@ -5,6 +5,7 @@ go 1.13
 require (
 	github.com/go-openapi/errors v0.19.4
 	github.com/google/go-cmp v0.4.0
+	golang.org/x/tools v0.0.0-20200415034506-5d8e1897c761 // indirect
 	k8s.io/api v0.16.6
 	k8s.io/apiextensions-apiserver v0.16.6
 	k8s.io/apimachinery v0.16.6
diff --git a/pkg/apis/infrastructure/v1alpha2/common_cluster_status_funcs.go b/pkg/apis/infrastructure/v1alpha2/common_cluster_status_funcs.go
index 3592ae21c..7c453fcde 100644
--- a/pkg/apis/infrastructure/v1alpha2/common_cluster_status_funcs.go
+++ b/pkg/apis/infrastructure/v1alpha2/common_cluster_status_funcs.go
@@ -228,10 +228,7 @@ func withCondition(conditions []CommonClusterStatusCondition, condition CommonCl
 		}
 
 		newConditions = append(newConditions, condition)
-
-		for _, c := range conditions {
-			newConditions = append(newConditions, c)
-		}
+		newConditions = append(newConditions, conditions...)
 	}
 
 	// The new list is sorted to have the first item being the oldest. This is to
@@ -339,9 +336,7 @@ func withVersion(versions []CommonClusterStatusVersion, version CommonClusterSta
 
 	// Create a copy to not manipulate the input list.
 	var newVersions []CommonClusterStatusVersion
-	for _, v := range versions {
-		newVersions = append(newVersions, v)
-	}
+	newVersions = append(newVersions, versions...)
 
 	// Sort the versions in a way that the newest version, namely the one with the
 	// highest timestamp, is at the top of the list.
diff --git a/pkg/apis/release/v1alpha1/release_types.go b/pkg/apis/release/v1alpha1/release_types.go
index 255e47739..7f22120d7 100644
--- a/pkg/apis/release/v1alpha1/release_types.go
+++ b/pkg/apis/release/v1alpha1/release_types.go
@@ -135,9 +135,9 @@ spec:
 type ReleaseState string
 
 var (
-	stateActive     ReleaseState = "active"
-	stateDeprecated ReleaseState = "deprecated"
-	stateWIP        ReleaseState = "wip"
+	stateActive     ReleaseState = "active"     // nolint
+	stateDeprecated ReleaseState = "deprecated" // nolint
+	stateWIP        ReleaseState = "wip"        // nolint
 	releaseCRD      *apiextensionsv1beta1.CustomResourceDefinition
 )
 
diff --git a/pkg/clientset/versioned/fake/register.go b/pkg/clientset/versioned/fake/register.go
index ddabbb93e..02da0520a 100644
--- a/pkg/clientset/versioned/fake/register.go
+++ b/pkg/clientset/versioned/fake/register.go
@@ -36,7 +36,7 @@ import (
 
 var scheme = runtime.NewScheme()
 var codecs = serializer.NewCodecFactory(scheme)
-var parameterCodec = runtime.NewParameterCodec(scheme)
+var parameterCodec = runtime.NewParameterCodec(scheme) // nolint
 var localSchemeBuilder = runtime.SchemeBuilder{
 	applicationv1alpha1.AddToScheme,
 	backupv1alpha1.AddToScheme,
diff --git a/scripts/gen.sh b/scripts/gen.sh
index c1af5a493..5975bba22 100755
--- a/scripts/gen.sh
+++ b/scripts/gen.sh
@@ -25,3 +25,6 @@ if [ ! -x "$(command -v goimports)" ]; then
 fi
 echo "Fixing imports in-place with goimports"
 goimports -local github.com/giantswarm/apiextensions -w ./pkg
+
+echo "Applying linter patch to generated files"
+git apply "$dir/generated.patch"
diff --git a/scripts/generated.patch b/scripts/generated.patch
new file mode 100644
index 000000000..f77f8dc4b
--- /dev/null
+++ b/scripts/generated.patch
@@ -0,0 +1,13 @@
+diff --git a/pkg/clientset/versioned/fake/register.go b/pkg/clientset/versioned/fake/register.go
+index ddabbb93..02da0520 100644
+--- a/pkg/clientset/versioned/fake/register.go
++++ b/pkg/clientset/versioned/fake/register.go
+@@ -36,7 +36,7 @@ import (
+ 
+ var scheme = runtime.NewScheme()
+ var codecs = serializer.NewCodecFactory(scheme)
+-var parameterCodec = runtime.NewParameterCodec(scheme)
++var parameterCodec = runtime.NewParameterCodec(scheme) // nolint
+ var localSchemeBuilder = runtime.SchemeBuilder{
+ 	applicationv1alpha1.AddToScheme,
+ 	backupv1alpha1.AddToScheme,