diff --git a/pkg/controller/cloudfront/originaccesscontrol/setup.go b/pkg/controller/cloudfront/originaccesscontrol/setup.go
index d2ba30fbed..5e7a435e5e 100644
--- a/pkg/controller/cloudfront/originaccesscontrol/setup.go
+++ b/pkg/controller/cloudfront/originaccesscontrol/setup.go
@@ -14,20 +14,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-//nolint:gocyclo,staticcheck,golint
 package originaccesscontrol
 
 import (
 	"context"
 	"slices"
 
-	svcapitypes "github.com/crossplane-contrib/provider-aws/apis/cloudfront/v1alpha1"
-	"github.com/crossplane-contrib/provider-aws/apis/v1alpha1"
-	cloudfront "github.com/crossplane-contrib/provider-aws/pkg/controller/cloudfront/utils"
-	"github.com/crossplane-contrib/provider-aws/pkg/features"
-	"github.com/crossplane-contrib/provider-aws/pkg/utils/pointer"
-	custommanaged "github.com/crossplane-contrib/provider-aws/pkg/utils/reconciler/managed"
-
+	svcsdk "github.com/aws/aws-sdk-go/service/cloudfront"
 	xpv1 "github.com/crossplane/crossplane-runtime/apis/common/v1"
 	"github.com/crossplane/crossplane-runtime/pkg/connection"
 	"github.com/crossplane/crossplane-runtime/pkg/controller"
@@ -36,9 +29,14 @@ import (
 	"github.com/crossplane/crossplane-runtime/pkg/meta"
 	"github.com/crossplane/crossplane-runtime/pkg/reconciler/managed"
 	"github.com/crossplane/crossplane-runtime/pkg/resource"
-
-	svcsdk "github.com/aws/aws-sdk-go/service/cloudfront"
 	ctrl "sigs.k8s.io/controller-runtime"
+
+	svcapitypes "github.com/crossplane-contrib/provider-aws/apis/cloudfront/v1alpha1"
+	"github.com/crossplane-contrib/provider-aws/apis/v1alpha1"
+	cloudfront "github.com/crossplane-contrib/provider-aws/pkg/controller/cloudfront/utils"
+	"github.com/crossplane-contrib/provider-aws/pkg/features"
+	"github.com/crossplane-contrib/provider-aws/pkg/utils/pointer"
+	custommanaged "github.com/crossplane-contrib/provider-aws/pkg/utils/reconciler/managed"
 )
 
 var (
diff --git a/pkg/controller/cloudfront/originaccesscontrol/setup_test.go b/pkg/controller/cloudfront/originaccesscontrol/setup_test.go
index 54924707fe..4391983bc2 100644
--- a/pkg/controller/cloudfront/originaccesscontrol/setup_test.go
+++ b/pkg/controller/cloudfront/originaccesscontrol/setup_test.go
@@ -20,15 +20,14 @@ import (
 	"context"
 	"testing"
 
-	svcapitypes "github.com/crossplane-contrib/provider-aws/apis/cloudfront/v1alpha1"
-
+	svcsdk "github.com/aws/aws-sdk-go/service/cloudfront"
 	"github.com/crossplane/crossplane-runtime/pkg/errors"
 	"github.com/crossplane/crossplane-runtime/pkg/meta"
 	"github.com/crossplane/crossplane-runtime/pkg/test"
-
-	svcsdk "github.com/aws/aws-sdk-go/service/cloudfront"
 	"github.com/google/go-cmp/cmp"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	svcapitypes "github.com/crossplane-contrib/provider-aws/apis/cloudfront/v1alpha1"
 )
 
 type upToDateArgs struct {