diff --git a/auth/authz.go b/auth/authz.go
index 77bbd8538e..dc8ce20c8a 100644
--- a/auth/authz.go
+++ b/auth/authz.go
@@ -43,7 +43,7 @@ func GetEntitlement(ctx context.Context, entitlementEndpoint string, entitlement
 		if err != nil {
 			log.Error(ctx, map[string]interface{}{
 				"entitlement_resource": entitlementResource,
-				"err": err.Error(),
+				"err":                  err.Error(),
 			}, "unable to marshal keycloak entitlement resource struct")
 			return nil, errors.NewInternalError(ctx, errs.Wrap(err, "unable to marshal keycloak entitlement resource struct"))
 		}
@@ -65,7 +65,7 @@ func GetEntitlement(ctx context.Context, entitlementEndpoint string, entitlement
 	if err != nil {
 		log.Error(ctx, map[string]interface{}{
 			"entitlement_resource": entitlementResource,
-			"err": err.Error(),
+			"err":                  err.Error(),
 		}, "unable to obtain entitlement resource")
 		return nil, errors.NewInternalError(ctx, errs.Wrap(err, "unable to obtain entitlement resource"))
 	}
diff --git a/controller/deployments.go b/controller/deployments.go
index 28616cf5af..149978318e 100644
--- a/controller/deployments.go
+++ b/controller/deployments.go
@@ -83,7 +83,7 @@ func (g *defaultClientGetter) GetAndCheckOSIOClient(ctx context.Context) (Opensh
 		if err != nil {
 			log.Error(ctx, map[string]interface{}{
 				"FABRIC8_WIT_API_URL": witURLStr,
-				"err": err,
+				"err":                 err,
 			}, "cannot parse FABRIC8_WIT_API_URL: %s", witURLStr)
 			return nil, errs.Wrapf(err, "cannot parse FABRIC8_WIT_API_URL: %s", witURLStr)
 		}
diff --git a/controller/work_item_link.go b/controller/work_item_link.go
index aadc4912f3..f54bc95b8d 100644
--- a/controller/work_item_link.go
+++ b/controller/work_item_link.go
@@ -68,8 +68,8 @@ func newWorkItemLinkContext(ctx context.Context, service *goa.Service, appl appl
 		Context:               ctx,
 		Service:               service,
 		CurrentUserIdentityID: currentUserIdentityID,
-		DB:       db,
-		LinkFunc: linkFunc,
+		DB:                    db,
+		LinkFunc:              linkFunc,
 	}
 }
 
diff --git a/login/service.go b/login/service.go
index 2e2e148512..c1e9bc89fa 100644
--- a/login/service.go
+++ b/login/service.go
@@ -71,7 +71,7 @@ func (keycloak *KeycloakOAuthProvider) CreateOrUpdateKeycloakUser(accessToken st
 	if err != nil {
 		log.Error(ctx, map[string]interface{}{
 			"keycloak_identity_id": keycloakIdentityID,
-			"err": err,
+			"err":                  err,
 		}, "unable to  query for an identity by ID")
 		return nil, nil, errors.New("Error during querying for an identity by ID " + err.Error())
 	}
@@ -84,7 +84,7 @@ func (keycloak *KeycloakOAuthProvider) CreateOrUpdateKeycloakUser(accessToken st
 		if err != nil {
 			log.Error(ctx, map[string]interface{}{
 				"keycloak_identity_id": keycloakIdentityID,
-				"err": err,
+				"err":                  err,
 			}, "unable to create user/identity")
 			return nil, nil, errors.New("failed to update user/identity from claims" + err.Error())
 		}
@@ -126,7 +126,7 @@ func (keycloak *KeycloakOAuthProvider) CreateOrUpdateKeycloakUser(accessToken st
 		if err != nil {
 			log.Error(ctx, map[string]interface{}{
 				"keycloak_identity_id": keycloakIdentityID,
-				"err": err,
+				"err":                  err,
 			}, "unable to create user/identity")
 			return nil, nil, errs.Wrapf(err, "failed to update user/identity from claims")
 		} else if isChanged {
diff --git a/search/search_repository_whitebox_test.go b/search/search_repository_whitebox_test.go
index 5a07116271..505692c823 100644
--- a/search/search_repository_whitebox_test.go
+++ b/search/search_repository_whitebox_test.go
@@ -215,18 +215,18 @@ func TestGetSearchQueryFromURLString(t *testing.T) {
 
 func TestIsOperator(t *testing.T) {
 	testData := map[string]bool{
-		AND:   true,
-		OR:    true,
-		OPTS:  false,
-		"":    false,
-		"   ": false,
-		"foo": false,
+		AND:                   true,
+		OR:                    true,
+		OPTS:                  false,
+		"":                    false,
+		"   ":                 false,
+		"foo":                 false,
 		uuid.NewV4().String(): false,
-		EQ:     false,
-		NE:     false,
-		NOT:    false,
-		IN:     false,
-		SUBSTR: false,
+		EQ:                    false,
+		NE:                    false,
+		NOT:                   false,
+		IN:                    false,
+		SUBSTR:                false,
 	}
 	for k, v := range testData {
 		t.Run(k, func(t *testing.T) {
diff --git a/test/recorder/recorder.go b/test/recorder/recorder.go
index c94d286c18..31c813a8b4 100644
--- a/test/recorder/recorder.go
+++ b/test/recorder/recorder.go
@@ -86,8 +86,8 @@ func newJWTMatcher(publicKey string) cassette.Matcher {
 			return true
 		}
 		log.Debug(nil, map[string]interface{}{
-			"method": cassetteRequest.Method,
-			"url":    cassetteRequest.URL,
+			"method":              cassetteRequest.Method,
+			"url":                 cassetteRequest.URL,
 			"cassetteRequest_sub": sub,
 			"http_request_sub":    claims["sub"],
 		}, "Authorization header's 'sub' claim doesn't match with the current request")