diff --git a/.circleci/config.yml b/.circleci/config.yml
index bffa675e2..ce2304991 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,7 +1,7 @@
 version: 2.1
 
 orbs:
-  architect: giantswarm/architect@5.4.0
+  architect: giantswarm/architect@5.5.0
 
 workflows:
   build:
diff --git a/service/controller/key/key.go b/service/controller/key/key.go
index 52d0dab04..e86980ad0 100644
--- a/service/controller/key/key.go
+++ b/service/controller/key/key.go
@@ -46,7 +46,7 @@ func CertConfigCertOperatorVersion(cr v1alpha1.CertConfig) string {
 func DNSIP(clusterIPRange string) (string, error) {
 	ip, _, err := net.ParseCIDR(clusterIPRange)
 	if err != nil {
-		return "", microerror.Maskf(invalidConfigError, err.Error())
+		return "", microerror.Maskf(invalidConfigError, err.Error()) //nolint:all
 	}
 
 	// Only IPV4 CIDRs are supported.
diff --git a/service/internal/tenantclient/client.go b/service/internal/tenantclient/client.go
index 54f8a0d31..a2fc4a549 100644
--- a/service/internal/tenantclient/client.go
+++ b/service/internal/tenantclient/client.go
@@ -83,7 +83,7 @@ func (c *TenantClient) K8sClient(ctx context.Context, obj interface{}) (k8sclien
 
 		k8sClient, err = k8sclient.NewClients(c)
 		if err != nil {
-			return nil, microerror.Maskf(notAvailableError, err.Error())
+			return nil, microerror.Maskf(notAvailableError, err.Error()) //nolint:all
 		}
 	}