diff --git a/packages/cli/src/commands/setup/auth/templates/clerk.auth.ts.template b/packages/cli/src/commands/setup/auth/templates/clerk.auth.ts.template
index 663e35766787..afdb7d78ed2c 100644
--- a/packages/cli/src/commands/setup/auth/templates/clerk.auth.ts.template
+++ b/packages/cli/src/commands/setup/auth/templates/clerk.auth.ts.template
@@ -1,5 +1,6 @@
 import { parseJWT } from '@redwoodjs/api'
 import { AuthenticationError, ForbiddenError } from '@redwoodjs/graphql-server'
+
 import { logger } from 'src/lib/logger'
 
 /**
diff --git a/packages/cli/src/commands/setup/auth/templates/dbAuth.auth.ts.template b/packages/cli/src/commands/setup/auth/templates/dbAuth.auth.ts.template
index 049eac3dbcf6..78370664b47c 100644
--- a/packages/cli/src/commands/setup/auth/templates/dbAuth.auth.ts.template
+++ b/packages/cli/src/commands/setup/auth/templates/dbAuth.auth.ts.template
@@ -1,8 +1,7 @@
-import { AuthenticationError, ForbiddenError } from '@redwoodjs/graphql-server'
-import { db } from './db'
-
 import type { DbAuthSession } from '@redwoodjs/api'
+import { AuthenticationError, ForbiddenError } from '@redwoodjs/graphql-server'
 
+import { db } from './db'
 
 /**
  * The session object sent in as the first argument to getCurrentUser() will
diff --git a/packages/cli/src/commands/setup/auth/templates/dbAuth.auth.webAuthn.ts.template b/packages/cli/src/commands/setup/auth/templates/dbAuth.auth.webAuthn.ts.template
index 0f3b31b695ae..c0ae70ac43d0 100644
--- a/packages/cli/src/commands/setup/auth/templates/dbAuth.auth.webAuthn.ts.template
+++ b/packages/cli/src/commands/setup/auth/templates/dbAuth.auth.webAuthn.ts.template
@@ -1,4 +1,5 @@
 import { AuthenticationError, ForbiddenError } from '@redwoodjs/graphql-server'
+
 import { db } from './db'
 
 /**
diff --git a/packages/cli/src/commands/setup/auth/templates/dbAuth.function.ts.template b/packages/cli/src/commands/setup/auth/templates/dbAuth.function.ts.template
index 176eb7c0f41c..624addc0b4a4 100644
--- a/packages/cli/src/commands/setup/auth/templates/dbAuth.function.ts.template
+++ b/packages/cli/src/commands/setup/auth/templates/dbAuth.function.ts.template
@@ -1,9 +1,9 @@
-import { db } from 'src/lib/db'
-import { DbAuthHandler } from '@redwoodjs/api'
-
 import type { APIGatewayProxyEvent, Context } from 'aws-lambda'
+
+import { DbAuthHandler } from '@redwoodjs/api'
 import type { DbAuthHandlerOptions } from '@redwoodjs/api'
 
+import { db } from 'src/lib/db'
 
 export const handler = async (
   event: APIGatewayProxyEvent,
diff --git a/packages/cli/src/commands/setup/auth/templates/dbAuth.function.webAuthn.ts.template b/packages/cli/src/commands/setup/auth/templates/dbAuth.function.webAuthn.ts.template
index 4636c6313f96..a9ec10d0fbfc 100644
--- a/packages/cli/src/commands/setup/auth/templates/dbAuth.function.webAuthn.ts.template
+++ b/packages/cli/src/commands/setup/auth/templates/dbAuth.function.webAuthn.ts.template
@@ -1,6 +1,7 @@
-import { db } from 'src/lib/db'
 import { DbAuthHandler } from '@redwoodjs/api'
 
+import { db } from 'src/lib/db'
+
 export const handler = async (event, context) => {
   const forgotPasswordOptions = {
     // handler() is invoked after verifying that a user was found with the given
diff --git a/packages/cli/src/commands/setup/auth/templates/firebase.auth.ts.template b/packages/cli/src/commands/setup/auth/templates/firebase.auth.ts.template
index e7e7a2539a7b..d3f2a16c29e5 100644
--- a/packages/cli/src/commands/setup/auth/templates/firebase.auth.ts.template
+++ b/packages/cli/src/commands/setup/auth/templates/firebase.auth.ts.template
@@ -1,6 +1,7 @@
-import { AuthenticationError } from '@redwoodjs/graphql-server'
 import admin from 'firebase-admin'
 
+import { AuthenticationError } from '@redwoodjs/graphql-server'
+
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const adminApp = admin.initializeApp({
   projectId: process.env.FIREBASE_PROJECT_ID,