diff --git a/packages/app/src/cli/services/dev/extension/utilities.test.ts b/packages/app/src/cli/services/dev/extension/utilities.test.ts
index 6ad9c0e2a6..7a1211a7f8 100644
--- a/packages/app/src/cli/services/dev/extension/utilities.test.ts
+++ b/packages/app/src/cli/services/dev/extension/utilities.test.ts
@@ -19,17 +19,18 @@ describe('getExtensionPointTargetSurface()', () => {
     expect(getExtensionPointTargetSurface('purchase.thank-you.cart-line-list.render-after')).toBe('checkout')
   })
 
-  test('returns "checkout" for a checkout UI extension target that starts with customer-account', async () => {
-    expect(getExtensionPointTargetSurface('customer-account.order-status.block.render')).toBe('checkout')
-    expect(getExtensionPointTargetSurface('customer-account.order-status.customer-information.render-after')).toBe(
-      'checkout',
-    )
-    expect(getExtensionPointTargetSurface('customer-account.order-status.cart-line-item.render-after')).toBe('checkout')
-    expect(getExtensionPointTargetSurface('customer-account.order-status.cart-line-list.render-after')).toBe('checkout')
-  })
-
   test('returns "customer-accounts" for a Customer Account UI extension', async () => {
     expect(getExtensionPointTargetSurface('customer-account.dynamic.render')).toBe('customer-accounts')
+    expect(getExtensionPointTargetSurface('customer-account.order-status.block.render')).toBe('customer-accounts')
+    expect(getExtensionPointTargetSurface('customer-account.order-status.customer-information.render-after')).toBe(
+      'customer-accounts',
+    )
+    expect(getExtensionPointTargetSurface('customer-account.order-status.cart-line-item.render-after')).toBe(
+      'customer-accounts',
+    )
+    expect(getExtensionPointTargetSurface('customer-account.order-status.cart-line-list.render-after')).toBe(
+      'customer-accounts',
+    )
   })
 
   test('returns "post_purchase" for a Post Purchase UI extension', async () => {
diff --git a/packages/app/src/cli/services/dev/extension/utilities.ts b/packages/app/src/cli/services/dev/extension/utilities.ts
index c605ae313d..6288f770fa 100644
--- a/packages/app/src/cli/services/dev/extension/utilities.ts
+++ b/packages/app/src/cli/services/dev/extension/utilities.ts
@@ -2,13 +2,6 @@ import {ExtensionInstance} from '../../../models/extensions/extension-instance.j
 
 import {fetchProductVariant} from '../../../utilities/extensions/fetch-product-variant.js'
 
-const CUSTOMER_ACCOUNT_CHECKOUT_RENDERED_TARGETS = new Set([
-  'customer-account.order-status.cart-line-item.render-after',
-  'customer-account.order-status.cart-line-list.render-after',
-  'customer-account.order-status.customer-information.render-after',
-  'customer-account.order-status.block.render',
-])
-
 /**
  * To prepare UI Extensions targeting Checkout for dev'ing we need to retrieve a valid product variant ID
  * @param extensions - The UI Extensions to dev
@@ -41,12 +34,7 @@ export function getExtensionPointTargetSurface(extensionPointTarget: string) {
     }
 
     // Covers Customer Accounts UI extensions (future)
-    case 'customeraccount':
     case 'customer-account': {
-      if (CUSTOMER_ACCOUNT_CHECKOUT_RENDERED_TARGETS.has(extensionPointTarget)) {
-        return 'checkout'
-      }
-
       return 'customer-accounts'
     }