diff --git a/pkg/metadata/dynamic.go b/pkg/metadata/dynamic.go
index 22c22a6e3f2..58b3e6e5bd3 100644
--- a/pkg/metadata/dynamic.go
+++ b/pkg/metadata/dynamic.go
@@ -23,7 +23,7 @@ import (
 
 	kcpdynamic "github.com/kcp-dev/client-go/dynamic"
 
-	dynamic "k8s.io/client-go/dynamic"
+	"k8s.io/client-go/dynamic"
 	"k8s.io/client-go/rest"
 
 	"github.com/kcp-dev/kcp/pkg/server/requestinfo"
diff --git a/pkg/proxy/config.go b/pkg/proxy/config.go
index ecfb67ddf89..efb057dfb6d 100644
--- a/pkg/proxy/config.go
+++ b/pkg/proxy/config.go
@@ -27,7 +27,7 @@ import (
 	clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
 
 	proxyoptions "github.com/kcp-dev/kcp/pkg/proxy/options"
-	bootstrap "github.com/kcp-dev/kcp/pkg/server/bootstrap"
+	"github.com/kcp-dev/kcp/pkg/server/bootstrap"
 )
 
 type Config struct {
diff --git a/pkg/reconciler/tenancy/replicateclusterrolebinding/replicateclusterrolebinding_controller.go b/pkg/reconciler/tenancy/replicateclusterrolebinding/replicateclusterrolebinding_controller.go
index dcaefe93920..d71f530631d 100644
--- a/pkg/reconciler/tenancy/replicateclusterrolebinding/replicateclusterrolebinding_controller.go
+++ b/pkg/reconciler/tenancy/replicateclusterrolebinding/replicateclusterrolebinding_controller.go
@@ -24,7 +24,7 @@ import (
 	rbacv1 "k8s.io/api/rbac/v1"
 
 	"github.com/kcp-dev/kcp/pkg/reconciler/cache/labelclusterrolebindings"
-	replicateclusterrole "github.com/kcp-dev/kcp/pkg/reconciler/tenancy/replicateclusterrole"
+	"github.com/kcp-dev/kcp/pkg/reconciler/tenancy/replicateclusterrole"
 	"github.com/kcp-dev/kcp/sdk/apis/tenancy"
 )
 
diff --git a/pkg/reconciler/tenancy/workspacemounts/workspacemounts_controller.go b/pkg/reconciler/tenancy/workspacemounts/workspacemounts_controller.go
index ea36d271e19..43726642804 100644
--- a/pkg/reconciler/tenancy/workspacemounts/workspacemounts_controller.go
+++ b/pkg/reconciler/tenancy/workspacemounts/workspacemounts_controller.go
@@ -41,7 +41,7 @@ import (
 	"github.com/kcp-dev/kcp/pkg/logging"
 	"github.com/kcp-dev/kcp/pkg/reconciler/committer"
 	"github.com/kcp-dev/kcp/pkg/reconciler/events"
-	tenancy "github.com/kcp-dev/kcp/sdk/apis/tenancy"
+	"github.com/kcp-dev/kcp/sdk/apis/tenancy"
 	tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1"
 	kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster"
 	tenancyv1alpha1client "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/tenancy/v1alpha1"
diff --git a/pkg/virtual/apiexport/authorizer/maximal_permission_policy_test.go b/pkg/virtual/apiexport/authorizer/maximal_permission_policy_test.go
index 524f8f2e230..a531069f8b0 100644
--- a/pkg/virtual/apiexport/authorizer/maximal_permission_policy_test.go
+++ b/pkg/virtual/apiexport/authorizer/maximal_permission_policy_test.go
@@ -20,7 +20,7 @@ import (
 	"context"
 	"testing"
 
-	logicalcluster "github.com/kcp-dev/logicalcluster/v3"
+	"github.com/kcp-dev/logicalcluster/v3"
 	"github.com/stretchr/testify/require"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/sdk/apis/core/install/install.go b/sdk/apis/core/install/install.go
index 84119b65de6..835f609825f 100644
--- a/sdk/apis/core/install/install.go
+++ b/sdk/apis/core/install/install.go
@@ -22,7 +22,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 
-	v1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1"
+	"github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1"
 )
 
 // Install registers the API group and adds types to a scheme