diff --git a/README.md b/README.md
index 48f7f31..f0c1c2f 100644
--- a/README.md
+++ b/README.md
@@ -69,18 +69,27 @@ pnpm install @fleetbase/registry-bridge-engine
 
 ## Registry Service
 
-With a Registry Service URL configured, Explore, Installed, installs and update checks go through the
-[Fleetbase Registry Service](https://github.com/fleetbase/registry) (API `v2`). Without one, Explore falls back to
-the cloud catalog at `REGISTRY_HOST` (`~registry/v1/extensions`), read-only.
+Explore, Installed, Purchased, installs, updates and purchases all go through the
+[Fleetbase Registry Service](https://github.com/fleetbase/registry). Publishing, review and payouts live on the
+service's publisher website; the console links to it as "Publisher portal".
 
 | Setting (env) | Purpose |
 | --- | --- |
-| `REGISTRY_SERVICE_URL` | Service base URL, for example `https://registry.fleetbase.io`. Also editable on the admin Registry Configuration page |
-| `REGISTRY_API_VERSION` | `v2` (default when a service URL is set) or `v1` to keep the cloud catalog fallback |
+| `REGISTRY_SERVICE_URL` | Service base URL, default `https://registry.fleetbase.io`. Also editable on the admin Registry Configuration page |
 | `REGISTRY_INSTANCE_KIND` | `self_hosted` (default) or `cloud`; reported at registration and matched against each extension's hosting |
 | `REGISTRY_INSTANCE_TOKEN` | Instance token, normally issued by registering from the admin page and stored encrypted in settings instead |
+| `REGISTRY_PUBLISHER_URL` | Publisher portal the console links to; defaults to the service URL |
+| `REGISTRY_SERVICE_CHECKOUT` | `auto` (default: on for a registered instance unless the service has no checkout route), `true` or `false` |
 | `REGISTRY_SETTINGS_CACHE_TTL` | Seconds the stored registry settings stay cached between requests (default `30`, `0` reads the table every request); a change forgets the cache at once |
 
+Explore lists every published extension. Those this instance cannot install (another hosting kind, no release) show
+why on the card and in the detail panel; without a registration, a banner says installs and purchases need one.
+
+Paid extensions are bought through the service's hosted Stripe Checkout ("Instance checkout" in the service README):
+`POST ~registry/v1/purchases/checkout` starts it and the console redirects; Stripe returns with `handoff` (and
+`cancelled=1` on cancel) and the console polls `GET ~registry/v1/purchases/{handoff}` until the webhook has created
+the licence. The receipt of a completed hand-off is kept for Purchased until the service sends it on the licence.
+
 Register the instance on the admin Registry Configuration page with a one-time code from an owner or admin of your
 registry organization (`POST /v1/account/instance-codes` on the service). The instance token is stored encrypted with
 the app key and only ever shown masked.
@@ -160,7 +169,7 @@ pnpm build
 
 ## Extension installer
 
-Installs, uninstalls and updates run as `InstallExtensionJob` on the `installer` queue, one at a time per instance (a cache lock owned by the running job). The console's `POST installer/install` and `installer/uninstall` return `202 { status: "queued", job }`; poll `GET installer/jobs/{id}` or listen on `install.{company}.{extension}` (`uninstall.…` for uninstalls) for `step` and `progress`. The console's install and uninstall modals do both (`addon/utils/installer-job.js`): they show the queue position and each step, count down to a reload on success, and on failure show the step, message and log tail with Retry.
+Installs, uninstalls and updates run as `InstallExtensionJob` on the `installer` queue, one at a time per instance (a cache lock owned by the running job). The console's `POST installer/install`, `installer/update` and `installer/uninstall` return `202 { status: "queued", job }`; poll `GET installer/jobs/{id}` or listen on `install.{company}.{extension}` (`uninstall.…` for uninstalls) for `step` and `progress`. The console's install and uninstall modals do both (`addon/utils/installer-job.js`): they show the queue position and each step, count down to a reload on success, and on failure show the step, message and log tail with Retry.
 
 ```bash
 php artisan registry:install pallet --release=0.0.2   # or pallet@0.0.2; artisan reserves --version
@@ -173,7 +182,7 @@ php artisan queue:work --queue=installer --timeout=7200   # the worker that runs
 
 When a release carries a prebuilt engine dist (D3 Outcome A), the engine step checks it against the console's `dist/host-modules.json` with `@fleetbase/ember-core`'s compatibility check, unpacks it into the runtime engines directory (default `<console>/dist/engines-dist`) and adds it to the manifest served at `GET ~registry/v1/engines/runtime`, which the console reads at boot. Without a prebuilt dist it falls back to `pnpm add` and `pnpm build`. Settings live under `registry-bridge.installer` in `server/config/registry-bridge.php`.
 
-Where releases come from is a `ReleaseSource`: with a Registry Service configured the service catalog is asked first and this instance's registry tables second (`SourceRoutingReleaseSource`). The job record's `extension.source` (`registry-service` or `local`) decides where the install is recorded and whether the service hears about it (`InstallReporter`); credentials reach Composer and pnpm through `PackageCredentials`, as process environment only.
+Releases come from the Registry Service (`ServiceReleaseSource`); installs are recorded in `registry_service_installs` and reported to the service (`InstallReporter`); credentials reach Composer and pnpm through `PackageCredentials`, as process environment only.
 
 ## Contributing
 See the Contributing Guide for details on how to contribute to this project.
diff --git a/addon/adapters/registry-extension-bundle.js b/addon/adapters/registry-extension-bundle.js
deleted file mode 100644
index ffb8d66..0000000
--- a/addon/adapters/registry-extension-bundle.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './registry-bridge';
diff --git a/addon/components/cell/extension-action.hbs b/addon/components/cell/extension-action.hbs
new file mode 100644
index 0000000..393b8c8
--- /dev/null
+++ b/addon/components/cell/extension-action.hbs
@@ -0,0 +1 @@
+<ExtensionCard::Action @resource={{@row}} @size="xs" @onAction={{@column.onAction}} @onOpen={{@column.onOpen}} />
diff --git a/addon/components/cell/extension-action.js b/addon/components/cell/extension-action.js
new file mode 100644
index 0000000..fa85053
--- /dev/null
+++ b/addon/components/cell/extension-action.js
@@ -0,0 +1,3 @@
+import templateOnly from '@ember/component/template-only';
+
+export default templateOnly();
diff --git a/addon/components/cell/extension-identity.hbs b/addon/components/cell/extension-identity.hbs
new file mode 100644
index 0000000..f64e225
--- /dev/null
+++ b/addon/components/cell/extension-identity.hbs
@@ -0,0 +1,8 @@
+<Table::Cell::Identity
+    @row={{@row}}
+    @column={{this.columnWith (config "defaultValues.extensionIcon")}}
+    @value={{@row}}
+    @onClick={{this.open}}
+    data-test-extension-identity
+    ...attributes
+/>
diff --git a/addon/components/cell/extension-identity.js b/addon/components/cell/extension-identity.js
new file mode 100644
index 0000000..cdc8b06
--- /dev/null
+++ b/addon/components/cell/extension-identity.js
@@ -0,0 +1,70 @@
+import Component from '@glimmer/component';
+import { inject as service } from '@ember/service';
+import { action } from '@ember/object';
+import { unavailableReason } from '../../utils/extension-state';
+
+/**
+ * An extension in a table cell: icon, name and badges (version, update,
+ * unavailable here, core) on `Table::Cell::Identity`. Clicking opens the detail
+ * panel unless the column has its own `onClick`.
+ */
+export default class CellExtensionIdentityComponent extends Component {
+    @service extensionPanel;
+    @service intl;
+
+    get extension() {
+        return this.args.row ?? {};
+    }
+
+    /**
+     * The identity column, with the extension icon fallback from the console
+     * config (passed in by the template's `config` helper).
+     */
+    columnWith = (fallbackImage) => {
+        return {
+            mediaPath: 'icon_url',
+            labelPath: 'name',
+            fallbackImage,
+            showStatusDot: false,
+            popover: false,
+            badgeLimit: 3,
+            badges: () => this.badges,
+            ...(this.args.column ?? {}),
+        };
+    };
+
+    get badges() {
+        const extension = this.extension;
+        const version = extension.installed_version || extension.current_bundle_version || extension.version;
+        const badges = [];
+        if (version) {
+            badges.push({ key: 'version', label: `v${version}` });
+        }
+        if (extension.update_available === true && extension.latest_version) {
+            badges.push({
+                key: 'update',
+                label: this.intl.t('registry-bridge.card.update', { version: extension.latest_version }),
+                class: 'bg-blue-100 text-blue-800 dark:bg-blue-900 dark:text-blue-200',
+            });
+        }
+        if (unavailableReason(extension)) {
+            badges.push({ key: 'unavailable', label: this.intl.t('registry-bridge.card.unavailable'), class: 'bg-yellow-100 text-yellow-800 dark:bg-yellow-900 dark:text-yellow-200' });
+        }
+        if (extension.core_extension === true) {
+            badges.push({ key: 'core', label: this.intl.t('registry-bridge.installed.status.core') });
+        }
+
+        return badges;
+    }
+
+    @action open(extension, event) {
+        if (typeof this.args.column?.onClick === 'function') {
+            return;
+        }
+        if (typeof this.args.onClick === 'function') {
+            return this.args.onClick(extension, event);
+        }
+
+        return this.extensionPanel.open(extension ?? this.extension);
+    }
+}
diff --git a/addon/components/cell/extension-status.hbs b/addon/components/cell/extension-status.hbs
new file mode 100644
index 0000000..9387ab9
--- /dev/null
+++ b/addon/components/cell/extension-status.hbs
@@ -0,0 +1,5 @@
+<div class="flex flex-row flex-wrap items-center gap-1" data-test-extension-status ...attributes>
+    {{#each this.badges as |badge|}}
+        <Badge @status={{badge.status}} @size="xs" @hideStatusDot={{true}} @disableHumanize={{true}} @helpText={{badge.help}}>{{badge.text}}</Badge>
+    {{/each}}
+</div>
diff --git a/addon/components/cell/extension-status.js b/addon/components/cell/extension-status.js
new file mode 100644
index 0000000..0cfd808
--- /dev/null
+++ b/addon/components/cell/extension-status.js
@@ -0,0 +1,49 @@
+import Component from '@glimmer/component';
+import { inject as service } from '@ember/service';
+import formatCurrency from '@fleetbase/ember-ui/utils/format-currency';
+import { cardModel, unavailableReason } from '../../utils/extension-state';
+
+/**
+ * Status badges for an extension row. `@column.variant`:
+ *
+ * - `catalog` (default): price and the card's state badges, as on Explore
+ * - `installed`: Up to date, Update available or Core service
+ * - `purchased`: Installed vX, Ready to install, or Unavailable here with the reason
+ */
+export default class CellExtensionStatusComponent extends Component {
+    @service intl;
+
+    get extension() {
+        return this.args.row ?? {};
+    }
+
+    get badges() {
+        const extension = this.extension;
+        const t = (key, params) => this.intl.t(`registry-bridge.${key}`, params);
+
+        switch (this.args.column?.variant) {
+            case 'installed':
+                if (extension.core_extension === true) {
+                    return [{ text: t('installed.status.core'), status: 'default' }];
+                }
+                return extension.update_available === true
+                    ? [{ text: t('installed.status.update-available'), status: 'info' }]
+                    : [{ text: t('installed.status.up-to-date'), status: 'success' }];
+            case 'purchased':
+                if (extension.is_installed === true) {
+                    return [{ text: t('purchased.status.installed', { version: extension.installed_version || extension.current_bundle_version || '' }).trim(), status: 'success' }];
+                }
+                if (unavailableReason(extension)) {
+                    return [{ text: t('card.unavailable'), status: 'warning', help: unavailableReason(extension) }];
+                }
+                return [{ text: t('card.ready-to-install'), status: 'info' }];
+            default: {
+                const model = cardModel(extension);
+                const price = model.priceBadge.label
+                    ? { text: this.intl.t(model.priceBadge.label.key, model.priceBadge.label.params), status: model.priceBadge.status }
+                    : { text: formatCurrency(model.priceBadge.amount, model.priceBadge.currency), status: model.priceBadge.status };
+                return [price, ...model.badges.map((badge) => ({ text: this.intl.t(badge.label.key, badge.label.params), status: badge.status, help: badge.help ?? null }))];
+            }
+        }
+    }
+}
diff --git a/addon/components/cell/licence-activations.hbs b/addon/components/cell/licence-activations.hbs
new file mode 100644
index 0000000..7281a58
--- /dev/null
+++ b/addon/components/cell/licence-activations.hbs
@@ -0,0 +1,5 @@
+{{#if @row.meta.licence.max_activations}}
+    <span class="text-sm" data-test-licence-activations>{{t "registry-bridge.purchased.activations" used=(or @row.meta.licence.seats_used 0) max=@row.meta.licence.max_activations}}</span>
+{{else}}
+    <span class="text-xs text-gray-500 dark:text-gray-400">-</span>
+{{/if}}
diff --git a/addon/components/cell/licence-activations.js b/addon/components/cell/licence-activations.js
new file mode 100644
index 0000000..fa85053
--- /dev/null
+++ b/addon/components/cell/licence-activations.js
@@ -0,0 +1,3 @@
+import templateOnly from '@ember/component/template-only';
+
+export default templateOnly();
diff --git a/addon/components/cell/licence-receipt.hbs b/addon/components/cell/licence-receipt.hbs
new file mode 100644
index 0000000..ddb28df
--- /dev/null
+++ b/addon/components/cell/licence-receipt.hbs
@@ -0,0 +1,5 @@
+{{#if @row.meta.licence.receipt_url}}
+    <a href={{@row.meta.licence.receipt_url}} target="_blank" rel="noopener noreferrer" class="text-sm" data-test-licence-receipt>{{t "registry-bridge.purchased.receipt"}}</a>
+{{else}}
+    <span class="text-xs text-gray-500 dark:text-gray-400">-</span>
+{{/if}}
diff --git a/addon/components/cell/licence-receipt.js b/addon/components/cell/licence-receipt.js
new file mode 100644
index 0000000..fa85053
--- /dev/null
+++ b/addon/components/cell/licence-receipt.js
@@ -0,0 +1,3 @@
+import templateOnly from '@ember/component/template-only';
+
+export default templateOnly();
diff --git a/addon/components/cell/licence-state.hbs b/addon/components/cell/licence-state.hbs
new file mode 100644
index 0000000..e59bd02
--- /dev/null
+++ b/addon/components/cell/licence-state.hbs
@@ -0,0 +1,5 @@
+{{#if this.badge}}
+    <Badge @status={{this.badge.status}} @size="xs" @hideStatusDot={{true}} @disableHumanize={{true}} @helpText={{this.badge.help}} data-test-licence-state={{this.state}} data-test-licence-reason={{if this.badge.help this.reason}}>{{this.badge.text}}</Badge>
+{{else}}
+    <span class="text-xs text-gray-500 dark:text-gray-400">-</span>
+{{/if}}
diff --git a/addon/components/cell/licence-state.js b/addon/components/cell/licence-state.js
new file mode 100644
index 0000000..1b480d3
--- /dev/null
+++ b/addon/components/cell/licence-state.js
@@ -0,0 +1,43 @@
+import Component from '@glimmer/component';
+import { inject as service } from '@ember/service';
+
+/** `revoked_reason` values the Registry Service sets; anything else reads as a plain revoke. */
+const REASONS = ['refunded', 'disputed', 'staff'];
+
+/**
+ * Licence column on Purchased: Active, Refunded or Revoked (`meta.licence_state`), with the service's
+ * `revoked_reason` as help text. A refunded or revoked licence stays listed for its receipt but no longer
+ * entitles installs or updates.
+ */
+export default class CellLicenceStateComponent extends Component {
+    @service intl;
+
+    get state() {
+        return this.args.row?.meta?.licence_state ?? null;
+    }
+
+    /** The service's `revoked_reason` when this bridge knows it, else `other`. */
+    get reason() {
+        const reason = this.args.row?.meta?.licence?.revoked_reason;
+        return REASONS.includes(reason) ? reason : 'other';
+    }
+
+    get badge() {
+        const t = (key) => this.intl.t(`registry-bridge.purchased.licence.${key}`);
+        const help = t(`reason.${this.reason}`);
+
+        switch (this.state) {
+            case 'active':
+                return { text: t('active'), status: 'success', help: null };
+            case 'refunded':
+                return { text: t('refunded'), status: 'warning', help };
+            case 'revoked':
+                return { text: t('revoked'), status: 'error', help };
+            case null:
+            case undefined:
+                return null;
+            default:
+                return { text: t('inactive'), status: 'default', help: null };
+        }
+    }
+}
diff --git a/addon/components/cell/purchase-price.hbs b/addon/components/cell/purchase-price.hbs
new file mode 100644
index 0000000..6dfe8d7
--- /dev/null
+++ b/addon/components/cell/purchase-price.hbs
@@ -0,0 +1,5 @@
+{{#if this.amount}}
+    <span class="text-sm {{if this.revoked 'line-through text-gray-500 dark:text-gray-400'}}" data-test-purchase-price>{{format-currency this.amount this.currency}}</span>
+{{else}}
+    <span class="text-xs text-gray-500 dark:text-gray-400" data-test-purchase-price>-</span>
+{{/if}}
diff --git a/addon/components/cell/purchase-price.js b/addon/components/cell/purchase-price.js
new file mode 100644
index 0000000..1cc9338
--- /dev/null
+++ b/addon/components/cell/purchase-price.js
@@ -0,0 +1,36 @@
+import Component from '@glimmer/component';
+import { priceOf } from '../../utils/extension-state';
+
+/**
+ * Price column on Purchased: what the organization paid (the receipt's total, tax included) when the
+ * service or this instance recorded it, else the listing price. Struck through once the licence is
+ * refunded or revoked.
+ */
+export default class CellPurchasePriceComponent extends Component {
+    get extension() {
+        return this.args.row ?? {};
+    }
+
+    get purchase() {
+        const purchase = this.extension.meta?.licence?.purchase;
+        return purchase && typeof purchase === 'object' ? purchase : {};
+    }
+
+    get amount() {
+        const paid = Number(this.purchase.amount_total);
+        if (Number.isFinite(paid) && paid > 0) {
+            return paid;
+        }
+        const listed = priceOf(this.extension);
+        return listed.free || !(listed.amount > 0) ? null : listed.amount;
+    }
+
+    get currency() {
+        return (Number(this.purchase.amount_total) > 0 && this.purchase.currency) || this.extension.currency || 'USD';
+    }
+
+    get revoked() {
+        const state = this.extension.meta?.licence_state;
+        return state === 'refunded' || state === 'revoked';
+    }
+}
diff --git a/addon/components/cell/release-action.hbs b/addon/components/cell/release-action.hbs
new file mode 100644
index 0000000..042e3b6
--- /dev/null
+++ b/addon/components/cell/release-action.hbs
@@ -0,0 +1,8 @@
+<Button
+    @size="xs"
+    @text={{@row.actionText}}
+    @disabled={{@row.actionDisabled}}
+    @permission="registry-bridge install extension"
+    @onClick={{fn @column.onInstall @row}}
+    data-test-release-action={{@row.version}}
+/>
diff --git a/addon/components/cell/release-action.js b/addon/components/cell/release-action.js
new file mode 100644
index 0000000..fa85053
--- /dev/null
+++ b/addon/components/cell/release-action.js
@@ -0,0 +1,3 @@
+import templateOnly from '@ember/component/template-only';
+
+export default templateOnly();
diff --git a/addon/components/cell/release-version.hbs b/addon/components/cell/release-version.hbs
new file mode 100644
index 0000000..e1e29a5
--- /dev/null
+++ b/addon/components/cell/release-version.hbs
@@ -0,0 +1,6 @@
+<div class="flex flex-row flex-wrap items-center gap-1" data-test-release-version={{@row.version}}>
+    <span class="font-mono text-xs">{{@row.version}}</span>
+    {{#if @row.is_latest}}<Badge @status="info" @size="xs" @hideStatusDot={{true}} @disableHumanize={{true}}>{{t "registry-bridge.detail.versions.latest"}}</Badge>{{/if}}
+    {{#if @row.is_installed}}<Badge @status="success" @size="xs" @hideStatusDot={{true}} @disableHumanize={{true}}>{{t "registry-bridge.card.installed"}}</Badge>{{/if}}
+    {{#if @row.is_yanked}}<Badge @status="error" @size="xs" @hideStatusDot={{true}} @disableHumanize={{true}}>{{t "registry-bridge.detail.versions.yanked"}}</Badge>{{/if}}
+</div>
diff --git a/addon/components/cell/release-version.js b/addon/components/cell/release-version.js
new file mode 100644
index 0000000..fa85053
--- /dev/null
+++ b/addon/components/cell/release-version.js
@@ -0,0 +1,3 @@
+import templateOnly from '@ember/component/template-only';
+
+export default templateOnly();
diff --git a/addon/components/explore-catalog.hbs b/addon/components/explore-catalog.hbs
new file mode 100644
index 0000000..0978736
--- /dev/null
+++ b/addon/components/explore-catalog.hbs
@@ -0,0 +1,154 @@
+<Layout::Section::Header
+    @title={{@catalog.title}}
+    @subtitle={{unless @catalog.isLoading (t "registry-bridge.explore.count" count=@catalog.total)}}
+    @subtitleClass="ml-2 text-xs text-gray-500 dark:text-gray-400"
+    @searchQuery={{@catalog.query}}
+    @searchPlaceholder={{t "registry-bridge.explore.search-placeholder"}}
+    @onSearch={{perform @catalog.search}}
+    @actionsWrapperClass="space-x-1"
+    data-test-explore-header
+>
+    <FiltersPicker
+        @columns={{@catalog.facetColumns}}
+        @onApply={{@catalog.applyFacets}}
+        @onClear={{@catalog.resetFacets}}
+        @onFilterClear={{@catalog.filters.clear}}
+        @onChange={{@catalog.filters.set}}
+        @gridCols="2"
+        @width="480px"
+        @iconOnly={{true}}
+        data-test-explore-filters
+    />
+    <Select
+        @options={{@catalog.sortOptions}}
+        @optionLabel="label"
+        @optionValue="value"
+        @value={{or @catalog.sort "popular"}}
+        @onSelect={{@catalog.setSort}}
+        aria-label={{t "registry-bridge.explore.filters.sort"}}
+        class="form-select form-select-sm w-40"
+        data-test-explore-sort
+    />
+    <div class="flex flex-row items-center" role="group" aria-label={{t "registry-bridge.explore.layout.label"}}>
+        <Button
+            @icon="table-cells-large"
+            @size="xs"
+            @type={{if @catalog.isTable "default" "primary"}}
+            @helpText={{t "registry-bridge.explore.layout.grid"}}
+            @onClick={{fn @catalog.setLayout "grid"}}
+            aria-label={{t "registry-bridge.explore.layout.grid"}}
+            aria-pressed={{if @catalog.isTable "false" "true"}}
+            data-test-explore-layout="grid"
+        />
+        <Button
+            @icon="table-list"
+            @size="xs"
+            @type={{if @catalog.isTable "primary" "default"}}
+            @helpText={{t "registry-bridge.explore.layout.table"}}
+            @onClick={{fn @catalog.setLayout "table"}}
+            aria-label={{t "registry-bridge.explore.layout.table"}}
+            aria-pressed={{if @catalog.isTable "true" "false"}}
+            class="ml-1"
+            data-test-explore-layout="table"
+        />
+    </div>
+</Layout::Section::Header>
+
+<Layout::Section::Body class="overflow-y-scroll h-full">
+    {{#if @catalog.needsRegistration}}
+        <div class="px-4 pt-4" data-test-explore-registration>
+            <InfoBlock @type="warning" @icon="link">
+                <span>{{t "registry-bridge.explore.registration.body"}}</span>
+                {{#if @catalog.canConfigureRegistry}}
+                    <Button @type="link" @size="xs" @text={{t "registry-bridge.explore.registration.action"}} @onClick={{@catalog.openRegistryConfig}} class="ml-1" />
+                {{else}}
+                    <span>{{t "registry-bridge.explore.registration.ask-admin"}}</span>
+                {{/if}}
+            </InfoBlock>
+        </div>
+    {{/if}}
+    {{#if @catalog.activeFacets.length}}
+        <div class="explore-facets" aria-label={{t "registry-bridge.explore.filters.active"}} data-test-explore-facets>
+            {{#each @catalog.activeFacets as |facet|}}
+                <span class="explore-facet" data-test-explore-facet={{facet.param}}>
+                    <span>{{facet.label}}{{#if facet.value}}: <strong>{{facet.value}}</strong>{{/if}}</span>
+                    <button type="button" class="explore-facet-clear" aria-label={{t "registry-bridge.explore.filters.remove" filter=facet.label}} {{on "click" (fn @catalog.clearFacet facet.param)}}>
+                        <FaIcon @icon="xmark" @size="xs" />
+                    </button>
+                </span>
+            {{/each}}
+            <Button @type="link" @size="xs" @text={{t "registry-bridge.explore.no-results.clear"}} @onClick={{@catalog.clearAll}} />
+        </div>
+    {{/if}}
+
+    {{#if @catalog.isLoading}}
+        <div class="p-4" aria-busy="true" aria-label={{t "registry-bridge.explore.loading"}} data-test-explore-loading>
+            {{#if @catalog.isTable}}
+                <Skeleton::Table @rows={{8}} @columns={{6}} @checkbox={{false}} />
+            {{else}}
+                <Skeleton::CardsGrid @count={{8}} @columns={{4}} @hideMedia={{true}} @avatar={{true}} @status="badge" @lines={{2}} @footerActions={{1}} />
+            {{/if}}
+        </div>
+    {{else if @catalog.error}}
+        <div class="p-4" data-test-explore-error>
+            <InfoBlock @type="danger" @icon="triangle-exclamation">
+                <div class="font-semibold">{{t "registry-bridge.explore.error.title"}}</div>
+                <div class="mt-1 text-sm">{{t "registry-bridge.explore.error.body" host=@catalog.registryHost}}</div>
+                <div class="mt-3"><Button @size="xs" @icon="rotate-right" @text={{t "registry-bridge.common.retry"}} @onClick={{@catalog.retry}} data-test-explore-retry /></div>
+            </InfoBlock>
+        </div>
+    {{else if @catalog.isNoResults}}
+        <Table::EmptyState
+            @icon="magnifying-glass"
+            @title={{if @catalog.query (t "registry-bridge.explore.no-results.title" query=@catalog.query) (t "registry-bridge.explore.no-results.filtered-title")}}
+            @description={{t "registry-bridge.explore.no-results.body"}}
+            @primaryText={{t "registry-bridge.explore.no-results.clear"}}
+            @primaryIcon="xmark"
+            @primaryAction={{@catalog.clearAll}}
+            data-test-explore-no-results
+        />
+    {{else if @catalog.isEmptyCatalog}}
+        <Table::EmptyState
+            @icon="shapes"
+            @title={{t "registry-bridge.explore.empty.title"}}
+            @description={{t "registry-bridge.explore.empty.body" host=@catalog.registryHost}}
+            @primaryText={{if @catalog.canConfigureRegistry (t "registry-bridge.explore.empty.check-config")}}
+            @primaryIcon="gear"
+            @primaryAction={{if @catalog.canConfigureRegistry @catalog.openRegistryConfig}}
+            @secondaryText={{if @catalog.registryContext.publisherUrl (t "registry-bridge.explore.empty.publish")}}
+            @secondaryIcon="arrow-up-right-from-square"
+            @secondaryAction={{if @catalog.registryContext.publisherUrl @catalog.openPublisherPortal}}
+            data-test-explore-empty
+        />
+    {{else if @catalog.isTable}}
+        <div class="p-4" data-test-explore-table>
+            <Table
+                @rows={{@catalog.extensions}}
+                @columns={{@catalog.tableColumns}}
+                @selectable={{false}}
+                @canSelectAll={{false}}
+                @pagination={{true}}
+                @paginationMeta={{@catalog.extensions.meta}}
+                @page={{@catalog.page}}
+                @onPageChange={{@catalog.setPage}}
+            />
+        </div>
+    {{else}}
+        <Layout::Resource::CardsGrid
+            @resource="registry-extension"
+            @data={{@catalog.extensions}}
+            @gap="sm"
+            @columns="4"
+            @showPagination={{true}}
+            @page={{@catalog.page}}
+            @onPageChange={{@catalog.setPage}}
+            @paginationMeta={{@catalog.extensions.meta}}
+            @containerClass="p-4"
+            class="h-full"
+            data-test-explore-grid
+            as |Item|
+        >
+            <ExtensionCard @resource={{Item.model}} />
+        </Layout::Resource::CardsGrid>
+    {{/if}}
+</Layout::Section::Body>
diff --git a/addon/components/explore-catalog.js b/addon/components/explore-catalog.js
new file mode 100644
index 0000000..cfbfa4d
--- /dev/null
+++ b/addon/components/explore-catalog.js
@@ -0,0 +1,10 @@
+import Component from '@glimmer/component';
+
+/**
+ * The Explore and category page body (canvas C1/C3): header with search,
+ * facets, sort and the grid/table toggle; then skeletons, results, the
+ * no-results state, the empty-registry state or the error with Retry.
+ *
+ * @argument {ExploreIndexController} catalog the page controller (state and actions)
+ */
+export default class ExploreCatalogComponent extends Component {}
diff --git a/addon/components/explore-empty-state.hbs b/addon/components/explore-empty-state.hbs
deleted file mode 100644
index c733375..0000000
--- a/addon/components/explore-empty-state.hbs
+++ /dev/null
@@ -1,12 +0,0 @@
-<div class="text-center py-12" ...attributes>
-    <FaIcon @icon="inbox" class="mx-auto h-12 w-12 text-gray-400 dark:text-gray-600" />
-    <h3 class="mt-2 text-sm font-semibold text-gray-900 dark:text-white">{{t "registry-bridge.developers.extensions.explore.no-extensions-published"}}</h3>
-    <p class="mt-1 text-sm text-gray-500 dark:text-gray-400">
-        {{t "registry-bridge.developers.extensions.explore.no-extensions-published-help"}}
-    </p>
-    {{#if this.canConfigureRegistry}}
-        <div class="mt-6">
-            <Button @text={{t "registry-bridge.developers.extensions.explore.open-registry-config"}} @icon="gear" @type="primary" @onClick={{this.goToRegistryConfig}} />
-        </div>
-    {{/if}}
-</div>
\ No newline at end of file
diff --git a/addon/components/explore-empty-state.js b/addon/components/explore-empty-state.js
deleted file mode 100644
index 1a27e33..0000000
--- a/addon/components/explore-empty-state.js
+++ /dev/null
@@ -1,20 +0,0 @@
-import Component from '@glimmer/component';
-import { inject as service } from '@ember/service';
-import { action } from '@ember/object';
-
-/**
- * Empty state for the Explore pages: nothing is published to the configured registry yet.
- * Admins get a shortcut to the Extensions Registry admin panel to point the console at a registry.
- */
-export default class ExploreEmptyStateComponent extends Component {
-    @service hostRouter;
-    @service currentUser;
-
-    get canConfigureRegistry() {
-        return this.currentUser.isAdmin === true;
-    }
-
-    @action goToRegistryConfig() {
-        return this.hostRouter.transitionTo('console.admin.virtual', 'extension-registry', { queryParams: { view: 'registry-config' } });
-    }
-}
diff --git a/addon/components/extension-card.hbs b/addon/components/extension-card.hbs
index 6fc9ac9..789688e 100644
--- a/addon/components/extension-card.hbs
+++ b/addon/components/extension-card.hbs
@@ -1,38 +1,49 @@
-<Layout::Resource::Card  {{on "click" this.onClick}} {{did-update this.onExtensionUpdated @resource}} ...attributes as |Card|>
-    <Card.header class={{@headerClass}}>
-        <div class="flex flex-row items-center justify-between">
-            <div class="font-semibold">{{@resource.name}}</div>
-            <div class="flex items-center space-x-1">
-                {{#if @resource.update_available}}
-                    <Badge @status="info" @hideStatusDot={{true}} data-test-update-available>Update {{@resource.latest_version}}</Badge>
-                {{/if}}
-                {{#if @resource.payment_required}}
-                    <Badge @status="success" @hideStatusDot={{true}}>{{format-currency @resource.price @resource.currency}}</Badge>
-                {{else}}
-                    <Badge @status="success" @hideStatusDot={{true}}>Free</Badge>
+<Layout::Resource::Card class="extension-card" data-test-extension-card data-state={{this.model.state}} ...attributes as |Card|>
+    <Card.header class="extension-card-header">
+        <div class="flex flex-row items-start gap-3">
+            <Image
+                src={{this.extension.icon_url}}
+                alt=""
+                @fallbackSrc={{config "defaultValues.extensionIcon"}}
+                class="extension-card-icon"
+            />
+            <div class="flex-1 min-w-0">
+                <button type="button" class="extension-card-name" {{on "click" (fn this.openDetails (hash))}} data-test-extension-card-name>{{this.extension.name}}</button>
+                {{#if this.subtitle}}
+                    <div class="extension-card-subtitle" data-test-extension-card-subtitle>{{this.subtitle}}</div>
                 {{/if}}
             </div>
+            <Badge @status={{this.price.status}} @hideStatusDot={{true}} @disableHumanize={{true}} class="flex-shrink-0" data-test-extension-card-price>
+                {{this.price.text}}
+                {{#if this.price.original}}
+                    <s class="ml-1 opacity-70" data-test-extension-card-price-original>{{this.price.original}}</s>
+                {{/if}}
+            </Badge>
         </div>
-        {{#if (has-block "header")}}
-            {{yield to="header"}}
-        {{/if}}
+        {{yield to="header"}}
     </Card.header>
-    <Card.body class={{@bodyClass}}>
-        <Image src={{@resource.icon_url}} alt={{@resource.name}} @fallbackSrc={{config "defaultValues.extensionIcon"}} class="card-img-lg {{@iconClass}}" />
-        {{#if (has-block "body")}}
-            {{yield to="body"}}
-        {{/if}}
+    <Card.body class="extension-card-body">
+        <p class="extension-card-description" data-test-extension-card-description>{{or this.description (t "registry-bridge.card.no-description")}}</p>
+        {{yield to="body"}}
     </Card.body>
-    <Card.footer class={{@footerClass}}>
-        <div>
-            <p class="text-xs">{{n-a @resource.description}}</p>
-        </div>
-        {{#if (has-block "footer")}}
-            {{yield to="footer"}}
+    <Card.footer class="extension-card-footer">
+        {{#if this.badges.length}}
+            <div class="extension-card-badges" data-test-extension-card-badges>
+                {{#each this.badges as |badge|}}
+                    <Badge @status={{badge.status}} @size="xs" @hideStatusDot={{true}} @disableHumanize={{true}} @helpText={{badge.help}} data-test-extension-card-badge>{{badge.text}}</Badge>
+                {{/each}}
+            </div>
+        {{/if}}
+        {{#if this.unavailableReason}}
+            <p class="extension-card-reason" data-test-extension-card-reason>{{this.unavailableReason}}</p>
         {{/if}}
-        <div class="mt-1">
-            <div class="text-gray-300 dark:text-gray-500 text-xs">Last Modified: {{@resource.updatedAt}}</div>
+        {{yield to="footer"}}
+        <div class="extension-card-actions">
+            <ExtensionCard::Action @resource={{this.extension}} @onOpen={{@onOpen}} @onAction={{@onAction}} />
+            {{#if this.meta}}
+                <span class="extension-card-meta" data-test-extension-card-meta>{{this.meta}}</span>
+            {{/if}}
         </div>
     </Card.footer>
 </Layout::Resource::Card>
-{{yield}}
\ No newline at end of file
+{{yield}}
diff --git a/addon/components/extension-card.js b/addon/components/extension-card.js
index 49e22c7..a54aa06 100644
--- a/addon/components/extension-card.js
+++ b/addon/components/extension-card.js
@@ -1,271 +1,70 @@
 import Component from '@glimmer/component';
-import { tracked } from '@glimmer/tracking';
 import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
-import { later } from '@ember/runloop';
 import formatCurrency from '@fleetbase/ember-ui/utils/format-currency';
-import isModel from '@fleetbase/ember-core/utils/is-model';
-import { installerChannel, runInstallerJob } from '../utils/installer-job';
-
-function removeParamFromCurrentUrl(paramToRemove) {
-    const url = new URL(window.location.href);
-    url.searchParams.delete(paramToRemove);
-    window.history.pushState({ path: url.href }, '', url.href);
-}
-
-function addParamToCurrentUrl(paramName, paramValue) {
-    const url = new URL(window.location.href);
-    url.searchParams.set(paramName, paramValue);
-    window.history.pushState({ path: url.href }, '', url.href);
-}
-
+import { cardModel } from '../utils/extension-state';
+
+/**
+ * The one extension card (canvas C2): Explore, categories and the grid views
+ * of Installed and Purchased. The name opens the detail panel; the footer
+ * holds a real button whose action follows the card's state
+ * (`ExtensionCard::Action`).
+ *
+ * @argument {RegistryExtensionModel} resource
+ * @argument {Function} [onOpen] replaces opening the detail panel
+ * @argument {Function} [onAction] called with `(action, extension)` instead of the default action
+ */
 export default class ExtensionCardComponent extends Component {
-    @service modalsManager;
-    @service notifications;
-    @service currentUser;
-    @service socket;
-    @service fetch;
-    @service stripe;
-    @service urlSearchParams;
-    @service abilities;
+    @service extensionPanel;
     @service intl;
-    @tracked extension;
 
-    constructor(owner, { resource }) {
-        super(...arguments);
-        this.extension = resource;
-        this.checkForCheckoutSession();
+    get extension() {
+        return this.args.resource ?? {};
     }
 
-    @action onExtensionUpdated(el, [extension]) {
-        this.extension = extension;
+    get model() {
+        return cardModel(this.extension);
     }
 
-    @action onClick(options = {}) {
-        const installChannel = installerChannel('install', this.currentUser.companyId, this.extension.id);
-        const isAuthor = this.extension.is_author === true;
-        const isSelfManaged = this.extension.self_managed === true;
-        const isAlreadyPurchased = this.extension.is_purchased === true;
-        const isAlreadyInstalled = this.extension.is_installed === true;
-        const isNotInstallable = this.extension.is_installable === false && !isAlreadyInstalled;
-        const isPaymentRequired = !isAuthor && this.extension.payment_required === true && isAlreadyPurchased === false;
-        const userCannotPurchase = isPaymentRequired && this.abilities.cannot('registry-bridge purchase extension');
-        let acceptButtonText = isPaymentRequired ? `Purchase for ${formatCurrency(this.extension.price, this.extension.currency)}` : isAlreadyInstalled ? 'Installed' : 'Install';
-        if (this.abilities.cannot('registry-bridge install extension')) {
-            acceptButtonText = 'Unauthorized to Install';
-        }
-        if (isNotInstallable) {
-            // Registry Service records say why (not registered, no licence, wrong hosting); cloud catalog records cannot be installed here
-            acceptButtonText = this.extension.meta?.install_blocked_reason ? 'Unavailable' : 'Not available yet';
-        }
-        const goBack = async (modal) => {
-            await modal.done();
-            later(
-                this,
-                () => {
-                    this.onClick();
-                },
-                100
-            );
-        };
-
-        if (typeof this.args.onClick === 'function') {
-            this.args.onClick(this.extension);
+    get price() {
+        const badge = this.model.priceBadge;
+        if (badge.label) {
+            return { text: this.intl.t(badge.label.key, badge.label.params), status: badge.status, original: null };
         }
 
-        addParamToCurrentUrl('extension_id', this.extension.id);
-        this.modalsManager.show('modals/extension-details', {
-            titleComponent: 'extension-modal-title',
-            modalClass: 'flb--extension-modal modal-lg',
-            modalHeaderClass: 'flb--extension-modal-header',
-            acceptButtonText,
-            acceptButtonIcon: isPaymentRequired ? 'credit-card' : isAlreadyInstalled ? 'check' : 'download',
-            acceptButtonDisabled: this.abilities.cannot('registry-bridge install extension') || isAlreadyInstalled || userCannotPurchase || isNotInstallable,
-            acceptButtonScheme: isPaymentRequired ? 'success' : 'primary',
-            declineButtonText: 'Done',
-            process: null,
-            step: null,
-            stepDescription: 'Awaiting install to begin...',
-            progress: 0,
-            extension: this.extension,
-            // Stay open after a failed install so the error and Retry are shown.
-            keepOpen: true,
-            viewSelfManagesInstallInstructions: () => {
-                this.selfManagedInstallInstructions({
-                    extension: this.extension,
-                    confirm: goBack,
-                    decline: goBack,
-                });
-            },
-            confirm: async (modal) => {
-                modal.startLoading();
-
-                // Handle purchase flow
-                if (isPaymentRequired) {
-                    return this.startCheckoutSession();
-                }
-
-                // If self managed just prompt instructions
-                if (isSelfManaged) {
-                    await modal.done();
-                    return later(
-                        this,
-                        () => {
-                            return this.selfManagedInstallInstructions({
-                                extension: this.extension,
-                                confirm: goBack,
-                                decline: goBack,
-                            });
-                        },
-                        100
-                    );
-                }
-
-                // Queue the install and follow the job until it completes or fails
-                try {
-                    const job = await runInstallerJob({
-                        modal,
-                        intl: this.intl,
-                        fetch: this.fetch,
-                        socket: this.socket,
-                        channel: installChannel,
-                        request: () => this.extension.install(),
-                    });
-                    if (job.status === 'completed') {
-                        this.notifications.info(this.intl.t('registry-bridge.installer.installed', { extensionName: this.extension.name }));
-                        removeParamFromCurrentUrl('extension_id');
-                    }
-                } catch (error) {
-                    this.notifications.serverError(error);
-                }
-            },
-            decline: (modal) => {
-                modal.done();
-                removeParamFromCurrentUrl('extension_id');
-            },
-            ...options,
-        });
+        return {
+            text: formatCurrency(badge.amount, badge.currency),
+            original: badge.original ? formatCurrency(badge.original, badge.currency) : null,
+            status: badge.status,
+        };
     }
 
-    async selfManagedInstallInstructions(options = {}) {
-        await this.modalsManager.done();
-        this.modalsManager.show('modals/self-managed-install-instructions', {
-            title: 'Install Extension to Self-Hosted Instance',
-            hideDeclineButton: true,
-            acceptButtonText: 'Done',
-            ...options,
-        });
+    get badges() {
+        return this.model.badges.map((badge) => ({ text: this.intl.t(badge.label.key, badge.label.params), status: badge.status, help: badge.help ?? null }));
     }
 
-    async startCheckoutSession() {
-        const checkout = await this.stripe.initEmbeddedCheckout({
-            fetchClientSecret: this.fetchClientSecret.bind(this),
-        });
-
-        await this.modalsManager.done();
-        later(
-            this,
-            () => {
-                this.modalsManager.show('modals/extension-purchase-form', {
-                    title: `Purchase the '${this.extension.name}' Extension`,
-                    modalClass: 'stripe-extension-purchase',
-                    modalFooterClass: 'hidden-i',
-                    extension: this.extension,
-                    checkoutElementInserted: (el) => {
-                        checkout.mount(el);
-                    },
-                    decline: async (modal) => {
-                        checkout.destroy();
-                        await modal.done();
-                        later(
-                            this,
-                            () => {
-                                this.onClick();
-                            },
-                            100
-                        );
-                    },
-                });
-            },
-            100
-        );
+    get subtitle() {
+        return [this.extension.publisher_name, this.extension.category_name].filter(Boolean).join(' · ');
     }
 
-    async fetchClientSecret() {
-        try {
-            const { clientSecret } = await this.fetch.post(
-                'payments/create-checkout-session',
-                { extension: this.extension.id, uri: window.location.pathname },
-                { namespace: '~registry/v1' }
-            );
-
-            return clientSecret;
-        } catch (error) {
-            this.notifications.serverError(error);
-        }
+    get description() {
+        return this.extension.description || this.extension.subtitle || null;
     }
 
-    async checkForCheckoutSession() {
-        later(
-            this,
-            async () => {
-                const checkoutSessionId = this.urlSearchParams.get('checkout_session_id');
-                const extensionId = this.urlSearchParams.get('extension_id');
-
-                if (!checkoutSessionId && this.extension.id === extensionId) {
-                    return this.onClick();
-                }
-
-                if (checkoutSessionId && this.extension.id === extensionId) {
-                    this.modalsManager.show('modals/confirm-extension-purchase', {
-                        title: 'Finalizing Purchase',
-                        modalClass: 'finalize-extension-purchase',
-                        loadingMessage: 'Completing purchase do not refresh or exit window...',
-                        modalFooterClass: 'hidden-i',
-                        backdropClose: false,
-                    });
-
-                    try {
-                        const { status, extension } = await this.fetch.post(
-                            'payments/get-checkout-session',
-                            { checkout_session_id: checkoutSessionId, extension: this.extension.id },
-                            { namespace: '~registry/v1' }
-                        );
-
-                        // Update this extension
-                        const extensionModel = this.fetch.jsonToModel(extension, 'registry-extension');
-                        if (isModel(extensionModel)) {
-                            this.extension = extensionModel;
-                        }
+    /** Why this instance cannot install the listing (another hosting, no release), shown on the card. */
+    get unavailableReason() {
+        return this.model.unavailableReason;
+    }
 
-                        // Fire a callback
-                        if (typeof this.args.onCheckoutCompleted === 'function') {
-                            this.args.onCheckoutCompleted(this.extension, status);
-                        }
+    get meta() {
+        return [this.model.version ? `v${this.model.version}` : null, this.extension.updatedAgo].filter(Boolean).join(' · ');
+    }
 
-                        if (status === 'complete' || status === 'purchase_complete') {
-                            // remove checkout session id
-                            removeParamFromCurrentUrl('checkout_session_id');
+    @action openDetails(options = {}) {
+        if (typeof this.args.onOpen === 'function') {
+            return this.args.onOpen(this.extension, options);
+        }
 
-                            // close confirmation dialog and notify payment completed
-                            await this.modalsManager.done();
-                            if (status === 'complete') {
-                                this.notifications.success('Payment Completed.');
-                            }
-                            later(
-                                this,
-                                () => {
-                                    this.onClick();
-                                },
-                                100
-                            );
-                        }
-                    } catch (error) {
-                        this.notifications.serverError(error);
-                    }
-                }
-            },
-            300
-        );
+        return this.extensionPanel.open(this.extension, options);
     }
 }
diff --git a/addon/components/extension-card/action.hbs b/addon/components/extension-card/action.hbs
new file mode 100644
index 0000000..8e495fc
--- /dev/null
+++ b/addon/components/extension-card/action.hbs
@@ -0,0 +1,10 @@
+<Button
+    @size={{or @size "sm"}}
+    @type={{this.action.type}}
+    @text={{this.action.text}}
+    @disabled={{this.action.disabled}}
+    @permission={{this.action.permission}}
+    @onClick={{this.run}}
+    data-test-extension-card-action={{this.action.kind}}
+    ...attributes
+/>
diff --git a/addon/components/extension-card/action.js b/addon/components/extension-card/action.js
new file mode 100644
index 0000000..8df773d
--- /dev/null
+++ b/addon/components/extension-card/action.js
@@ -0,0 +1,56 @@
+import Component from '@glimmer/component';
+import { inject as service } from '@ember/service';
+import { action } from '@ember/object';
+import { cardModel } from '../../utils/extension-state';
+
+/**
+ * The state-driven primary action of an extension card or row: View details,
+ * Install, Update to vX, or a disabled Installed.
+ *
+ * @argument {RegistryExtensionModel} resource
+ * @argument {Function} [onOpen] replaces opening the detail panel
+ * @argument {Function} [onAction] called with `(action, extension)` instead of the default action
+ */
+export default class ExtensionCardActionComponent extends Component {
+    @service extensionPanel;
+    @service extensionInstaller;
+    @service abilities;
+    @service intl;
+
+    get extension() {
+        return this.args.resource ?? {};
+    }
+
+    get action() {
+        const cardAction = cardModel(this.extension).action;
+        const disabled = cardAction.disabled === true || (cardAction.permission ? this.abilities.cannot(cardAction.permission) : false);
+
+        return { ...cardAction, text: this.intl.t(cardAction.label.key, cardAction.label.params), disabled };
+    }
+
+    openDetails(options = {}) {
+        if (typeof this.args.onOpen === 'function') {
+            return this.args.onOpen(this.extension, options);
+        }
+
+        return this.extensionPanel.open(this.extension, options);
+    }
+
+    @action run() {
+        const cardAction = cardModel(this.extension).action;
+        if (typeof this.args.onAction === 'function') {
+            return this.args.onAction(cardAction, this.extension);
+        }
+
+        switch (cardAction.kind) {
+            case 'install':
+                return this.extensionInstaller.install(this.extension);
+            case 'update':
+                return this.extensionInstaller.update(this.extension);
+            case 'none':
+                return;
+            default:
+                return this.openDetails();
+        }
+    }
+}
diff --git a/addon/components/extension-form.hbs b/addon/components/extension-form.hbs
deleted file mode 100644
index f4ee213..0000000
--- a/addon/components/extension-form.hbs
+++ /dev/null
@@ -1,253 +0,0 @@
-<div class="flex flex-row items-start">
-    <div class="w-32 flex flex-col justify-center">
-        <div class="mb-2">
-            <Image src={{@extension.icon_url}} @fallbackSrc={{config "defaultValues.extensionIcon"}} alt={{@extension.name}} class="w-32 h-32 rounded-lg border border-black shadow-sm" />
-        </div>
-        <FileUpload
-            @name={{t "registry-bridge.developers.extensions.extension-form.upload-extension-icon"}}
-            @accept={{join "," this.acceptedImageTypes}}
-            @onFileAdded={{perform this.uploadIcon}}
-            @labelClass="flex flex-row items-center justify-center"
-            as |queue|
-        >
-            <a tabindex={{0}} class="flex items-center px-0 mt-2 text-xs no-underline truncate btn btn-sm btn-default" disabled={{not queue.files.length}}>
-                {{#if queue.files.length}}
-                    <div class="mr-1.5">
-                        <Spinner />
-                    </div>
-                    <span>
-                        {{t "common.uploading"}}
-                    </span>
-                {{else}}
-                    <FaIcon @icon="icons" class="mr-1.5" />
-                    <span>
-                        {{t "registry-bridge.developers.extensions.extension-form.upload-extension-icon"}}
-                    </span>
-                {{/if}}
-            </a>
-        </FileUpload>
-    </div>
-    <div class="flex-1 px-6 space-y-6">
-        <ContentPanel @title={{t "registry-bridge.developers.extensions.extension-form.details-content-block"}} @open={{true}} @wrapperClass="bordered-classic">
-            <InputGroup
-                @name={{t "registry-bridge.developers.extensions.extension-form.extension-name"}}
-                @value={{@extension.name}}
-                @helpText={{t "registry-bridge.developers.extensions.extension-form.extension-name-help-text"}}
-            />
-            <InputGroup
-                @name={{t "registry-bridge.developers.extensions.extension-form.extension-description"}}
-                @helpText={{t "registry-bridge.developers.extensions.extension-form.extension-description-help-text"}}
-            >
-                <Textarea
-                    @value={{@extension.description}}
-                    placeholder={{t "registry-bridge.developers.extensions.extension-form.extension-description"}}
-                    class="form-input w-full"
-                    rows="3"
-                />
-            </InputGroup>
-            <InputGroup
-                @name={{t "registry-bridge.developers.extensions.extension-form.extension-category"}}
-                @helpText={{t "registry-bridge.developers.extensions.extension-form.extension-category-help-text"}}
-            >
-                <ModelSelect
-                    @modelName="category"
-                    @query={{hash for="extension_category" core_category=1}}
-                    @selectedModel={{@extension.category}}
-                    @placeholder={{t "registry-bridge.developers.extensions.extension-form.extension-select-category"}}
-                    @triggerClass="form-select form-input"
-                    @infiniteScroll={{false}}
-                    @renderInPlace={{true}}
-                    @onChange={{fn (mut @extension.category)}}
-                    as |category|
-                >
-                    <div class="flex items-center">
-                        <FaIcon @icon={{category.icon}} @size="sm" class="mr-2" />
-                        <span>{{category.name}}</span>
-                    </div>
-                </ModelSelect>
-            </InputGroup>
-
-            <InputGroup
-                @name={{t "registry-bridge.developers.extensions.extension-form.extension-tags"}}
-                @helpText={{t "registry-bridge.developers.extensions.extension-form.extension-tags-help-text"}}
-            >
-                <TagInput
-                    class="form-input"
-                    @placeholder={{t "registry-bridge.developers.extensions.extension-form.extension-add-tags"}}
-                    @allowSpacesInTags={{true}}
-                    @tags={{@extension.tags}}
-                    @addTag={{@extension.addTag}}
-                    @removeTagAtIndex={{@extension.removeTag}}
-                    @disabled={{this.core_extension}}
-                    as |tag|
-                >
-                    {{tag}}
-                </TagInput>
-            </InputGroup>
-
-            <InputGroup @wrapperClass="mb-0i">
-                <Toggle
-                    @isToggled={{@extension.self_managed}}
-                    @onToggle={{fn (mut @extension.self_managed)}}
-                    @helpText={{t "registry-bridge.developers.extensions.extension-form.self-managed-help-text"}}
-                >
-                    <span class="dark:text-gray-100 text-sm mx-2">{{t "registry-bridge.developers.extensions.extension-form.self-managed"}}</span>
-                </Toggle>
-                <p class="mt-2 text-xs bg-blue-800 border border-blue-600 px-2 py-2 rounded-md text-blue-100">
-                    {{t "registry-bridge.developers.extensions.extension-form.self-managed-help-text"}}
-                </p>
-            </InputGroup>
-        </ContentPanel>
-        <ContentPanel @title={{t "registry-bridge.developers.extensions.extension-form.extension-bundle"}} @open={{true}} @wrapperClass="bordered-classic">
-            <div class="px-4 pb-4 pt-3 flex flex-col flex-grow-0">
-                <Button @type="magic" @icon="box-archive" @text="Select Bundle" @onClick={{this.selectBundle}} />
-                {{#if @extension.next_bundle_filename}}
-                    <div class="mt-4 bg-blue-200 border border-blue-400 text-blue-900 rounded-lg shadow-sm px-4 py-2 flex flex-row items-center text-xs">
-                        <FaIcon @icon="box-archive" @size="xs" />
-                        <div class="ml-2 flex flex-row items-center space-x-2">
-                            <span>{{@extension.next_bundle_filename}}</span>
-                            <span>-</span>
-                            <span>{{@extension.next_bundle_id}}</span>
-                        </div>
-                    </div>
-                {{/if}}
-            </div>
-        </ContentPanel>
-        <ContentPanel
-            @title={{t "registry-bridge.developers.extensions.extension-form.extension-listing-details"}}
-            @open={{true}}
-            @actionButtons={{this.listingDetailsPanelActions}}
-            @wrapperClass="bordered-classic"
-        >
-            <InputGroup
-                @name={{t "registry-bridge.developers.extensions.extension-form.extension-promotional-text"}}
-                @helpText={{t "registry-bridge.developers.extensions.extension-form.extension-promotional-text-help-text"}}
-            >
-                <TipTapEditor
-                    @value={{@extension.promotional_text}}
-                    @onChange={{fn (mut @extension.promotional_text)}}
-                    placeholder={{t "registry-bridge.developers.extensions.extension-form.extension-promotional-text"}}
-                />
-            </InputGroup>
-            <InputGroup
-                @name={{t "registry-bridge.developers.extensions.extension-form.extension-subtitle"}}
-                @value={{@extension.subtitle}}
-                @helpText={{t "registry-bridge.developers.extensions.extension-form.extension-subtitle-help-text"}}
-            />
-            <InputGroup
-                @name={{t "registry-bridge.developers.extensions.extension-form.extension-copyright"}}
-                @value={{@extension.copyright}}
-                @helpText={{t "registry-bridge.developers.extensions.extension-form.extension-copyright-help-text"}}
-            />
-            <div class="grid grid-cols-1 lg:grid-cols-2 gap-4">
-                <InputGroup
-                    @type="url"
-                    @name={{t "registry-bridge.developers.extensions.extension-form.extension-website-url"}}
-                    @value={{@extension.website_url}}
-                    @helpText={{t "registry-bridge.developers.extensions.extension-form.extension-website-url-help-text"}}
-                    @wrapperClass="mb-0i"
-                />
-                <InputGroup
-                    @type="url"
-                    @name={{t "registry-bridge.developers.extensions.extension-form.extension-repo-url"}}
-                    @value={{@extension.repo_url}}
-                    @helpText={{t "registry-bridge.developers.extensions.extension-form.extension-repo-url-help-text"}}
-                    @wrapperClass="mb-0i"
-                />
-                <InputGroup
-                    @type="url"
-                    @name={{t "registry-bridge.developers.extensions.extension-form.extension-support-url"}}
-                    @value={{@extension.support_url}}
-                    @helpText={{t "registry-bridge.developers.extensions.extension-form.extension-support-url-help-text"}}
-                    @wrapperClass="mb-0i"
-                />
-                <InputGroup
-                    @type="url"
-                    @name={{t "registry-bridge.developers.extensions.extension-form.extension-privacy-policy-url"}}
-                    @value={{@extension.privacy_policy_url}}
-                    @helpText={{t "registry-bridge.developers.extensions.extension-form.extension-privacy-policy-url-help-text"}}
-                    @wrapperClass="mb-0i"
-                />
-                <InputGroup
-                    @type="url"
-                    @name={{t "registry-bridge.developers.extensions.extension-form.extension-tos-url"}}
-                    @value={{@extension.tos_url}}
-                    @helpText={{t "registry-bridge.developers.extensions.extension-form.extension-tos-url-help-text"}}
-                    @wrapperClass="mb-0i"
-                />
-            </div>
-        </ContentPanel>
-        <ContentPanel @title={{t "registry-bridge.developers.extensions.extension-form.extension-screenshots"}} @open={{true}} @wrapperClass="bordered-classic">
-            <div class="space-y-4">
-                {{#if this.isUploading}}
-                    <div
-                        class="dropzone w-full rounded-lg px-4 py-8 bg-gray-50 dark:bg-gray-900 bg-opacity-25 text-gray-900 dark:text-white text-center flex flex-col items-center justify-center border-2 border-dashed border-gray-200 dark:border-indigo-500"
-                    >
-                        <div class="flex items-center justify-center py-5">
-                            <Spinner class="text-sm dar:text-gray-100" @loadingMessage={{t "fleet-ops.common.uploading"}} />
-                        </div>
-                    </div>
-                {{else}}
-                    {{#let (file-queue name="files" onFileAdded=this.queueFile accept=(join "," this.acceptedImageTypes)) as |queue|}}
-                        <FileDropzone @queue={{queue}} class="dropzone file-dropzone" as |dropzone|>
-                            {{#if dropzone.active}}
-                                {{#if dropzone.valid}}
-                                    {{t "component.dropzone.drop-to-upload"}}
-                                {{else}}
-                                    {{t "component.dropzone.invalid"}}
-                                {{/if}}
-                            {{else if queue.files.length}}
-                                <div class="my-2">
-                                    <FaIcon @icon="folder-open" class="text-indigo-500 mr-2" />
-                                    {{t "component.dropzone.files-ready-for-upload" numOfFiles=(pluralize queue.files.length (t "component.dropzone.file"))}}
-                                </div>
-                                <div class="my-2">({{queue.progress}}%)</div>
-                            {{else}}
-                                <h4 class="font-semibold">
-                                    <FaIcon @icon="folder-open" @size="lg" class="text-indigo-500 mr-2" />
-                                    {{t "registry-bridge.developers.extensions.extension-form.upload-screenshots"}}
-                                </h4>
-                                <div>
-                                    {{#if dropzone.supported}}
-                                        <p class="text-sm my-5">{{t "component.dropzone.dropzone-supported-files"}}</p>
-                                    {{/if}}
-                                    <FileUpload @name="files" @for="files" @accept={{join "," this.acceptedFileTypes}} @multiple={{true}} @onFileAdded={{this.queueFile}}>
-                                        <a tabindex={{0}} class="btn btn-magic cursor-pointer ml-1">{{t "component.dropzone.or-select-button-text"}}</a>
-                                    </FileUpload>
-                                </div>
-                            {{/if}}
-                        </FileDropzone>
-                    {{/let}}
-                    {{#if this.uploadQueue}}
-                        <div class="mx-4">
-                            <div class="flex items-center justify-between mb-4">
-                                <span class="leading-6 dark:text-gray-100">{{t "component.dropzone.upload-queue"}}</span>
-                            </div>
-                            <div class="space-y-2 mb-4">
-                                {{#each this.uploadQueue as |file|}}
-                                    <div class="flex items-center justify-between bg-blue-100 border border-blue-800 dark:border-blue-800 py-1.5 shadow-sm rounded-lg px-4">
-                                        <div class="text-xs text-blue-900 truncate">{{truncate-filename file.name 50}}</div>
-                                        <div class="flex items-center text-sm">
-                                            <Spinner class="text-blue-900 mr-2" />
-                                            <span class="font-bold text-blue-900">{{round file.progress}}%</span>
-                                        </div>
-                                    </div>
-                                {{/each}}
-                            </div>
-                        </div>
-                    {{/if}}
-                    <div>
-                        <div class="grid grid-cols-2 md:grid-cols-4 gap-2 md:gap-4">
-                            {{#each @extension.screenshots as |file|}}
-                                <File @file={{file}} @onDelete={{this.removeFile}} />
-                            {{/each}}
-                        </div>
-                    </div>
-                {{/if}}
-            </div>
-        </ContentPanel>
-        {{#if @withMonetizeForm}}
-            <ExtensionMonetizeForm @extension={{@extension}} />
-        {{/if}}
-    </div>
-</div>
\ No newline at end of file
diff --git a/addon/components/extension-form.js b/addon/components/extension-form.js
deleted file mode 100644
index 3b71009..0000000
--- a/addon/components/extension-form.js
+++ /dev/null
@@ -1,180 +0,0 @@
-import Component from '@glimmer/component';
-import { tracked } from '@glimmer/tracking';
-import { inject as service } from '@ember/service';
-import { action } from '@ember/object';
-import { task } from 'ember-concurrency';
-import { later } from '@ember/runloop';
-import formatCurrency from '@fleetbase/ember-ui/utils/format-currency';
-
-export default class ExtensionFormComponent extends Component {
-    @service store;
-    @service fetch;
-    @service notifications;
-    @service intl;
-    @service modalsManager;
-    @tracked subscriptionModelOptions = ['flat_rate', 'tiered', 'usage'];
-    @tracked billingPeriodOptions = ['daily', 'weekly', 'monthly', 'quarterly', 'yearly'];
-    @tracked uploadQueue = [];
-    listingDetailsPanelActions = [
-        {
-            type: 'link',
-            size: 'xs',
-            text: 'Preview Listing',
-            onClick: this.previewListing,
-        },
-    ];
-    acceptedImageTypes = ['image/jpeg', 'image/png', 'image/gif'];
-    acceptedBundleTypes = [
-        'application/zip',
-        'application/x-zip',
-        'application/x-zip-compressed',
-        'application/x-compressed',
-        'multipart/x-zip',
-        'application/x-tar',
-        'application/gzip',
-        'application/x-gzip',
-        'application/x-tgz',
-        'application/x-bzip2',
-        'application/x-xz',
-    ];
-
-    @task *uploadIcon(file) {
-        const { extension, onIconUploaded } = this.args;
-
-        yield this.fetch.uploadFile.perform(
-            file,
-            {
-                path: `uploads/extensions/${extension.id}/icons`,
-                subject_uuid: extension.id,
-                subject_type: 'registry-bridge:registry-extension',
-                type: 'extension_icon',
-            },
-            (uploadedFile) => {
-                extension.setProperties({
-                    icon: uploadedFile,
-                    icon_uuid: uploadedFile.id,
-                    icon_url: uploadedFile.url,
-                });
-
-                if (typeof onIconUploaded === 'function') {
-                    onIconUploaded(uploadedFile);
-                }
-
-                return extension.save();
-            }
-        );
-    }
-
-    @action queueFile(file) {
-        // since we have dropzone and upload button within dropzone validate the file state first
-        // as this method can be called twice from both functions
-        if (['queued', 'failed', 'timed_out', 'aborted'].indexOf(file.state) === -1) {
-            return;
-        }
-
-        const { extension, onScreenshotUploaded } = this.args;
-
-        // Queue and upload immediatley
-        this.uploadQueue.pushObject(file);
-        this.fetch.uploadFile.perform(
-            file,
-            {
-                path: `uploads/extensions/${extension.id}/screenshots`,
-                subject_uuid: extension.id,
-                subject_type: 'registry-bridge:registry-extension',
-                type: 'extension_screenshot',
-            },
-            (uploadedFile) => {
-                extension.screenshots.pushObject(uploadedFile);
-                this.uploadQueue.removeObject(file);
-                if (typeof onScreenshotUploaded === 'function') {
-                    onScreenshotUploaded(uploadedFile);
-                }
-            },
-            () => {
-                this.uploadQueue.removeObject(file);
-                // remove file from queue
-                if (file.queue && typeof file.queue.remove === 'function') {
-                    file.queue.remove(file);
-                }
-            }
-        );
-    }
-
-    @action selectBundle() {
-        const { extension, onBundleSelected } = this.args;
-
-        this.modalsManager.show('modals/select-extension-bundle', {
-            title: 'Select extension bundle',
-            modalClass: 'modal-md',
-            acceptButtonText: 'Done',
-            hideDeclineButton: true,
-            extension,
-            onBundleSelected: (bundle) => {
-                extension.setProperties({
-                    next_bundle_uuid: bundle.id,
-                    next_bundle_id: bundle.bundle_id,
-                    next_bundle_filename: bundle.bundle_filename,
-                    next_bundle: bundle,
-                });
-
-                if (typeof onBundleSelected === 'function') {
-                    onBundleSelected(bundle);
-                }
-
-                this.modalsManager.done();
-            },
-        });
-    }
-
-    @action removeFile(file) {
-        return file.destroyRecord();
-    }
-
-    @action previewListing(options = {}) {
-        const extension = this.args.extension;
-        const isAlreadyPurchased = extension.is_purchased === true;
-        const isAlreadyInstalled = extension.is_installed === true;
-        const isPaymentRequired = extension.payment_required === true && isAlreadyPurchased === false;
-        const goBack = async (modal) => {
-            await modal.done();
-            later(
-                this,
-                () => {
-                    this.previewListing();
-                },
-                100
-            );
-        };
-
-        this.modalsManager.show('modals/extension-details', {
-            titleComponent: 'extension-modal-title',
-            modalClass: 'flb--extension-modal modal-lg',
-            modalHeaderClass: 'flb--extension-modal-header',
-            acceptButtonText: isPaymentRequired ? `Purchase for ${formatCurrency(extension.price, extension.currency)}` : isAlreadyInstalled ? 'Installed' : 'Install',
-            acceptButtonIcon: isPaymentRequired ? 'credit-card' : isAlreadyInstalled ? 'check' : 'download',
-            acceptButtonDisabled: true,
-            acceptButtonScheme: isPaymentRequired ? 'success' : 'primary',
-            declineButtonText: 'Done',
-            viewSelfManagesInstallInstructions: () => {
-                this.selfManagedInstallInstructions({
-                    extension,
-                    confirm: goBack,
-                    decline: goBack,
-                });
-            },
-            extension,
-            ...options,
-        });
-    }
-
-    async selfManagedInstallInstructions(options = {}) {
-        await this.modalsManager.done();
-        this.modalsManager.show('modals/self-managed-install-instructions', {
-            title: 'Install Extension to Self-Hosted Instance',
-            hideDeclineButton: true,
-            acceptButtonText: 'Done',
-            ...options,
-        });
-    }
-}
diff --git a/addon/components/extension-modal-title.hbs b/addon/components/extension-modal-title.hbs
deleted file mode 100644
index 412cfdc..0000000
--- a/addon/components/extension-modal-title.hbs
+++ /dev/null
@@ -1,14 +0,0 @@
-<div class="flex flex-row" ...attributes {{did-update this.handleExtensionChanged @extension}}>
-    <div class="modal-title--extension-icon-wrapper shadow-sm dark:border-gray-700">
-        <div class="flex items-center justify-center rounded-lg w-full" {{background-url this.extension.icon_url overlay=true}}>
-            <Image src={{this.extension.icon_url}} class="w-full rounded-lg" alt={{this.extension.name}} @fallbackSrc={{config "defaultValues.extensionIcon"}} />
-        </div>
-    </div>
-    <div class="flex-1">
-        <div class={{this.detailsContainerClass}}>
-            <h1 class="dark:text-white text-black font-semibold">{{this.extension.name}}</h1>
-            <div class="dark:text-gray-300 text-black">{{this.extension.subtitle}}</div>
-            <div class="dark:text-gray-300 text-black text-sm">{{concat "Published by " this.extension.publisher_name}}</div>
-        </div>
-    </div>
-</div>
\ No newline at end of file
diff --git a/addon/components/extension-modal-title.js b/addon/components/extension-modal-title.js
deleted file mode 100644
index de72b23..0000000
--- a/addon/components/extension-modal-title.js
+++ /dev/null
@@ -1,20 +0,0 @@
-import Component from '@glimmer/component';
-import { tracked } from '@glimmer/tracking';
-import { action } from '@ember/object';
-
-export default class ExtensionModalTitleComponent extends Component {
-    @tracked extension;
-    @tracked detailsContainerClass = 'mb-4';
-
-    constructor(owner, { options, extension = null, detailsContainerClass = 'mb-4' }) {
-        super(...arguments);
-        this.extension = options ? options.extension : extension;
-        this.detailsContainerClass = detailsContainerClass;
-    }
-
-    @action handleExtensionChanged(el, [extension]) {
-        if (extension) {
-            this.extension = extension;
-        }
-    }
-}
diff --git a/addon/components/extension-monetize-form.hbs b/addon/components/extension-monetize-form.hbs
deleted file mode 100644
index 61d195d..0000000
--- a/addon/components/extension-monetize-form.hbs
+++ /dev/null
@@ -1,76 +0,0 @@
-<ContentPanel @title={{t "registry-bridge.developers.extensions.extension-form.extension-payment-details"}} @open={{true}} @wrapperClass="bordered-classic">
-    {{#if this.lookupStripeConnectAccount.isRunning}}
-        <div class="flex items-center justify-center flex-1 p-4">
-            <Spinner @loadingMessage="Loading monetization settings..." @loadingMessageClass="ml-2 text-black dark:text-white" @wrapperClass="flex flex-row items-center" />
-        </div>
-    {{else}}
-        {{#if this.hasStripeConnectAccount}}
-            <InputGroup @wrapperClass={{unless @extension.payment_required "mb-0i"}}>
-                <Toggle
-                    @isToggled={{@extension.payment_required}}
-                    @onToggle={{fn (mut @extension.payment_required)}}
-                    @label={{t "registry-bridge.developers.extensions.extension-form.extension-payment-required"}}
-                    @helpText={{t "registry-bridge.developers.extensions.extension-form.extension-payment-required-help-text"}}
-                />
-            </InputGroup>
-            {{#if @extension.payment_required}}
-                {{!-- <InputGroup>
-            <Toggle
-                @isToggled={{@extension.subscription_required}}
-                @onToggle={{fn (mut @extension.subscription_required)}}
-                @label={{t "registry-bridge.developers.extensions.extension-form.extension-subscription-required"}}
-                @helpText={{t "registry-bridge.developers.extensions.extension-form.extension-subscription-required-help-text"}}
-            />
-        </InputGroup> --}}
-                {{#if @extension.subscription_required}}
-                    <InputGroup
-                        @name={{t "registry-bridge.developers.extensions.extension-form.extension-subscription-billing-period"}}
-                        @helpText={{t "registry-bridge.developers.extensions.extension-form.extension-subscription-billing-period-help-text"}}
-                    >
-                        <Select
-                            @value={{@extension.subscription_billing_period}}
-                            @options={{this.billingPeriodOptions}}
-                            @onSelect={{fn (mut @extension.subscription_billing_period)}}
-                            @placeholder={{t "registry-bridge.developers.extensions.extension-form.extension-subscription-billing-period-placeholder"}}
-                            class="w-full"
-                        />
-                    </InputGroup>
-                    <InputGroup
-                        @name={{t "registry-bridge.developers.extensions.extension-form.extension-subscription-amount"}}
-                        @helpText={{t "registry-bridge.developers.extensions.extension-form.extension-subscription-amount-help-text"}}
-                        @wrapperClass="mb-0i"
-                    >
-                        <MoneyInput @value={{@extension.subscription_amount}} @currency="USD" />
-                    </InputGroup>
-                {{else}}
-                    <div class="grid grid-cols-1 lg:grid-cols-2 gap-2">
-                        <InputGroup
-                            @name={{t "registry-bridge.developers.extensions.extension-form.extension-price"}}
-                            @helpText={{t "registry-bridge.developers.extensions.extension-form.extension-price-help-text"}}
-                        >
-                            <MoneyInput @value={{@extension.price}} @currency="USD" />
-                        </InputGroup>
-                        <InputGroup
-                            @name={{t "registry-bridge.developers.extensions.extension-form.extension-sale-price"}}
-                            @helpText={{t "registry-bridge.developers.extensions.extension-form.extension-sale-price-help-text"}}
-                        >
-                            <MoneyInput @value={{@extension.sale_price}} @currency="USD" />
-                        </InputGroup>
-                    </div>
-                {{/if}}
-            {{/if}}
-        {{else}}
-            <div class="container">
-                <div class="max-w-3xl mx-auto mt-4">
-                    <div class="content">
-                        <div class="flex flex-col items-center justify-center">
-                            <h1 class="text-lg font-semibold mb-1">Your account is not setup to accept payments yet.</h1>
-                            <p class="text-sm mb-2">To accept payments for extensions, you must complete the onboard process via Stripe.</p>
-                            <Button @type="primary" @size="lg" @text="Start payments onboard" @onClick={{transition-to "developers.payments.onboard"}} />
-                        </div>
-                    </div>
-                </div>
-            </div>
-        {{/if}}
-    {{/if}}
-</ContentPanel>
\ No newline at end of file
diff --git a/addon/components/extension-monetize-form.js b/addon/components/extension-monetize-form.js
deleted file mode 100644
index 893fe18..0000000
--- a/addon/components/extension-monetize-form.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import Component from '@glimmer/component';
-import { tracked } from '@glimmer/tracking';
-import { inject as service } from '@ember/service';
-import { task } from 'ember-concurrency';
-
-export default class ExtensionMonetizeFormComponent extends Component {
-    @service fetch;
-    @tracked subscriptionModelOptions = ['flat_rate', 'tiered', 'usage'];
-    @tracked billingPeriodOptions = ['daily', 'weekly', 'monthly', 'quarterly', 'yearly'];
-    @tracked hasStripeConnectAccount = false;
-
-    constructor() {
-        super(...arguments);
-        this.lookupStripeConnectAccount.perform();
-    }
-
-    @task *lookupStripeConnectAccount() {
-        try {
-            const { hasStripeConnectAccount } = yield this.fetch.get('payments/has-stripe-connect-account', {}, { namespace: '~registry/v1' });
-            this.hasStripeConnectAccount = hasStripeConnectAccount;
-        } catch (error) {
-            this.hasStripeConnectAccount = false;
-        }
-    }
-}
diff --git a/addon/components/extension-panel.hbs b/addon/components/extension-panel.hbs
new file mode 100644
index 0000000..16e2072
--- /dev/null
+++ b/addon/components/extension-panel.hbs
@@ -0,0 +1,41 @@
+{{#if this.extensionPanel.isOpen}}
+    <Layout::Resource::Panel
+        @resource={{this.extension}}
+        @headerComponent={{component "extension-panel/header" onClose=this.close}}
+        @onPressCancel={{this.close}}
+        @onOverlayReady={{fn (mut this.overlay)}}
+        @width="680px"
+        @isResizable={{true}}
+        @headerClass="no-bottom-border"
+        @bodyClass="no-scroll"
+        class="extension-panel"
+        data-test-extension-panel
+    >
+        {{#if this.extensionPanel.isLoading}}
+            <div class="p-4" aria-busy="true" data-test-extension-panel-loading>
+                <Skeleton::Panel @tabs={{4}} @sections={{2}} />
+            </div>
+        {{else if this.extensionPanel.error}}
+            <div class="p-4" data-test-extension-panel-error>
+                <InfoBlock @type="danger" @icon="triangle-exclamation">
+                    <div class="font-semibold">{{t "registry-bridge.detail.error.title"}}</div>
+                    <div class="mt-3 space-x-2">
+                        <Button @size="xs" @text={{t "registry-bridge.common.close"}} @onClick={{this.close}} />
+                    </div>
+                </InfoBlock>
+            </div>
+        {{else if this.extension}}
+            <TabNavigation @tabs={{this.tabs}} @activeTabId={{this.extensionPanel.tab}} @onTabChange={{this.selectTab}} @contentClass="scrollable" @tablistClass="pl-2" as |tab|>
+                {{#if (eq tab.id "overview")}}
+                    <ExtensionPanel::Overview @extension={{this.extension}} />
+                {{else if (eq tab.id "screenshots")}}
+                    <ExtensionPanel::Screenshots @extension={{this.extension}} />
+                {{else if (eq tab.id "details")}}
+                    <ExtensionPanel::Details @extension={{this.extension}} />
+                {{else if (eq tab.id "versions")}}
+                    <ExtensionPanel::Versions @extension={{this.extension}} />
+                {{/if}}
+            </TabNavigation>
+        {{/if}}
+    </Layout::Resource::Panel>
+{{/if}}
diff --git a/addon/components/extension-panel.js b/addon/components/extension-panel.js
new file mode 100644
index 0000000..8007d32
--- /dev/null
+++ b/addon/components/extension-panel.js
@@ -0,0 +1,38 @@
+import Component from '@glimmer/component';
+import { inject as service } from '@ember/service';
+import { tracked } from '@glimmer/tracking';
+import { action } from '@ember/object';
+
+export const PANEL_TABS = ['overview', 'screenshots', 'details', 'versions'];
+
+/**
+ * The extension detail panel (canvas C4) on `Layout::Resource::Panel`:
+ * header with the call to action, then Overview, Screenshots, Details and
+ * Versions. Opened through the `extension-panel` service.
+ */
+export default class ExtensionPanelComponent extends Component {
+    @service extensionPanel;
+    @service intl;
+    @tracked overlay;
+
+    get extension() {
+        return this.extensionPanel.extension;
+    }
+
+    get tabs() {
+        const screenshots = this.extension?.screenshots?.length ?? 0;
+        return PANEL_TABS.map((id) => ({
+            id,
+            label: this.intl.t(`registry-bridge.detail.tabs.${id}`),
+            badgeText: id === 'screenshots' && screenshots > 0 ? String(screenshots) : undefined,
+        }));
+    }
+
+    @action selectTab(tab) {
+        this.extensionPanel.selectTab(tab?.id ?? tab);
+    }
+
+    @action close() {
+        this.extensionPanel.close();
+    }
+}
diff --git a/addon/components/extension-panel/details.hbs b/addon/components/extension-panel/details.hbs
new file mode 100644
index 0000000..d4f1b25
--- /dev/null
+++ b/addon/components/extension-panel/details.hbs
@@ -0,0 +1,16 @@
+<div class="extension-panel-section" data-test-extension-panel-details>
+    <dl class="extension-panel-definitions">
+        {{#each this.rows as |row|}}
+            <div class="extension-panel-definition" data-test-detail-row>
+                <dt>{{row.label}}</dt>
+                <dd class={{if row.mono "font-mono text-xs"}}>
+                    {{#if row.url}}
+                        <a href={{row.url}} target="_blank" rel="noopener noreferrer">{{row.url}}</a>
+                    {{else}}
+                        {{row.value}}
+                    {{/if}}
+                </dd>
+            </div>
+        {{/each}}
+    </dl>
+</div>
diff --git a/addon/components/extension-panel/details.js b/addon/components/extension-panel/details.js
new file mode 100644
index 0000000..b244672
--- /dev/null
+++ b/addon/components/extension-panel/details.js
@@ -0,0 +1,52 @@
+import Component from '@glimmer/component';
+import { inject as service } from '@ember/service';
+import formatCurrency from '@fleetbase/ember-ui/utils/format-currency';
+import { priceOf } from '../../utils/extension-state';
+
+const HOSTING = { both: 'both', cloud: 'cloud', self_hosted: 'self-hosted' };
+
+/**
+ * Details tab: version, publisher, packages, links, languages, hosting and
+ * pricing, each row only when the listing has it.
+ */
+export default class ExtensionPanelDetailsComponent extends Component {
+    @service intl;
+
+    get extension() {
+        return this.args.extension ?? {};
+    }
+
+    get rows() {
+        const extension = this.extension;
+        const t = (key, params) => this.intl.t(`registry-bridge.detail.fields.${key}`, params);
+        const packages = extension.meta?.package_names ?? {};
+        const price = priceOf(extension);
+        const hosting = HOSTING[extension.meta?.hosting];
+        const version = extension.latest_version || extension.current_bundle_version || extension.version;
+
+        return [
+            { label: t('version'), value: version ? `v${version}` : null },
+            { label: t('installed-version'), value: extension.is_installed && extension.installed_version ? `v${extension.installed_version}` : null },
+            { label: t('updated'), value: extension.updatedAt },
+            { label: t('publisher'), value: extension.publisher_name },
+            { label: t('packages'), value: [packages.npm, packages.composer].filter(Boolean).join(' · ') || null, mono: true },
+            { label: t('website'), url: extension.website_url },
+            { label: t('repository'), url: extension.repo_url },
+            { label: t('support'), url: extension.support_url },
+            { label: t('privacy'), url: extension.privacy_policy_url },
+            { label: t('terms'), url: extension.tos_url },
+            { label: t('languages'), value: (extension.languages ?? []).join(', ') || null },
+            { label: t('copyright'), value: extension.copyright },
+            { label: t('hosting'), value: hosting ? this.intl.t(`registry-bridge.detail.hosting.${hosting}`) : null },
+            {
+                label: t('pricing'),
+                value: price.free
+                    ? this.intl.t('registry-bridge.card.free')
+                    : this.intl.t('registry-bridge.detail.pricing-one-time', {
+                          price: formatCurrency(price.amount, price.currency),
+                          currency: price.currency,
+                      }),
+            },
+        ].filter((row) => row.value || row.url);
+    }
+}
diff --git a/addon/components/extension-panel/header.hbs b/addon/components/extension-panel/header.hbs
new file mode 100644
index 0000000..27edb0a
--- /dev/null
+++ b/addon/components/extension-panel/header.hbs
@@ -0,0 +1,81 @@
+<div class="extension-panel-header {{@headerClass}}" data-test-extension-panel-header ...attributes>
+    <div class="flex flex-row items-start gap-3">
+        <Image src={{this.iconUrl}} alt="" @fallbackSrc={{this.defaultIcon}} class="extension-panel-icon" />
+        <div class="flex-1 min-w-0">
+            <div class="flex flex-row flex-wrap items-center gap-2">
+                <h2 class="extension-panel-title" data-test-extension-panel-title>{{this.extension.name}}</h2>
+                <Badge @status={{this.price.status}} @hideStatusDot={{true}} @disableHumanize={{true}} data-test-extension-panel-price>
+                    {{this.price.text}}
+                    {{#if this.price.original}}<s class="ml-1 opacity-70">{{this.price.original}}</s>{{/if}}
+                </Badge>
+                {{#if this.publisher.verified}}
+                    <Badge @status="default" @hideStatusDot={{true}} @disableHumanize={{true}} @helpText={{t "registry-bridge.detail.verified-help"}}>{{t "registry-bridge.card.verified"}}</Badge>
+                {{/if}}
+            </div>
+            {{#if this.extension.subtitle}}
+                <p class="extension-panel-subtitle">{{this.extension.subtitle}}</p>
+            {{/if}}
+            <div class="mt-2 flex flex-row flex-wrap items-center gap-2">
+                {{#if this.publisher.name}}
+                    <Resource::Pill @resource={{this.publisher}} @title={{this.publisher.name}} @subtitle={{t "registry-bridge.detail.publisher"}} @static={{true}} @noPopover={{true}} />
+                {{/if}}
+                {{#if this.extension.category_name}}
+                    <Category::Pill @category={{this.extension.category}} @title={{this.extension.category_name}} @subtitle={{t "registry-bridge.detail.category"}} @static={{true}} @noPopover={{true}} />
+                {{/if}}
+                {{#if this.versionLine}}
+                    <span class="text-xs text-gray-500 dark:text-gray-400" data-test-extension-panel-version>{{this.versionLine}}</span>
+                {{/if}}
+            </div>
+        </div>
+        <Button @icon="xmark" @size="xs" @type="default" @onClick={{this.close}} aria-label={{t "registry-bridge.common.close"}} data-test-extension-panel-close />
+    </div>
+
+    <div class="extension-panel-cta" data-test-cta={{this.cta.kind}}>
+        {{#if this.is.install}}
+            <Button @type="primary" @icon="download" @text={{t "registry-bridge.detail.cta.install"}} @onClick={{this.install}} data-test-cta-button />
+            <p class="extension-panel-cta-note" data-test-cta-note>{{this.installNote}}</p>
+        {{else if this.is.purchase}}
+            <Button
+                @type="success"
+                @icon="credit-card"
+                @text={{this.purchaseText}}
+                @onClick={{this.purchase}}
+                @isLoading={{this.extensionPurchase.isStarting}}
+                data-test-cta-button
+            />
+            <p class="extension-panel-cta-note">{{t "registry-bridge.detail.cta.purchase-note"}}</p>
+            {{#if this.purchaseError}}
+                <InfoBlock @type="danger" @icon="circle-exclamation" @text={{this.purchaseError}} class="w-full" data-test-cta-purchase-error />
+            {{/if}}
+        {{else if this.is.installed}}
+            <Badge @status="success" @icon="check" @disableHumanize={{true}} data-test-cta-installed>
+                {{t "registry-bridge.detail.cta.installed" version=(if this.cta.version (concat "v" this.cta.version) "")}}
+            </Badge>
+            {{#if this.canUninstall}}
+                <Button @type="danger" @size="xs" @outline={{true}} @icon="trash" @text={{t "registry-bridge.common.uninstall"}} @onClick={{this.uninstall}} data-test-cta-uninstall />
+            {{/if}}
+        {{else if this.is.update}}
+            <Button @type="primary" @icon="arrow-up" @text={{t "registry-bridge.card.update-to" version=this.cta.version}} @onClick={{this.update}} data-test-cta-button />
+            <p class="extension-panel-cta-note">{{t "registry-bridge.detail.cta.update-note" installedVersion=(or this.cta.installedVersion "")}}</p>
+            {{#if this.canUninstall}}
+                <Button @type="danger" @size="xs" @outline={{true}} @icon="trash" @text={{t "registry-bridge.common.uninstall"}} @onClick={{this.uninstall}} data-test-cta-uninstall />
+            {{/if}}
+        {{else if this.is.unauthorized}}
+            <Button @type="default" @icon="lock" @text={{t "registry-bridge.detail.cta.unauthorized"}} @disabled={{true}} data-test-cta-button />
+            <p class="extension-panel-cta-note" data-test-cta-permission>{{t "registry-bridge.detail.cta.unauthorized-note" permission=this.cta.permission}}</p>
+        {{else if this.is.author}}
+            <Button @type="default" @icon="arrow-up-right-from-square" @text={{t "registry-bridge.detail.cta.open-portal"}} @onClick={{this.openPortal}} @disabled={{not this.registryContext.publisherUrl}} data-test-cta-button />
+            <p class="extension-panel-cta-note">{{t "registry-bridge.detail.cta.author"}}</p>
+        {{else if this.is.registration}}
+            {{#if this.canRegister}}
+                <Button @type="primary" @icon="link" @text={{t "registry-bridge.detail.cta.register"}} @onClick={{this.openRegistration}} data-test-cta-button />
+            {{else}}
+                <Button @type="default" @icon="link" @text={{t "registry-bridge.detail.cta.register"}} @disabled={{true}} data-test-cta-button />
+            {{/if}}
+            <p class="extension-panel-cta-note" data-test-cta-reason>{{if this.canRegister (t "registry-bridge.detail.cta.register-note") (t "registry-bridge.detail.cta.register-ask-admin")}}</p>
+        {{else}}
+            <Button @type="default" @icon="ban" @text={{t "registry-bridge.detail.cta.unavailable"}} @disabled={{true}} data-test-cta-button />
+            <p class="extension-panel-cta-note" data-test-cta-reason>{{or this.cta.reason (t "registry-bridge.detail.cta.not-available")}}</p>
+        {{/if}}
+    </div>
+</div>
diff --git a/addon/components/extension-panel/header.js b/addon/components/extension-panel/header.js
new file mode 100644
index 0000000..3656182
--- /dev/null
+++ b/addon/components/extension-panel/header.js
@@ -0,0 +1,129 @@
+import Component from '@glimmer/component';
+import { inject as service } from '@ember/service';
+import { action } from '@ember/object';
+import formatCurrency from '@fleetbase/ember-ui/utils/format-currency';
+import { CTA, PERMISSIONS, detailCta, priceOf } from '../../utils/extension-state';
+import { DEFAULT_EXTENSION_ICON } from '../../models/registry-extension';
+
+/**
+ * Header of the extension detail panel: identity, publisher and category
+ * pills, trust badges and the call to action for this extension on this
+ * instance (canvas C4 CTA matrix).
+ */
+export default class ExtensionPanelHeaderComponent extends Component {
+    @service extensionPanel;
+    @service extensionInstaller;
+    @service extensionPurchase;
+    @service registryContext;
+    @service abilities;
+    @service currentUser;
+    @service hostRouter;
+    @service intl;
+
+    /** The listing's icon, or the default one: a listing without an icon image has `icon_url: null`. */
+    defaultIcon = DEFAULT_EXTENSION_ICON;
+
+    get iconUrl() {
+        return this.extension?.icon_url || DEFAULT_EXTENSION_ICON;
+    }
+
+    get extension() {
+        return this.args.resource ?? this.extensionPanel.extension ?? {};
+    }
+
+    get cta() {
+        return detailCta(this.extension, {
+            canInstall: this.abilities.can(PERMISSIONS.install),
+            canPurchase: this.abilities.can(PERMISSIONS.purchase),
+        });
+    }
+
+    /** `is.install`, `is.registration`, … for the template's branches. */
+    get is() {
+        const kind = this.cta.kind;
+        return Object.fromEntries(Object.entries(CTA).map(([name, value]) => [name.toLowerCase().replace(/_(\w)/g, (_, c) => c.toUpperCase()), value === kind]));
+    }
+
+    get price() {
+        const price = priceOf(this.extension);
+        if (price.free) {
+            return { text: this.intl.t('registry-bridge.card.free'), status: 'success', original: null };
+        }
+        if (this.extension.is_purchased === true) {
+            return { text: this.intl.t('registry-bridge.card.purchased'), status: 'success', original: null };
+        }
+
+        return { text: formatCurrency(price.amount, price.currency), status: 'info', original: price.original ? formatCurrency(price.original, price.currency) : null };
+    }
+
+    /** Minutes without a console rebuild, a rebuild's much longer range with one (`meta.install_mode`). */
+    get installNote() {
+        const key = this.extension.meta?.install_mode === 'build' ? 'install-note-rebuild' : 'install-note';
+
+        return this.intl.t(`registry-bridge.detail.cta.${key}`, { minutes: 2 });
+    }
+
+    get purchaseText() {
+        return this.intl.t('registry-bridge.detail.cta.purchase', { price: formatCurrency(priceOf(this.extension).amount, this.extension.currency) });
+    }
+
+    get publisher() {
+        const publisher = this.extension.meta?.publisher ?? {};
+        return { name: publisher.name ?? this.extension.publisher_name, verified: publisher.is_verified === true, avatar_url: publisher.avatar_url };
+    }
+
+    get versionLine() {
+        const version = this.extension.latest_version || this.extension.current_bundle_version || this.extension.version;
+        return [version ? `v${version}` : null, this.extension.updatedAt ? this.intl.t('registry-bridge.detail.updated', { date: this.extension.updatedAt }) : null]
+            .filter(Boolean)
+            .join(' · ');
+    }
+
+    get canUninstall() {
+        return this.extension.is_installed === true && this.abilities.can(PERMISSIONS.uninstall) && this.extension.core_extension !== true;
+    }
+
+    get canRegister() {
+        return this.currentUser.isAdmin === true;
+    }
+
+    @action close() {
+        if (typeof this.args.onClose === 'function') {
+            return this.args.onClose();
+        }
+        return this.extensionPanel.close();
+    }
+
+    @action install() {
+        return this.extensionInstaller.install(this.extension, { onCompleted: () => this.extensionPanel.reload() });
+    }
+
+    @action update() {
+        return this.extensionInstaller.update(this.extension, { onCompleted: () => this.extensionPanel.reload() });
+    }
+
+    @action uninstall() {
+        return this.extensionInstaller.uninstall(this.extension, { onCompleted: () => this.extensionPanel.reload() });
+    }
+
+    @action purchase() {
+        return this.extensionPurchase.purchase(this.extension);
+    }
+
+    /** A refused checkout (already licensed, publisher not set up, …) shown under the call to action. */
+    get purchaseError() {
+        const error = this.extensionPurchase.lastError;
+        return error && error.extension === (this.extension.public_id ?? this.extension.id) ? error.message : null;
+    }
+
+    @action openPortal() {
+        if (this.registryContext.publisherUrl) {
+            window.open(this.registryContext.publisherUrl, '_blank', 'noopener');
+        }
+    }
+
+    @action openRegistration() {
+        this.extensionPanel.close();
+        return this.hostRouter.transitionTo('console.admin.virtual', 'extension-registry', { queryParams: { view: 'registry-config' } });
+    }
+}
diff --git a/addon/components/extension-panel/overview.hbs b/addon/components/extension-panel/overview.hbs
new file mode 100644
index 0000000..c3dc9d5
--- /dev/null
+++ b/addon/components/extension-panel/overview.hbs
@@ -0,0 +1,31 @@
+<div class="extension-panel-section space-y-4" data-test-extension-panel-overview>
+    {{#if @extension.description}}
+        <p class="text-sm dark:text-gray-200" data-test-extension-panel-description>{{@extension.description}}</p>
+    {{/if}}
+    {{#if @extension.promotional_text}}
+        <div class="extension-details-promo-content dark:text-gray-200 text-sm">{{html-safe @extension.promotional_text}}</div>
+    {{/if}}
+    {{#if this.compat}}
+        <InfoBlock @type="default" @icon="code-compare" @text={{this.compat}} data-test-extension-panel-compat />
+    {{/if}}
+
+    <dl class="extension-panel-facts">
+        {{#if @extension.meta.installs_count}}
+            <div><dt>{{t "registry-bridge.detail.installs"}}</dt><dd>{{@extension.meta.installs_count}}</dd></div>
+        {{/if}}
+        {{#if this.lastRelease}}
+            <div><dt>{{t "registry-bridge.detail.last-release"}}</dt><dd>v{{this.lastRelease.version}}</dd></div>
+        {{/if}}
+        {{#if @extension.support_url}}
+            <div><dt>{{t "registry-bridge.detail.support"}}</dt><dd><a href={{@extension.support_url}} target="_blank" rel="noopener noreferrer">{{@extension.support_url}}</a></dd></div>
+        {{/if}}
+    </dl>
+
+    {{#if @extension.tags.length}}
+        <div class="flex flex-row flex-wrap items-center gap-1" data-test-extension-panel-tags>
+            {{#each @extension.tags as |tag|}}
+                <Badge @status="default" @size="xs" @hideStatusDot={{true}} @disableHumanize={{true}}>{{tag}}</Badge>
+            {{/each}}
+        </div>
+    {{/if}}
+</div>
diff --git a/addon/components/extension-panel/overview.js b/addon/components/extension-panel/overview.js
new file mode 100644
index 0000000..c241605
--- /dev/null
+++ b/addon/components/extension-panel/overview.js
@@ -0,0 +1,30 @@
+import Component from '@glimmer/component';
+import { inject as service } from '@ember/service';
+
+/**
+ * Overview tab: description, promotional text, compatibility, install count,
+ * last release, support and tags.
+ */
+export default class ExtensionPanelOverviewComponent extends Component {
+    @service intl;
+
+    get extension() {
+        return this.args.extension ?? {};
+    }
+
+    get compat() {
+        const compat = this.extension.meta?.compat ?? {};
+        const consoleRange = compat.console ?? compat.fleetbase ?? compat['@fleetbase/console'] ?? null;
+        const apiRange = compat.api ?? compat['core-api'] ?? compat['fleetbase/core-api'] ?? null;
+        if (!consoleRange && !apiRange) {
+            return null;
+        }
+
+        return this.intl.t('registry-bridge.detail.compat', { console: consoleRange ?? '*', api: apiRange ?? '*' });
+    }
+
+    get lastRelease() {
+        const release = this.extension.meta?.latest_release;
+        return release?.version ? release : null;
+    }
+}
diff --git a/addon/components/extension-panel/screenshots.hbs b/addon/components/extension-panel/screenshots.hbs
new file mode 100644
index 0000000..0ea8973
--- /dev/null
+++ b/addon/components/extension-panel/screenshots.hbs
@@ -0,0 +1,29 @@
+<div class="extension-panel-section" data-test-extension-panel-screenshots>
+    {{#if this.current}}
+        {{! template-lint-disable no-invalid-interactive }}
+        <figure class="extension-panel-viewer" tabindex="0" aria-roledescription="carousel" aria-label={{t "registry-bridge.detail.tabs.screenshots"}} {{on "keydown" this.onKeydown}}>
+            <Image src={{this.current.url}} alt={{or this.current.original_filename ""}} class="extension-panel-viewer-image" data-test-screenshot-current />
+            <figcaption class="flex flex-row items-center justify-between mt-2">
+                <Button @icon="chevron-left" @size="xs" @onClick={{this.previous}} aria-label={{t "registry-bridge.detail.screenshots.previous"}} />
+                <span class="text-xs text-gray-500 dark:text-gray-400" data-test-screenshot-position>{{this.position}}</span>
+                <Button @icon="chevron-right" @size="xs" @onClick={{this.next}} aria-label={{t "registry-bridge.detail.screenshots.next"}} />
+            </figcaption>
+        </figure>
+        <div class="grid grid-cols-4 gap-2 mt-3">
+            {{#each this.thumbnails as |thumb|}}
+                <button
+                    type="button"
+                    class="extension-panel-thumb {{if thumb.isActive 'is-active'}}"
+                    aria-label={{t "registry-bridge.detail.screenshots.show" number=thumb.number}}
+                    aria-pressed={{if thumb.isActive "true" "false"}}
+                    {{on "click" (fn this.show thumb.index)}}
+                    data-test-screenshot-thumb
+                >
+                    <Image src={{thumb.screenshot.url}} alt="" class="flb--extension-screenshot" />
+                </button>
+            {{/each}}
+        </div>
+    {{else}}
+        <Table::EmptyState @icon="image" @title={{t "registry-bridge.detail.screenshots.empty"}} @variant="compact" />
+    {{/if}}
+</div>
diff --git a/addon/components/extension-panel/screenshots.js b/addon/components/extension-panel/screenshots.js
new file mode 100644
index 0000000..f3318b3
--- /dev/null
+++ b/addon/components/extension-panel/screenshots.js
@@ -0,0 +1,52 @@
+import Component from '@glimmer/component';
+import { tracked } from '@glimmer/tracking';
+import { action } from '@ember/object';
+
+/**
+ * Screenshots tab: a viewer with previous and next controls (arrow keys
+ * while it has focus) and the thumbnails below.
+ */
+export default class ExtensionPanelScreenshotsComponent extends Component {
+    @tracked index = 0;
+
+    get screenshots() {
+        return Array.from(this.args.extension?.screenshots ?? []);
+    }
+
+    get thumbnails() {
+        return this.screenshots.map((screenshot, index) => ({ screenshot, index, number: index + 1, isActive: index === this.index }));
+    }
+
+    get current() {
+        return this.screenshots[this.index] ?? null;
+    }
+
+    get position() {
+        return this.screenshots.length ? `${this.index + 1} / ${this.screenshots.length}` : null;
+    }
+
+    @action show(index) {
+        const count = this.screenshots.length;
+        if (count) {
+            this.index = ((index % count) + count) % count;
+        }
+    }
+
+    @action previous() {
+        this.show(this.index - 1);
+    }
+
+    @action next() {
+        this.show(this.index + 1);
+    }
+
+    @action onKeydown(event) {
+        if (event.key === 'ArrowLeft') {
+            event.preventDefault();
+            this.previous();
+        } else if (event.key === 'ArrowRight') {
+            event.preventDefault();
+            this.next();
+        }
+    }
+}
diff --git a/addon/components/extension-panel/versions.hbs b/addon/components/extension-panel/versions.hbs
new file mode 100644
index 0000000..0757d1d
--- /dev/null
+++ b/addon/components/extension-panel/versions.hbs
@@ -0,0 +1,19 @@
+<div class="extension-panel-section space-y-3" data-test-extension-panel-versions>
+    {{#if this.load.isRunning}}
+        <Skeleton::Table @rows={{3}} @columns={{5}} @checkbox={{false}} data-test-versions-loading />
+    {{else if this.error}}
+        <InfoBlock @type="danger" @icon="triangle-exclamation" data-test-versions-error>
+            <div>{{t "registry-bridge.detail.versions.error"}}</div>
+            <div class="mt-2"><Button @size="xs" @icon="rotate-right" @text={{t "registry-bridge.common.retry"}} @onClick={{perform this.load}} /></div>
+        </InfoBlock>
+    {{else}}
+        {{#unless this.supported}}
+            <InfoBlock @type="default" @icon="circle-info" @text={{t "registry-bridge.detail.versions.unsupported"}} data-test-versions-unsupported />
+        {{/unless}}
+        {{#if this.rows.length}}
+            <Table @rows={{this.rows}} @columns={{this.columns}} @selectable={{false}} @canSelectAll={{false}} @pagination={{false}} data-test-versions-table />
+        {{else}}
+            <Table::EmptyState @icon="tags" @title={{t "registry-bridge.detail.versions.empty"}} @variant="compact" />
+        {{/if}}
+    {{/if}}
+</div>
diff --git a/addon/components/extension-panel/versions.js b/addon/components/extension-panel/versions.js
new file mode 100644
index 0000000..30d5a6e
--- /dev/null
+++ b/addon/components/extension-panel/versions.js
@@ -0,0 +1,95 @@
+import Component from '@glimmer/component';
+import { inject as service } from '@ember/service';
+import { tracked } from '@glimmer/tracking';
+import { action } from '@ember/object';
+import { task } from 'ember-concurrency';
+import { format as formatDate, isValid } from 'date-fns';
+import { PERMISSIONS } from '../../utils/extension-state';
+
+export function formatBytes(bytes) {
+    const value = Number(bytes) || 0;
+    if (value <= 0) {
+        return null;
+    }
+    if (value < 1024 * 1024) {
+        return `${Math.max(1, Math.round(value / 1024))} KB`;
+    }
+    return `${(value / (1024 * 1024)).toFixed(1)} MB`;
+}
+
+/**
+ * Versions tab: published and yanked releases from the Registry Service
+ * (GET ~registry/v1/registry-extensions/{id}/releases) with Install this
+ * version, or the current version only for cloud-catalog records.
+ */
+export default class ExtensionPanelVersionsComponent extends Component {
+    @service fetch;
+    @service intl;
+    @service abilities;
+    @service extensionInstaller;
+    @service extensionPanel;
+    @tracked releases = [];
+    @tracked supported = true;
+    @tracked error = null;
+
+    constructor() {
+        super(...arguments);
+        this.load.perform();
+    }
+
+    get extension() {
+        return this.args.extension ?? {};
+    }
+
+    get canInstall() {
+        return this.abilities.can(PERMISSIONS.install);
+    }
+
+    get rows() {
+        const installable = this.extension.is_installed === true || this.extension.is_installable !== false;
+        return this.releases.map((release) => {
+            const date = release.published_at ? new Date(release.published_at) : null;
+            const blocked = release.is_yanked || release.is_installed || !installable;
+
+            return {
+                ...release,
+                publishedLabel: date && isValid(date) ? formatDate(date, 'd MMM yyyy') : null,
+                sizeLabel: formatBytes(release.size_bytes),
+                actionDisabled: blocked || !this.canInstall,
+                actionText: this.intl.t(this.extension.is_installed ? 'registry-bridge.detail.versions.switch' : 'registry-bridge.detail.versions.install'),
+            };
+        });
+    }
+
+    get columns() {
+        const t = (key) => this.intl.t(`registry-bridge.detail.versions.columns.${key}`);
+        return [
+            { label: t('version'), valuePath: 'version', cellComponent: 'cell/release-version', width: '22%' },
+            { label: t('channel'), valuePath: 'channel', width: '12%' },
+            { label: t('date'), valuePath: 'publishedLabel', width: '16%' },
+            { label: t('size'), valuePath: 'sizeLabel', width: '12%' },
+            { label: t('notes'), valuePath: 'notes', width: '20%' },
+            { label: '', valuePath: 'id', cellComponent: 'cell/release-action', onInstall: this.installVersion, width: '18%' },
+        ];
+    }
+
+    @task *load() {
+        const id = this.extension.public_id ?? this.extension.id;
+        this.error = null;
+        try {
+            const response = yield this.fetch.get(`registry-extensions/${id}/releases`, this.extension.installed_version ? { installed_version: this.extension.installed_version } : {}, {
+                namespace: '~registry/v1',
+            });
+            this.supported = response?.supported !== false;
+            this.releases = response?.releases ?? [];
+        } catch (error) {
+            this.error = error;
+            this.releases = [];
+        }
+    }
+
+    @action installVersion(release) {
+        const options = { version: release.version, onCompleted: () => this.extensionPanel.reload() };
+        return this.extension.is_installed ? this.extensionInstaller.update(this.extension, options) : this.extensionInstaller.install(this.extension, options);
+    }
+}
diff --git a/addon/components/extension-pending-publish-viewer.hbs b/addon/components/extension-pending-publish-viewer.hbs
deleted file mode 100644
index ab746cb..0000000
--- a/addon/components/extension-pending-publish-viewer.hbs
+++ /dev/null
@@ -1,62 +0,0 @@
-<div class="space-y-4">
-    <ContentPanel @title={{t "registry-bridge.component.extension-pending-publish-viewer.content-panel-title"}} @open={{true}} @wrapperClass="bordered-classic">
-        <div class="grid grid-cols-1 lg:grid-cols-4">
-            {{#each this.extensions as |extension|}}
-                <div class="flex flex-col">
-                    <button type="button" class="rounded-lg border border-gray-200 dark:border-gray-700 shadow-sm w-full hover:opacity-50" {{on "click" (fn this.focusExtension extension)}}>
-                        <div class="flex items-center justify-center rounded-t-lg w-full h-36" {{background-url extension.icon_url overlay=true}}>
-                            <Image src={{extension.icon_url}} class="w-full h-36 rounded-t-lg" alt={{extension.name}} @fallbackSrc={{config "defaultValues.extensionIcon"}} />
-                        </div>
-                        <div class="text-left px-3 py-2 rounded-b-lg bg-white border-t border-gray-200 dark:border-gray-700 dark:bg-gray-900">
-                            <span class="font-semibold text-sm block">{{extension.name}}</span>
-                            <p class="text-xs">{{n-a extension.description}}</p>
-                            <div>
-                                <Badge @status={{extension.status}} />
-                            </div>
-                        </div>
-                    </button>
-                    <div class="space-y-2 mt-3">
-                        {{#unless (eq extension.status "published")}}
-                            <Button
-                                @type="magic"
-                                @size="sm"
-                                @icon="rocket"
-                                @text={{t "registry-bridge.component.extension-pending-publish-viewer.publish"}}
-                                @onClick={{perform this.publishExtension extension}}
-                                class="w-full"
-                            />
-                        {{/unless}}
-                        <Button
-                            @size="sm"
-                            @icon="clipboard-list"
-                            @text={{t "registry-bridge.component.extension-pending-publish-viewer.view-details"}}
-                            @onClick={{fn this.focusExtension extension}}
-                            class="w-full"
-                        />
-                        <Button
-                            @size="sm"
-                            @icon="download"
-                            @text={{t "registry-bridge.component.extension-pending-publish-viewer.download-bundle"}}
-                            @onClick={{perform this.downloadBundle extension}}
-                            class="w-full"
-                        />
-                    </div>
-                </div>
-            {{else}}
-                <div class="col-span-4">
-                    <div class="text-base italic">{{t "registry-bridge.component.extension-pending-publish-viewer.no-extensions-awaiting-publish"}}</div>
-                </div>
-            {{/each}}
-        </div>
-    </ContentPanel>
-
-    {{#if this.focusedExtension}}
-        <ContentPanel @title={{t "registry-bridge.component.extension-pending-publish-viewer.focused-extension-title" extensionName=this.focusedExtension.name}} @open={{true}} @wrapperClass="bordered-classic">
-            <div class="flex items-center mb-4 px-1">
-                <Button @type="primary" @size="sm" @icon="check" @text={{t "common.done"}} @onClick={{this.unfocusExtension}} class="w-full" />
-            </div>
-            <ExtensionForm @extension={{this.focusedExtension}} @withMonetizeForm={{true}} />
-        </ContentPanel>
-    {{/if}}
-</div>
-<Spacer @height="400px" />
\ No newline at end of file
diff --git a/addon/components/extension-pending-publish-viewer.js b/addon/components/extension-pending-publish-viewer.js
deleted file mode 100644
index a3c79e5..0000000
--- a/addon/components/extension-pending-publish-viewer.js
+++ /dev/null
@@ -1,45 +0,0 @@
-import Component from '@glimmer/component';
-import { tracked } from '@glimmer/tracking';
-import { inject as service } from '@ember/service';
-import { action } from '@ember/object';
-import { task } from 'ember-concurrency';
-
-export default class ExtensionPendingPublishViewerComponent extends Component {
-    @service store;
-    @service notifications;
-    @tracked extensions = [];
-    @tracked focusedExtension;
-
-    constructor() {
-        super(...arguments);
-        this.getExtensionsPendingPublish.perform();
-    }
-
-    @task *getExtensionsPendingPublish() {
-        this.extensions = yield this.store.query('registry-extension', { status: 'approved', admin: 1 });
-    }
-
-    @task *downloadBundle(extension) {
-        try {
-            yield extension.downloadBundle();
-        } catch (error) {
-            this.notifications.error(error.message);
-        }
-    }
-
-    @task *publishExtension(extension) {
-        try {
-            yield extension.publish();
-        } catch (error) {
-            this.notifications.error(error.message);
-        }
-    }
-
-    @action focusExtension(extension) {
-        this.focusedExtension = extension;
-    }
-
-    @action unfocusExtension() {
-        this.focusedExtension = undefined;
-    }
-}
diff --git a/addon/components/extension-reviewer-control.hbs b/addon/components/extension-reviewer-control.hbs
deleted file mode 100644
index 98913a9..0000000
--- a/addon/components/extension-reviewer-control.hbs
+++ /dev/null
@@ -1,68 +0,0 @@
-<div class="space-y-4">
-    <ContentPanel @title={{t "registry-bridge.component.extension-reviewer-control.content-panel-title"}} @open={{true}} @wrapperClass="bordered-classic">
-        <div class="grid grid-cols-1 lg:grid-cols-4">
-            {{#each this.extensions as |extension|}}
-                <div class="flex flex-col">
-                    <button type="button" class="rounded-lg border border-gray-200 dark:border-gray-700 shadow-sm w-full hover:opacity-50" {{on "click" (fn this.focusExtension extension)}}>
-                        <div class="flex items-center justify-center rounded-t-lg w-full h-36" {{background-url extension.icon_url overlay=true}}>
-                            <Image src={{extension.icon_url}} class="w-full h-36 rounded-t-lg" alt={{extension.name}} @fallbackSrc={{config "defaultValues.extensionIcon"}} />
-                        </div>
-                        <div class="text-left px-3 py-2 rounded-b-lg bg-white border-t border-gray-200 dark:border-gray-700 dark:bg-gray-900">
-                            <span class="font-semibold text-sm block">{{extension.name}}</span>
-                            <p class="text-xs">{{n-a extension.description}}</p>
-                            <div>
-                                <Badge @status={{extension.status}} />
-                            </div>
-                        </div>
-                    </button>
-                    <div class="space-y-2 mt-3">
-                        <Button
-                            @size="sm"
-                            @icon="clipboard-list"
-                            @text={{t "registry-bridge.component.extension-reviewer-control.view-details"}}
-                            @onClick={{fn this.focusExtension extension}}
-                            class="w-full"
-                        />
-                        <Button
-                            @size="sm"
-                            @icon="download"
-                            @text={{t "registry-bridge.component.extension-reviewer-control.download-bundle"}}
-                            @onClick={{perform this.downloadBundle extension}}
-                            class="w-full"
-                        />
-                        <Button
-                            @type="success"
-                            @size="sm"
-                            @icon="check"
-                            @text={{t "registry-bridge.component.extension-reviewer-control.approve"}}
-                            @onClick={{fn this.approve extension}}
-                            class="w-full"
-                        />
-                        <Button
-                            @type="danger"
-                            @size="sm"
-                            @icon="ban"
-                            @text={{t "registry-bridge.component.extension-reviewer-control.reject"}}
-                            @onClick={{fn this.reject extension}}
-                            class="w-full"
-                        />
-                    </div>
-                </div>
-            {{else}}
-                <div class="col-span-4">
-                    <div class="text-base italic">{{t "registry-bridge.component.extension-reviewer-control.no-extensions-awaiting-review"}}</div>
-                </div>
-            {{/each}}
-        </div>
-    </ContentPanel>
-
-    {{#if this.focusedExtension}}
-        <ContentPanel @title={{t "registry-bridge.component.extension-reviewer-control.focused-extension-title" extensionName=this.focusedExtension.name}} @open={{true}} @wrapperClass="bordered-classic">
-            <div class="flex items-center mb-4 px-1">
-                <Button @type="primary" @size="sm" @icon="check" @text={{t "common.done"}} @onClick={{this.unfocusExtension}} class="w-full" />
-            </div>
-            <ExtensionForm @extension={{this.focusedExtension}} @withMonetizeForm={{true}} />
-        </ContentPanel>
-    {{/if}}
-</div>
-<Spacer @height="400px" />
\ No newline at end of file
diff --git a/addon/components/extension-reviewer-control.js b/addon/components/extension-reviewer-control.js
deleted file mode 100644
index 82dec72..0000000
--- a/addon/components/extension-reviewer-control.js
+++ /dev/null
@@ -1,68 +0,0 @@
-import Component from '@glimmer/component';
-import { tracked } from '@glimmer/tracking';
-import { inject as service } from '@ember/service';
-import { action } from '@ember/object';
-import { task } from 'ember-concurrency';
-
-export default class ExtensionReviewerControlComponent extends Component {
-    @service store;
-    @service modalsManager;
-    @service notifications;
-    @service intl;
-    @tracked extensions = [];
-    @tracked focusedExtension;
-
-    constructor() {
-        super(...arguments);
-        this.getExtensionsPendingReview.perform();
-    }
-
-    @task *getExtensionsPendingReview() {
-        this.extensions = yield this.store.query('registry-extension', { status: 'awaiting_review', admin: 1 });
-    }
-
-    @task *downloadBundle(extension) {
-        try {
-            yield extension.downloadBundle();
-        } catch (error) {
-            this.notifications.error(error.message);
-        }
-    }
-
-    @action focusExtension(extension) {
-        this.focusedExtension = extension;
-    }
-
-    @action unfocusExtension() {
-        this.focusedExtension = undefined;
-    }
-
-    @action approve(extension) {
-        return this.modalsManager.confirm({
-            title: this.intl.t('registry-bridge.component.extension-reviewer-control.approve-confirm-title', { extensionName: extension.name }),
-            body: this.intl.t('registry-bridge.component.extension-reviewer-control.approve-confirm-body'),
-            acceptButtonText: this.intl.t('registry-bridge.component.extension-reviewer-control.approve'),
-            confirm: () => {
-                this.unfocusExtension();
-                return extension.approve().finally(() => {
-                    this.getExtensionsPendingReview.perform();
-                });
-            },
-        });
-    }
-
-    @action reject(extension) {
-        return this.modalsManager.confirm({
-            title: this.intl.t('registry-bridge.component.extension-reviewer-control.decline-confirm-title', { extensionName: extension.name }),
-            body: this.intl.t('registry-bridge.component.extension-reviewer-control.decline-confirm-body'),
-            acceptButtonText: this.intl.t('registry-bridge.component.extension-reviewer-control.reject'),
-            acceptButtonIcon: 'ban',
-            acceptButtonScheme: 'danger',
-            confirm: () => {
-                return extension.reject().finally(() => {
-                    this.getExtensionsPendingReview.perform();
-                });
-            },
-        });
-    }
-}
diff --git a/addon/components/installer-job-error.hbs b/addon/components/installer-job-error.hbs
deleted file mode 100644
index e0abd9e..0000000
--- a/addon/components/installer-job-error.hbs
+++ /dev/null
@@ -1,29 +0,0 @@
-<div class="my-4 space-y-2 rounded-lg border border-red-300 bg-red-50 px-4 py-3 text-sm text-red-800 dark:border-red-800 dark:bg-red-900 dark:bg-opacity-30 dark:text-red-200" role="alert" data-test-installer-job-error>
-    <div class="flex flex-row items-center space-x-2 font-semibold">
-        <FaIcon @icon="circle-exclamation" />
-        <span data-test-installer-job-error-step>
-            {{#if @error.step}}
-                {{t "registry-bridge.installer.failed-at" step=@error.step}}
-            {{else}}
-                {{t "registry-bridge.installer.failed"}}
-            {{/if}}
-        </span>
-    </div>
-    <div class="break-words" data-test-installer-job-error-message>{{@error.message}}</div>
-    {{#if @error.rolledBack}}
-        <div data-test-installer-job-error-rolled-back>{{t "registry-bridge.installer.rolled-back"}}</div>
-    {{/if}}
-    {{#if @error.rebuildRequired}}
-        <div>{{t "registry-bridge.installer.rebuild-required"}}</div>
-    {{/if}}
-    {{#if @error.log.length}}
-        <details data-test-installer-job-error-log>
-            <summary class="cursor-pointer select-none">{{t "registry-bridge.installer.show-log"}}</summary>
-            <div class="mt-2 max-h-60 overflow-auto rounded bg-white px-2 py-1 font-mono text-xs text-gray-800 dark:bg-gray-900 dark:text-gray-200">
-                {{#each @error.log as |line|}}
-                    <div class="whitespace-pre-wrap">{{line}}</div>
-                {{/each}}
-            </div>
-        </details>
-    {{/if}}
-</div>
diff --git a/addon/components/installer-job-error.js b/addon/components/installer-job-error.js
deleted file mode 100644
index 6e0a3a3..0000000
--- a/addon/components/installer-job-error.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import Component from '@glimmer/component';
-
-/**
- * The failed state of an install or uninstall job: the step, the message, the
- * rollback outcome and the log tail (see utils/installer-job).
- */
-export default class InstallerJobErrorComponent extends Component {}
diff --git a/addon/components/modals/confirm-extension-purchase.hbs b/addon/components/modals/confirm-extension-purchase.hbs
deleted file mode 100644
index f2a63c7..0000000
--- a/addon/components/modals/confirm-extension-purchase.hbs
+++ /dev/null
@@ -1,5 +0,0 @@
-<Modal::Default @modalIsOpened={{@modalIsOpened}} @options={{@options}} @confirm={{@onConfirm}} @decline={{@onDecline}}>
-    <div class="pt-4 pb-6 px-4">
-        <Spinner @loadingMessage={{@options.loadingMessage}} @loadingMessageClass="ml-2 text-black dark:text-white" @wrapperClass="flex flex-row items-center" />
-    </div>
-</Modal::Default>
\ No newline at end of file
diff --git a/addon/components/modals/confirm-extension-purchase.js b/addon/components/modals/confirm-extension-purchase.js
deleted file mode 100644
index 74c512a..0000000
--- a/addon/components/modals/confirm-extension-purchase.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Component from '@glimmer/component';
-
-export default class ModalsConfirmExtensionPurchaseComponent extends Component {}
diff --git a/addon/components/modals/create-registry-credentials.hbs b/addon/components/modals/create-registry-credentials.hbs
deleted file mode 100644
index a5720e3..0000000
--- a/addon/components/modals/create-registry-credentials.hbs
+++ /dev/null
@@ -1,5 +0,0 @@
-<Modal::Default @modalIsOpened={{@modalIsOpened}} @options={{@options}} @confirm={{@onConfirm}} @decline={{@onDecline}}>
-    <div class="modal-body-container">
-        <InputGroup @name="Password" @helpText="You must authenticate using your password." @placeholder="Enter your password" @value={{@options.password}} @type="password" />    
-    </div>
-</Modal::Default>
\ No newline at end of file
diff --git a/addon/components/modals/extension-details.hbs b/addon/components/modals/extension-details.hbs
deleted file mode 100644
index 459e5ff..0000000
--- a/addon/components/modals/extension-details.hbs
+++ /dev/null
@@ -1,110 +0,0 @@
-<Modal::Default @modalIsOpened={{@modalIsOpened}} @options={{@options}} @confirm={{@onConfirm}} @decline={{@onDecline}}>
-    <div class="modal-body-container space-y-3">
-        <div class="flex flex-row items-center space-x-2">
-            <div class="flb--extension-tag shadow-sm border dark:bg-gray-800 dark:border-gray-800 dark:text-gray-200">
-                {{t "registry-bridge.component.extension-details-modal.extension"}}
-            </div>
-            <div class="flb--extension-tag shadow-sm border dark:bg-gray-800 dark:border-gray-800 dark:text-gray-200">
-                {{this.extension.category_name}}
-            </div>
-        </div>
-        {{#if this.extension.meta.install_blocked_reason}}
-            {{#unless this.extension.is_installed}}
-                <div
-                    class="rounded-md border border-yellow-300 bg-yellow-50 dark:bg-yellow-900/20 dark:border-yellow-800 p-2 text-sm text-yellow-800 dark:text-yellow-200"
-                    data-test-install-blocked-reason
-                >
-                    <FaIcon @icon="circle-info" class="mr-1" />{{this.extension.meta.install_blocked_reason}}
-                </div>
-            {{/unless}}
-        {{/if}}
-        {{#if @options.progress}}
-            <div class="my-4">
-                <ProgressBar @title={{@options.stepDescription}} @percent={{@options.progress}} />
-            </div>
-        {{/if}}
-        {{#if @options.installerError}}
-            <InstallerJobError @error={{@options.installerError}} />
-        {{/if}}
-        {{#if this.extension.screenshots}}
-            <div class="grid grid-cols-4 gap-2">
-                {{#each this.extension.screenshots as |screenshot|}}
-                    <Image src={{screenshot.url}} class="flb--extension-screenshot" {{on "click" (fn this.lightboxScreenshot screenshot)}} />
-                {{/each}}
-            </div>
-            {{#if this.screenshotInLightbox}}
-                <EmberWormhole @to="console-wormhole">
-                    <div class="flb--extension-screenshot-lightbox" {{did-insert this.setupScreenshotLightbox}}>
-                        <Image src={{this.screenshotInLightbox.url}} class="flb--extension-screenshot" {{on "click" this.lightboxScreenshot}} />
-                    </div>
-                </EmberWormhole>
-            {{/if}}
-        {{/if}}
-        <div class="space-y-3">
-            <div>
-                <h3 class="dark:text-white font-semibold mb-1">{{t "registry-bridge.component.extension-details-modal.description"}}</h3>
-                <p class="dark:text-gray-200 text-sm">{{this.extension.description}}</p>
-            </div>
-            <div>
-                <h3 class="dark:text-white font-semibold mb-1">{{t "registry-bridge.component.extension-details-modal.overview"}}</h3>
-                <div class="extension-details-promo-content dark:text-gray-200 text-sm">{{html-safe this.extension.promotional_text}}</div>
-            </div>
-        </div>
-        <div>
-            <h3 class="dark:text-white font-semibold mb-1">{{t "registry-bridge.component.extension-details-modal.details"}}</h3>
-            <div class="space-y-2">
-                <div class="grid grid-cols-4 gap-2">
-                    <div class="space-y-2">
-                        <div>
-                            <div class="text-sm font-semibold dark:text-gray-100">{{t "registry-bridge.component.extension-details-modal.version"}}</div>
-                            <div class="text-sm dark:text-gray-200">{{n-a this.extension.current_bundle_version}}</div>
-                            {{#if this.extension.update_available}}
-                                <div class="text-xs text-blue-600 dark:text-blue-400" data-test-update-available>Installed
-                                    {{this.extension.installed_version}}, update to
-                                    {{this.extension.latest_version}}
-                                    available</div>
-                            {{/if}}
-                        </div>
-                        <div>
-                            <div class="text-sm font-semibold dark:text-gray-100">{{t "registry-bridge.component.extension-details-modal.updated"}}</div>
-                            <div class="text-sm dark:text-gray-200">{{n-a this.extension.updatedAt}}</div>
-                        </div>
-                    </div>
-                    <div class="space-y-2">
-                        <div>
-                            <div class="text-sm font-semibold dark:text-gray-100">{{t "registry-bridge.component.extension-details-modal.author"}}</div>
-                            <div class="text-sm dark:text-gray-200">{{n-a this.extension.publisher_name}}</div>
-                        </div>
-                        <div>
-                            <div class="text-sm font-semibold dark:text-gray-100">{{t "registry-bridge.component.extension-details-modal.website"}}</div>
-                            {{#if this.extension.website_url}}
-                                <a
-                                    class="text-sm text-blue-400 hover:text-blue-300"
-                                    href={{this.extension.website_url}}
-                                    target={{dasherize (concat this.extension.name "-website")}}
-                                >{{this.extension.website_url}}</a>
-                            {{else}}
-                                <div class="text-sm dark:text-gray-200">-</div>
-                            {{/if}}
-                        </div>
-                    </div>
-                    {{#if @options.viewSelfManagesInstallInstructions}}
-                        <div class="space-y-2">
-                            <div>
-                                <Button
-                                    @size="xs"
-                                    @type="magic"
-                                    @text={{t "registry-bridge.component.extension-details-modal.self-hosted-install"}}
-                                    @helpText={{t "registry-bridge.component.extension-details-modal.self-hosted-install-help-text"}}
-                                    @tooltipPlacement="right"
-                                    @onClick={{@options.viewSelfManagesInstallInstructions}}
-                                    @icon="circle-info"
-                                />
-                            </div>
-                        </div>
-                    {{/if}}
-                </div>
-            </div>
-        </div>
-    </div>
-</Modal::Default>
\ No newline at end of file
diff --git a/addon/components/modals/extension-details.js b/addon/components/modals/extension-details.js
deleted file mode 100644
index dd58194..0000000
--- a/addon/components/modals/extension-details.js
+++ /dev/null
@@ -1,33 +0,0 @@
-import Component from '@glimmer/component';
-import { tracked } from '@glimmer/tracking';
-import { action } from '@ember/object';
-import { later } from '@ember/runloop';
-
-export default class ModalsExtensionDetailsComponent extends Component {
-    @tracked extension;
-    @tracked screenshotInLightbox;
-
-    constructor(owner, { options }) {
-        super(...arguments);
-        this.extension = options.extension;
-    }
-
-    @action lightboxScreenshot(screenshot) {
-        this.screenshotInLightbox = screenshot;
-    }
-
-    @action setupScreenshotLightbox() {
-        const listener = () => {
-            this.screenshotInLightbox = undefined;
-            window.removeEventListener('click', listener);
-        };
-
-        later(
-            this,
-            () => {
-                window.addEventListener('click', listener);
-            },
-            600
-        );
-    }
-}
diff --git a/addon/components/modals/extension-installer.hbs b/addon/components/modals/extension-installer.hbs
new file mode 100644
index 0000000..e44f215
--- /dev/null
+++ b/addon/components/modals/extension-installer.hbs
@@ -0,0 +1,113 @@
+<Modal::Default @modalIsOpened={{@modalIsOpened}} @options={{@options}} @confirm={{@onConfirm}} @decline={{@onDecline}}>
+    <div class="modal-body-container extension-installer" data-test-extension-installer data-phase={{this.phase}} data-action={{this.jobAction}}>
+        {{#if (eq this.phase "confirm")}}
+            {{#if this.isUninstall}}
+                <InfoBlock @type="danger" @icon="triangle-exclamation" class="mb-4">
+                    <strong>{{t "registry-bridge.uninstall.confirm.destructive"}}</strong>
+                    {{t "registry-bridge.uninstall.confirm.body" company=(or @options.companyName (t "registry-bridge.common.this-organization"))}}
+                </InfoBlock>
+            {{else}}
+                <p class="text-sm dark:text-gray-200 mb-4" data-test-installer-intro>
+                    {{t (concat "registry-bridge." this.jobAction ".confirm.body") company=(or @options.companyName (t "registry-bridge.common.this-organization")) installedVersion=(or @options.installedVersion "")}}
+                </p>
+            {{/if}}
+        {{else if (eq this.phase "progress")}}
+            <p class="text-sm font-semibold dark:text-white mb-3" role="status" aria-live="polite" data-test-installer-progress-title>
+                {{t (concat "registry-bridge." this.stepsKey ".progress.title") name=@options.extension.name}}
+            </p>
+        {{else if (eq this.phase "success")}}
+            <div class="flex flex-row items-center gap-2 mb-3" role="status" aria-live="polite" data-test-installer-success>
+                <Badge @status="success" @icon="check" @disableHumanize={{true}}>{{t "registry-bridge.install.success.badge"}}</Badge>
+                <span class="text-sm font-semibold dark:text-white">
+                    {{t (concat "registry-bridge." this.stepsKey ".success.title") name=@options.extension.name version=(if @options.version (concat "v" @options.version) "")}}
+                </span>
+            </div>
+        {{else if (eq this.phase "failure")}}
+            <div class="flex flex-row items-center gap-2 mb-3" role="alert" data-test-installer-failure>
+                <Badge @status="error" @icon="circle-exclamation" @disableHumanize={{true}}>{{t "registry-bridge.install.failed.badge"}}</Badge>
+                <span class="text-sm font-semibold dark:text-white">{{t (concat "registry-bridge." this.stepsKey ".failed.title") name=@options.extension.name}}</span>
+            </div>
+        {{/if}}
+
+        <ol class="extension-installer-steps" aria-label={{t "registry-bridge.install.steps.label"}} data-test-installer-steps>
+            {{#each this.steps as |step|}}
+                <li class="extension-installer-step is-{{step.status}}" data-test-installer-step={{step.key}} data-status={{step.status}}>
+                    <span class="extension-installer-step-marker" aria-hidden="true">
+                        {{#if step.icon}}
+                            <FaIcon @icon={{step.icon}} @spin={{eq step.status "active"}} @size="xs" />
+                        {{else}}
+                            {{step.number}}
+                        {{/if}}
+                    </span>
+                    <span class="flex-1 min-w-0">
+                        <span class="block text-sm dark:text-gray-100">{{step.label}}</span>
+                        {{#if step.detail}}
+                            <span class="block font-mono text-xs text-gray-500 dark:text-gray-400 truncate">{{step.detail}}</span>
+                        {{/if}}
+                        {{#if (and (eq step.status "active") @options.stepDescription)}}
+                            <span class="block text-xs text-gray-500 dark:text-gray-400" data-test-installer-step-description>{{@options.stepDescription}}</span>
+                        {{/if}}
+                    </span>
+                </li>
+            {{/each}}
+        </ol>
+
+        {{#if (eq this.phase "confirm")}}
+            <p class="mt-3 text-xs text-gray-500 dark:text-gray-400" data-test-installer-time>{{this.timeNote}}</p>
+            {{#if this.isUninstall}}
+                <div class="mt-4">
+                    <InputGroup
+                        @name={{t "registry-bridge.uninstall.confirm.type-to-confirm" name=@options.extension.name}}
+                        @value={{@options.confirmName}}
+                        @placeholder={{@options.extension.name}}
+                        autocomplete="off"
+                        {{on "input" this.updateConfirmName}}
+                        data-test-installer-confirm-name
+                    />
+                </div>
+            {{/if}}
+        {{else if (eq this.phase "progress")}}
+            {{#if @options.progress}}
+                <div class="mt-3"><ProgressBar @title={{@options.stepDescription}} @percent={{@options.progress}} /></div>
+            {{/if}}
+            <p class="mt-3 text-xs text-gray-500 dark:text-gray-400">{{t "registry-bridge.install.progress.keep-open"}}</p>
+        {{else if (eq this.phase "success")}}
+            <p class="mt-3 text-sm dark:text-gray-200" data-test-installer-countdown>
+                {{#if @options.reloadCancelled}}
+                    {{t "registry-bridge.install.success.reload-cancelled"}}
+                {{else}}
+                    {{t "registry-bridge.install.success.reload-in" seconds=(or @options.secondsLeft 0)}}
+                {{/if}}
+            </p>
+        {{else if (eq this.phase "failure")}}
+            <div class="mt-3 space-y-2 rounded-lg border border-red-300 bg-red-50 px-4 py-3 text-sm text-red-800 dark:border-red-800 dark:bg-red-900 dark:bg-opacity-30 dark:text-red-200" data-test-installer-job-error>
+                {{#if @options.installerError.step}}
+                    <div class="font-semibold" data-test-installer-job-error-step>{{t "registry-bridge.installer.failed-at" step=@options.installerError.step}}</div>
+                {{/if}}
+                <div class="break-words" data-test-installer-job-error-message>{{@options.installerError.message}}</div>
+                {{#if @options.installerError.rolledBack}}
+                    <div data-test-installer-job-error-rolled-back>{{t "registry-bridge.installer.rolled-back"}}</div>
+                {{/if}}
+                {{#if @options.installerError.rebuildRequired}}
+                    <div>{{t "registry-bridge.installer.rebuild-required"}}</div>
+                {{/if}}
+                {{#if @options.installerError.log.length}}
+                    <details data-test-installer-job-error-log>
+                        <summary class="cursor-pointer select-none">{{t "registry-bridge.installer.show-log"}}</summary>
+                        <div class="mt-2 max-h-60 overflow-auto rounded bg-white px-2 py-1 font-mono text-xs text-gray-800 dark:bg-gray-900 dark:text-gray-200">
+                            {{#each @options.installerError.log as |line|}}
+                                <div class="whitespace-pre-wrap">{{line}}</div>
+                            {{/each}}
+                        </div>
+                    </details>
+                {{/if}}
+            </div>
+            {{#if this.cliCommand}}
+                <div class="mt-3 text-xs text-gray-500 dark:text-gray-400">
+                    {{t "registry-bridge.install.failed.cli"}}
+                    <ClickToCopy @value={{this.cliCommand}} class="mt-1"><code>{{this.cliCommand}}</code></ClickToCopy>
+                </div>
+            {{/if}}
+        {{/if}}
+    </div>
+</Modal::Default>
diff --git a/addon/components/modals/extension-installer.js b/addon/components/modals/extension-installer.js
new file mode 100644
index 0000000..1a5cded
--- /dev/null
+++ b/addon/components/modals/extension-installer.js
@@ -0,0 +1,87 @@
+import Component from '@glimmer/component';
+import { inject as service } from '@ember/service';
+import { action, get } from '@ember/object';
+
+const STEP_ICONS = { done: 'check', active: 'spinner', failed: 'xmark', pending: null };
+
+/**
+ * Install, update and uninstall in one modal (canvas C5): confirm, progress
+ * with the three named steps, success with the reload countdown, failure with
+ * the failed stage, the server message and Retry. Driven by the
+ * `extension-installer` service through the modal options.
+ */
+export default class ModalsExtensionInstallerComponent extends Component {
+    @service modalsManager;
+    @service intl;
+
+    get options() {
+        return this.args.options ?? {};
+    }
+
+    get jobAction() {
+        return get(this.options, 'jobAction') ?? 'install';
+    }
+
+    get phase() {
+        return get(this.options, 'phase') ?? 'confirm';
+    }
+
+    get isUninstall() {
+        return this.jobAction === 'uninstall';
+    }
+
+    get stepsKey() {
+        return this.isUninstall ? 'uninstall' : 'install';
+    }
+
+    get steps() {
+        return (get(this.options, 'steps') ?? []).map((step, index) => ({
+            ...step,
+            number: index + 1,
+            icon: STEP_ICONS[step.status],
+            label: this.intl.t(`registry-bridge.${this.stepsKey}.steps.${step.key}`),
+            detail: this.stepDetail(step.key),
+        }));
+    }
+
+    stepDetail(key) {
+        const packages = get(this.options, 'extension.meta.package_names') ?? {};
+        if (key === 'server') {
+            return packages.composer ?? null;
+        }
+        if (key === 'engine') {
+            return packages.npm ?? null;
+        }
+        return null;
+    }
+
+    /**
+     * The confirm step's time estimate: about two minutes (one to uninstall) when no console rebuild is
+     * needed, a rebuild's much longer range when it is (`meta.install_mode` / `meta.uninstall_mode`).
+     */
+    get timeNote() {
+        const mode = get(this.options, `extension.meta.${this.isUninstall ? 'uninstall_mode' : 'install_mode'}`);
+        const key = mode === 'build' ? 'time-rebuild' : 'time';
+
+        return this.intl.t(`registry-bridge.${this.stepsKey}.confirm.${key}`, { minutes: this.isUninstall ? 1 : 2 });
+    }
+
+    get cliCommand() {
+        const extension = get(this.options, 'extension') ?? {};
+        const target = extension.slug ?? extension.public_id;
+        if (!target) {
+            return null;
+        }
+        return this.isUninstall ? `flb uninstall ${target}` : `flb install ${target}`;
+    }
+
+    get nameMatches() {
+        return (get(this.options, 'confirmName') ?? '').trim() === get(this.options, 'extension.name');
+    }
+
+    @action updateConfirmName(event) {
+        const value = event?.target?.value ?? '';
+        const matches = value.trim() === get(this.options, 'extension.name');
+        this.modalsManager.setOptions({ confirmName: value, acceptButtonDisabled: !matches });
+    }
+}
diff --git a/addon/components/modals/extension-purchase-form.hbs b/addon/components/modals/extension-purchase-form.hbs
deleted file mode 100644
index 292e80a..0000000
--- a/addon/components/modals/extension-purchase-form.hbs
+++ /dev/null
@@ -1,5 +0,0 @@
-<Modal::Default @modalIsOpened={{@modalIsOpened}} @options={{@options}} @confirm={{@onConfirm}} @decline={{@onDecline}}>
-    <div class="p-1">
-        <div id="checkout" {{did-insert @options.checkoutElementInserted}}></div>
-    </div>
-</Modal::Default>
\ No newline at end of file
diff --git a/addon/components/modals/extension-purchase-form.js b/addon/components/modals/extension-purchase-form.js
deleted file mode 100644
index 170f18d..0000000
--- a/addon/components/modals/extension-purchase-form.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Component from '@glimmer/component';
-
-export default class ModalsExtensionPurchaseFormComponent extends Component {}
diff --git a/addon/components/modals/extension-purchase-status.hbs b/addon/components/modals/extension-purchase-status.hbs
new file mode 100644
index 0000000..f28b7e5
--- /dev/null
+++ b/addon/components/modals/extension-purchase-status.hbs
@@ -0,0 +1,43 @@
+<Modal::Default @modalIsOpened={{@modalIsOpened}} @options={{@options}} @confirm={{@onConfirm}} @decline={{@onDecline}}>
+    <div class="modal-body-container" data-test-purchase-status data-phase={{this.phase}}>
+        {{#if (eq this.phase "finalizing")}}
+            <div class="flex flex-row items-start gap-3" role="status" aria-live="polite">
+                <Spinner />
+                <div>
+                    <div class="font-semibold dark:text-white">{{t "registry-bridge.purchase.finalizing.title"}}</div>
+                    <p class="text-sm dark:text-gray-200">{{t "registry-bridge.purchase.finalizing.body" organization=(or @options.organizationName (t "registry-bridge.purchase.your-organization"))}}</p>
+                </div>
+            </div>
+        {{else if (eq this.phase "success")}}
+            <div class="space-y-2" role="status" aria-live="polite" data-test-purchase-success>
+                <Badge @status="success" @icon="check" @disableHumanize={{true}}>{{t "registry-bridge.purchase.success.badge"}}</Badge>
+                <div class="font-semibold dark:text-white">{{t "registry-bridge.purchase.success.title" name=@options.extension.name}}</div>
+                <p class="text-sm dark:text-gray-200">{{t "registry-bridge.purchase.success.body" organization=(or @options.organizationName (t "registry-bridge.purchase.your-organization"))}}</p>
+                {{#if @options.amount}}
+                    <p class="text-sm dark:text-gray-200" data-test-purchase-amount>{{t "registry-bridge.purchase.success.paid" amount=(format-currency @options.amount @options.currency)}}</p>
+                {{/if}}
+                {{#if @options.receiptUrl}}
+                    <a href={{@options.receiptUrl}} target="_blank" rel="noopener noreferrer" class="text-sm">{{t "registry-bridge.purchase.success.receipt"}}</a>
+                {{/if}}
+            </div>
+        {{else if (eq this.phase "failed")}}
+            <div class="space-y-2" role="alert" data-test-purchase-failed>
+                <Badge @status="error" @icon="circle-exclamation" @disableHumanize={{true}}>{{t "registry-bridge.purchase.failed.badge"}}</Badge>
+                <div class="font-semibold dark:text-white">{{t "registry-bridge.purchase.failed.title"}}</div>
+                <p class="text-sm dark:text-gray-200">{{t "registry-bridge.purchase.failed.body" status=(or @options.serviceStatus (t "registry-bridge.purchase.failed.unknown-status"))}}</p>
+                {{#if @options.message}}<p class="text-xs text-gray-500 dark:text-gray-400">{{@options.message}}</p>{{/if}}
+            </div>
+        {{else if (eq this.phase "cancelled")}}
+            <div class="space-y-2" role="status" data-test-purchase-cancelled>
+                <Badge @status="default" @icon="circle-xmark" @disableHumanize={{true}}>{{t "registry-bridge.purchase.cancelled.badge"}}</Badge>
+                <div class="font-semibold dark:text-white">{{t "registry-bridge.purchase.cancelled.title"}}</div>
+                <p class="text-sm dark:text-gray-200">{{t "registry-bridge.purchase.cancelled.body"}}</p>
+            </div>
+        {{else}}
+            <div class="space-y-2" role="status" data-test-purchase-processing>
+                <div class="font-semibold dark:text-white">{{t "registry-bridge.purchase.processing.title"}}</div>
+                <p class="text-sm dark:text-gray-200">{{t "registry-bridge.purchase.processing.body"}}</p>
+            </div>
+        {{/if}}
+    </div>
+</Modal::Default>
diff --git a/addon/components/modals/extension-purchase-status.js b/addon/components/modals/extension-purchase-status.js
new file mode 100644
index 0000000..f8cceec
--- /dev/null
+++ b/addon/components/modals/extension-purchase-status.js
@@ -0,0 +1,13 @@
+import Component from '@glimmer/component';
+import { get } from '@ember/object';
+
+/**
+ * After a checkout redirect (canvas C6): Finalizing while the hand-off is
+ * polled, then Paid (Install now), Not completed or Cancelled (Try again), or
+ * Still processing when the webhook has not landed in time.
+ */
+export default class ModalsExtensionPurchaseStatusComponent extends Component {
+    get phase() {
+        return get(this.args.options ?? {}, 'phase') ?? 'finalizing';
+    }
+}
diff --git a/addon/components/modals/extension-uninstall.hbs b/addon/components/modals/extension-uninstall.hbs
deleted file mode 100644
index e6f8c96..0000000
--- a/addon/components/modals/extension-uninstall.hbs
+++ /dev/null
@@ -1,28 +0,0 @@
-<Modal::Default @modalIsOpened={{@modalIsOpened}} @options={{@options}} @confirm={{@onConfirm}} @decline={{@onDecline}}>
-    <div class="modal-body-container">
-        <div class="flex flex-row py-4">
-            <div class="w-60 flex justify-center">
-                <FaIcon @icon="triangle-exclamation" @size="3x" class="text-red-500" />
-            </div>
-            <div class="flex flex-col">
-                <h2 class="dark:text-white font-bold mb-2">Proceed with Uninstall?</h2>
-                <p class="dark:text-gray-200 text-sm">
-                    Do you really want to uninstall the
-                    {{this.extension.name}}? By proceeding, you will permanently delete all settings and data related to this extension. You can reinstall the extension anytime in the
-                    future, but configuration and data will not be recovered.
-                </p>
-                <div class="mt-6 px-4 py-3 border border-gray-200 dark:border-gray-900 bg-gray-50 dark:bg-gray-700 rounded-lg">
-                    <ExtensionModalTitle @options={{@options}} @detailsContainerClass="mb-0" />
-                </div>
-            </div>
-        </div>
-        {{#if @options.progress}}
-            <div class="my-4">
-                <ProgressBar @title={{@options.stepDescription}} @percent={{@options.progress}} />
-            </div>
-        {{/if}}
-        {{#if @options.installerError}}
-            <InstallerJobError @error={{@options.installerError}} />
-        {{/if}}
-    </div>
-</Modal::Default>
\ No newline at end of file
diff --git a/addon/components/modals/extension-uninstall.js b/addon/components/modals/extension-uninstall.js
deleted file mode 100644
index c62e142..0000000
--- a/addon/components/modals/extension-uninstall.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import Component from '@glimmer/component';
-import { tracked } from '@glimmer/tracking';
-
-export default class ModalsExtensionUninstallComponent extends Component {
-    @tracked extension;
-
-    constructor(owner, { options }) {
-        super(...arguments);
-        this.extension = options.extension;
-    }
-}
diff --git a/addon/components/modals/select-extension-bundle.hbs b/addon/components/modals/select-extension-bundle.hbs
deleted file mode 100644
index 53da0ce..0000000
--- a/addon/components/modals/select-extension-bundle.hbs
+++ /dev/null
@@ -1,43 +0,0 @@
-<Modal::Default @modalIsOpened={{@modalIsOpened}} @options={{@options}} @confirm={{@onConfirm}} @decline={{@onDecline}}>
-    {{#if this.bundles}}
-        <div class="next-table-wrapper auto-height">
-            <table>
-                <thead>
-                    <tr>
-                        <th {{set-width "175px"}}>ID</th>
-                        <th {{set-width "70px"}}>Bundle</th>
-                        <th {{set-width "80px"}}>Version</th>
-                        <th {{set-width "110px"}}>Uploaded</th>
-                        <th {{set-width "100px"}}>Status</th>
-                        <th></th>
-                    </tr>
-                </thead>
-                <tbody>
-                    {{#each this.bundles as |bundle|}}
-                        <tr>
-                            <td>{{bundle.bundle_id}}</td>
-                            <td>{{bundle.bundle_number}}</td>
-                            <td>{{bundle.version}}</td>
-                            <td>{{bundle.createdAgo}}</td>
-                            <td>
-                                <Badge @status={{bundle.status}} />
-                            </td>
-                            <td>
-                                {{#if (eq this.extension.next_bundle_uuid bundle.id)}}
-                                    <div class="flex flex-row items-center text-xs">
-                                        <FaIcon @icon="check" class="text-green-500" @size="md" />
-                                        <span class="ml-2 text-green-400">Selected</span>
-                                    </div>
-                                {{else}}
-                                    <Button @text="Select" @size="xs" @type="primary" @onClick={{fn this.selectBundle bundle}} />
-                                {{/if}}
-                            </td>
-                        </tr>
-                    {{/each}}
-                </tbody>
-            </table>
-        </div>
-    {{else}}
-        <div>No bundles uploaded.</div>
-    {{/if}}
-</Modal::Default>
\ No newline at end of file
diff --git a/addon/components/modals/select-extension-bundle.js b/addon/components/modals/select-extension-bundle.js
deleted file mode 100644
index f838279..0000000
--- a/addon/components/modals/select-extension-bundle.js
+++ /dev/null
@@ -1,31 +0,0 @@
-import Component from '@glimmer/component';
-import { tracked } from '@glimmer/tracking';
-import { inject as service } from '@ember/service';
-import { action } from '@ember/object';
-import { task } from 'ember-concurrency';
-
-export default class ModalsSelectExtensionBundleComponent extends Component {
-    @service store;
-    @tracked extension;
-    @tracked options = {};
-    @tracked bundles = [];
-
-    constructor(owner, { options }) {
-        super(...arguments);
-        const { extension } = options;
-
-        this.options = options;
-        this.extension = extension;
-        this.loadExtensionBundles.perform(extension);
-    }
-
-    @task *loadExtensionBundles(extension) {
-        this.bundles = yield this.store.query('registry-extension-bundle', { extension_uuid: extension.id, status: 'pending' });
-    }
-
-    @action selectBundle(bundle) {
-        if (typeof this.options.onBundleSelected === 'function') {
-            this.options.onBundleSelected(bundle);
-        }
-    }
-}
diff --git a/addon/components/modals/self-managed-install-instructions.hbs b/addon/components/modals/self-managed-install-instructions.hbs
deleted file mode 100644
index d606d7c..0000000
--- a/addon/components/modals/self-managed-install-instructions.hbs
+++ /dev/null
@@ -1,40 +0,0 @@
-<Modal::Default @modalIsOpened={{@modalIsOpened}} @options={{@options}} @confirm={{@onConfirm}} @decline={{@onDecline}}>
-    <div class="modal-body-container">
-        <p class="text-sm mb-4 text-gray-900 dark:text-gray-200">
-            Begin the installation from the base directory of your Fleetbase instance. For comprehensive instructions, visit the
-            <a href="https://github.com/fleetbase/fleetbase-cli" target="fleetbase-cli" class="text-blue-400 hover:opacity-50">
-                <FaIcon @icon="arrow-up-right-from-square" class="text-xs" />
-                Fleetbase CLI GitHub page</a>.
-        </p>
-        <ol class="self-managed-install-instructions">
-            <li>
-                <div class="flex">
-                    First,
-                    <LinkTo @route="console.extensions.developers.credentials" class="ml-1 text-blue-400 hover:opacity-50">generate a Fleetbase registry credentials token.</LinkTo>
-                </div>
-            </li>
-            <li>
-                <div class="flex flex-col">
-                    <div class="mb-2">Install the Fleetbase CLI globally using npm:</div>
-                    <ClickToCopy @value={{concat "npm i -g @fleetbase/cli"}}><code>npm i -g @fleetbase/cli</code></ClickToCopy>
-                </div>
-            </li>
-            <li>
-                <div class="flex flex-col">
-                    <div class="mb-2">Set your authentication token with the CLI:</div>
-                    <ClickToCopy @value={{concat "flb set-auth {YOUR_TOKEN}"}}><code>flb set-auth {YOUR_TOKEN}</code></ClickToCopy>
-                </div>
-            </li>
-            <li>
-                <div class="flex flex-col">
-                    <div class="mb-2">Finally, install the extension using one of the following commands:</div>
-                    <div>
-                        <ClickToCopy @value={{concat "flb install fleetbase/" @options.extension.slug}}><code>flb install fleetbase/{{@options.extension.slug}}</code></ClickToCopy>
-                        <div class="my-1 pl-2">or</div>
-                        <ClickToCopy @value={{concat "flb install " @options.extension.public_id}}><code>flb install {{@options.extension.public_id}}</code></ClickToCopy>
-                    </div>
-                </div>
-            </li>
-        </ol>
-    </div>
-</Modal::Default>
\ No newline at end of file
diff --git a/addon/components/registry-admin-config.hbs b/addon/components/registry-admin-config.hbs
index a529418..bd00676 100644
--- a/addon/components/registry-admin-config.hbs
+++ b/addon/components/registry-admin-config.hbs
@@ -1,40 +1,74 @@
-<ContentPanel @title="Registry Service" @open={{true}} @wrapperClass="bordered-classic">
-    <div class="mb-3 text-sm text-gray-700 dark:text-gray-300" data-test-registry-mode>
-        {{#if this.usesService}}
-            <FaIcon @icon="circle-check" class="text-green-600 dark:text-green-400" />
-            <span>Explore, installs and updates use the Registry Service.</span>
-        {{else}}
-            <FaIcon @icon="circle-info" class="text-blue-600 dark:text-blue-400" />
-            <span>No Registry Service is configured, so Explore reads the cloud catalog read-only and installs from it are unavailable.</span>
-        {{/if}}
-    </div>
+<ContentPanel @title={{t "registry-bridge.admin.config.service.title"}} @open={{true}} @wrapperClass="bordered-classic">
     <InputGroup
-        @name="Service URL"
+        @name={{t "registry-bridge.admin.config.service.url"}}
         @value={{this.serviceUrl}}
         @placeholder="https://registry.fleetbase.io"
-        @helpText="Base URL of the Fleetbase Registry Service. Leave empty to fall back to the cloud catalog."
+        @helpText={{t "registry-bridge.admin.config.service.url-help"}}
         disabled={{this.isBusy}}
+        data-test-service-url
     />
-    <InputGroup @name="Instance registration" @helpText="Instances are registered with a one-time code (valid for 15 minutes) from an owner or admin of your registry organization." as |id|>
+    <InputGroup @name={{t "registry-bridge.admin.config.registration.title"}} @helpText={{t "registry-bridge.admin.config.registration.help"}} as |id|>
         {{#if this.isRegistered}}
             <div class="rounded-md border border-gray-200 dark:border-gray-700 p-3 text-sm" data-test-registration-status>
                 <div class="flex items-center space-x-2 font-semibold text-green-700 dark:text-green-300">
                     <FaIcon @icon="circle-check" />
-                    <span>Registered</span>
+                    <span>{{t "registry-bridge.admin.config.registration.registered"}}</span>
                 </div>
                 <dl class="mt-2 grid grid-cols-2 gap-x-4 gap-y-1 text-gray-700 dark:text-gray-300">
-                    <dt class="font-medium">Instance</dt>
+                    <dt class="font-medium">{{t "registry-bridge.admin.config.registration.instance"}}</dt>
                     <dd class="truncate">{{n-a this.instance.name}} <span class="text-gray-500">{{this.instance.id}}</span></dd>
-                    <dt class="font-medium">Organization</dt>
+                    <dt class="font-medium">{{t "registry-bridge.admin.config.registration.organization"}}</dt>
                     <dd class="truncate">{{n-a this.instance.organization.name}}</dd>
-                    <dt class="font-medium">Instance token</dt>
+                    <dt class="font-medium">{{t "registry-bridge.admin.config.registration.token"}}</dt>
                     <dd class="font-mono" data-test-token-hint>{{n-a this.instance.token_hint}}</dd>
-                    <dt class="font-medium">Registered</dt>
+                    <dt class="font-medium">{{t "registry-bridge.admin.config.registration.registered-at"}}</dt>
                     <dd>{{n-a this.instance.registered_at}}</dd>
                 </dl>
-                <div class="mt-3">
-                    <Button @type="danger" @size="sm" @icon="link-slash" @text="Unregister" @onClick={{this.confirmUnregister}} @disabled={{this.isBusy}} />
-                </div>
+                {{#if this.isReregistering}}
+                    <div class="mt-3 space-y-1" data-test-reregister>
+                        <div class="text-xs text-gray-500 dark:text-gray-400">{{t "registry-bridge.admin.config.registration.register-again-help"}}</div>
+                        <div class="flex items-center space-x-2">
+                            <Input
+                                id={{id}}
+                                @type="text"
+                                @value={{this.registrationCode}}
+                                class="w-full form-input font-mono uppercase"
+                                placeholder="XXXX-XXXX-XXXX-XXXX"
+                                autocomplete="off"
+                                spellcheck="false"
+                                disabled={{this.isBusy}}
+                            />
+                            <Button
+                                @type="primary"
+                                @size="sm"
+                                @icon="rotate"
+                                @text={{t "registry-bridge.admin.config.registration.register-again"}}
+                                @onClick={{perform this.registerInstance}}
+                                @disabled={{not this.canRegister}}
+                                @isLoading={{this.registerInstance.isRunning}}
+                            />
+                            <Button @size="sm" @text={{t "registry-bridge.admin.config.registration.cancel"}} @onClick={{this.cancelReregister}} @disabled={{this.isBusy}} />
+                        </div>
+                    </div>
+                {{else}}
+                    <div class="mt-3 flex items-center space-x-2">
+                        <Button
+                            @size="sm"
+                            @icon="rotate"
+                            @text={{t "registry-bridge.admin.config.registration.register-again"}}
+                            @onClick={{this.startReregister}}
+                            @disabled={{this.isBusy}}
+                        />
+                        <Button
+                            @type="danger"
+                            @size="sm"
+                            @icon="link-slash"
+                            @text={{t "registry-bridge.admin.config.unregister.accept"}}
+                            @onClick={{this.confirmUnregister}}
+                            @disabled={{this.isBusy}}
+                        />
+                    </div>
+                {{/if}}
             </div>
         {{else}}
             <div class="flex items-center space-x-2">
@@ -52,74 +86,44 @@
                     @type="primary"
                     @size="sm"
                     @icon="link"
-                    @text="Register this instance"
+                    @text={{t "registry-bridge.admin.config.registration.register"}}
                     @onClick={{perform this.registerInstance}}
                     @disabled={{not this.canRegister}}
                     @isLoading={{this.registerInstance.isRunning}}
                 />
             </div>
             {{#unless this.serviceUrl}}
-                <div class="mt-1 text-xs text-gray-500">Enter the service URL first.</div>
+                <div class="mt-1 text-xs text-gray-500">{{t "registry-bridge.admin.config.registration.url-first"}}</div>
             {{/unless}}
         {{/if}}
     </InputGroup>
 </ContentPanel>
-<ContentPanel @title="Cloud Registry (v1 fallback)" @open={{true}} @wrapperClass="bordered-classic">
-    <InputGroup
-        @name="Registry Host"
-        @value={{this.registryHost}}
-        @helpText="Base URL of the cloud registry this instance reads its catalog from when no Registry Service is configured."
-        disabled={{this.isBusy}}
-    />
-    <InputGroup @name="Registry Token" @helpText="Bearer token used to authenticate with the cloud registry. Reveal the saved token or replace it with a new one." as |id|>
-        {{#if this.isEditingToken}}
-            <div class="flex items-center space-x-2">
-                <Input
-                    id={{id}}
-                    @type="text"
-                    @value={{this.registryToken}}
-                    class="w-full form-input"
-                    placeholder="Paste a registry token"
-                    autocomplete="off"
-                    spellcheck="false"
-                    disabled={{this.isBusy}}
-                />
-                <Button @text="Cancel" @size="sm" @onClick={{this.cancelEditToken}} @disabled={{this.isBusy}} />
-            </div>
-        {{else}}
-            <div class="flex items-center space-x-2">
-                <div class="flex-1 min-w-0">
-                    <ClickToReveal @value={{this.registryToken}} @clickToCopy={{true}} @buttonText="Reveal token" />
-                </div>
-                <Button @text="Change" @icon="pen" @size="sm" @onClick={{this.editToken}} @disabled={{this.isBusy}} />
-            </div>
-        {{/if}}
-    </InputGroup>
-</ContentPanel>
 {{#if this.testResult}}
-    <div class="rounded-md border p-3 text-sm {{if this.testResult.ok 'border-green-300 bg-green-50 dark:bg-green-900/20 dark:border-green-800' 'border-red-300 bg-red-50 dark:bg-red-900/20 dark:border-red-800'}}">
+    <div
+        class="rounded-md border p-3 text-sm
+            {{if this.testResult.ok 'border-green-300 bg-green-50 dark:bg-green-900/20 dark:border-green-800' 'border-red-300 bg-red-50 dark:bg-red-900/20 dark:border-red-800'}}"
+        data-test-connection-result
+    >
         <div class="flex items-center space-x-2 font-semibold {{if this.testResult.ok 'text-green-700 dark:text-green-300' 'text-red-700 dark:text-red-300'}}">
             <FaIcon @icon={{if this.testResult.ok "circle-check" "circle-xmark"}} />
-            <span>{{if this.testResult.ok "Connected to the registry" "Unable to connect to the registry"}}</span>
+            <span>{{if this.testResult.ok (t "registry-bridge.admin.config.result.connected") (t "registry-bridge.admin.config.result.failed")}}</span>
         </div>
         <dl class="mt-2 grid grid-cols-2 gap-x-4 gap-y-1 text-gray-700 dark:text-gray-300">
-            <dt class="font-medium">Host</dt>
+            <dt class="font-medium">{{t "registry-bridge.admin.config.result.host"}}</dt>
             <dd class="truncate">{{n-a this.testResult.host}}</dd>
-            <dt class="font-medium">API</dt>
-            <dd>{{if (eq this.testResult.api_version "v2") "Registry Service (v2)" "Cloud registry (v1)"}}</dd>
-            <dt class="font-medium">HTTP status</dt>
+            <dt class="font-medium">{{t "registry-bridge.admin.config.result.status"}}</dt>
             <dd>{{n-a this.testResult.status}}</dd>
-            <dt class="font-medium">Latency</dt>
+            <dt class="font-medium">{{t "registry-bridge.admin.config.result.latency"}}</dt>
             <dd>{{this.testResult.latency_ms}} ms</dd>
-            <dt class="font-medium">Published extensions</dt>
+            <dt class="font-medium">{{t "registry-bridge.admin.config.result.extensions"}}</dt>
             <dd>{{n-a this.testResult.extension_count}}</dd>
             {{#if this.testResult.instance}}
-                <dt class="font-medium">Instance token</dt>
+                <dt class="font-medium">{{t "registry-bridge.admin.config.registration.token"}}</dt>
                 <dd data-test-instance-check>
                     {{#if this.testResult.instance.ok}}
-                        Accepted ({{n-a this.testResult.instance.name}}, {{n-a this.testResult.instance.organization}})
+                        {{t "registry-bridge.admin.config.result.token-accepted" name=(n-a this.testResult.instance.name) organization=(n-a this.testResult.instance.organization)}}
                     {{else}}
-                        Rejected{{#if this.testResult.instance.error}}: {{this.testResult.instance.error}}{{/if}}
+                        {{t "registry-bridge.admin.config.result.token-rejected"}}{{#if this.testResult.instance.error}}: {{this.testResult.instance.error}}{{/if}}
                     {{/if}}
                 </dd>
             {{/if}}
@@ -135,7 +139,7 @@
             @type="default"
             @size="sm"
             @icon="plug"
-            @text="Test Connection"
+            @text={{t "registry-bridge.admin.config.test"}}
             @onClick={{perform this.testConnection}}
             @disabled={{this.isBusy}}
             @isLoading={{this.testConnection.isRunning}}
@@ -144,11 +148,11 @@
             @type="primary"
             @size="sm"
             @icon="save"
-            @text="Save Changes"
+            @text={{t "registry-bridge.admin.config.save"}}
             @onClick={{perform this.saveConfigValues}}
             @disabled={{this.isBusy}}
             @isLoading={{this.saveConfigValues.isRunning}}
         />
     </div>
 </EmberWormhole>
-<Spacer @height="400px" />
\ No newline at end of file
+<Spacer @height="400px" />
diff --git a/addon/components/registry-admin-config.js b/addon/components/registry-admin-config.js
index c624754..1008673 100644
--- a/addon/components/registry-admin-config.js
+++ b/addon/components/registry-admin-config.js
@@ -4,21 +4,23 @@ import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
 import { task } from 'ember-concurrency';
 
+/**
+ * Admin → Extensions Registry → Registry Config: the Registry Service URL, this instance's registration
+ * (masked token) and a connection test.
+ */
 export default class RegistryAdminConfigComponent extends Component {
     @service fetch;
     @service notifications;
     @service modalsManager;
-    @tracked registryHost;
-    @tracked registryToken;
-    @tracked savedToken;
-    @tracked isEditingToken = false;
+    @service intl;
     @tracked testResult;
     @tracked serviceUrl;
     @tracked savedServiceUrl;
-    @tracked apiVersion;
     @tracked instanceKind;
     @tracked instance;
     @tracked registrationCode = '';
+    /** Registering an instance that is already registered: the service rotates its token on the same instance. */
+    @tracked isReregistering = false;
 
     constructor() {
         super(...arguments);
@@ -29,41 +31,26 @@ export default class RegistryAdminConfigComponent extends Component {
         return this.getConfigValues.isRunning || this.saveConfigValues.isRunning || this.testConnection.isRunning || this.registerInstance.isRunning || this.unregisterInstance.isRunning;
     }
 
-    get usesService() {
-        return this.apiVersion === 'v2';
-    }
-
     get isRegistered() {
         return this.instance?.registered === true;
     }
 
-    /** A service URL typed but not saved yet; registration and the test run against it. */
-    get serviceUrlChanged() {
-        return (this.serviceUrl || '') !== (this.savedServiceUrl || '');
-    }
-
     get canRegister() {
         return !this.isBusy && Boolean(this.serviceUrl) && Boolean(this.registrationCode && this.registrationCode.trim());
     }
 
-    @action editToken() {
-        this.savedToken = this.registryToken;
-        this.registryToken = '';
-        this.isEditingToken = true;
+    /** Where this console is served; the service only returns buyers from checkout to this host. */
+    get consoleOrigin() {
+        return window.location.origin;
     }
 
-    @action cancelEditToken() {
-        this.registryToken = this.savedToken;
-        this.isEditingToken = false;
+    t(key, params) {
+        return this.intl.t(`registry-bridge.admin.config.${key}`, params);
     }
 
     applyConfig(config = {}) {
-        this.registryHost = config.host;
-        this.registryToken = config.token;
-        this.savedToken = config.token;
         this.serviceUrl = config.service_url;
         this.savedServiceUrl = config.service_url;
-        this.apiVersion = config.api_version;
         this.instanceKind = config.instance_kind;
         this.instance = config.instance ?? { registered: false };
     }
@@ -79,15 +66,10 @@ export default class RegistryAdminConfigComponent extends Component {
 
     @task *saveConfigValues() {
         try {
-            const config = yield this.fetch.post(
-                'registry-extensions/config',
-                { host: this.registryHost, token: this.registryToken, service_url: this.serviceUrl ?? '' },
-                { namespace: '~registry/v1' }
-            );
+            const config = yield this.fetch.post('registry-extensions/config', { service_url: this.serviceUrl ?? '' }, { namespace: '~registry/v1' });
             this.applyConfig(config);
-            this.isEditingToken = false;
             this.testResult = null;
-            this.notifications.success('Registry configuration saved.');
+            this.notifications.success(this.t('saved'));
         } catch (error) {
             this.notifications.serverError(error);
         }
@@ -96,16 +78,14 @@ export default class RegistryAdminConfigComponent extends Component {
     @task *testConnection() {
         this.testResult = null;
 
-        const payload = this.serviceUrl ? { service_url: this.serviceUrl } : { host: this.registryHost, token: this.registryToken };
-
         try {
-            const result = yield this.fetch.post('registry-extensions/config/test', payload, { namespace: '~registry/v1' });
+            const result = yield this.fetch.post('registry-extensions/config/test', this.serviceUrl ? { service_url: this.serviceUrl } : {}, { namespace: '~registry/v1' });
             this.testResult = result;
 
             if (result && result.ok) {
-                this.notifications.success(`Connected to ${result.host} in ${result.latency_ms}ms.`);
+                this.notifications.success(this.t('result.ok-toast', { host: result.host, ms: result.latency_ms }));
             } else {
-                this.notifications.warning((result && result.error) || 'Unable to connect to the registry.');
+                this.notifications.warning((result && result.error) || this.t('result.failed'));
             }
         } catch (error) {
             this.notifications.serverError(error);
@@ -116,23 +96,39 @@ export default class RegistryAdminConfigComponent extends Component {
         try {
             const config = yield this.fetch.post(
                 'registry-extensions/instance/register',
-                { code: this.registrationCode.trim(), service_url: this.serviceUrl },
+                { code: this.registrationCode.trim(), service_url: this.serviceUrl, host: this.consoleOrigin },
                 { namespace: '~registry/v1' }
             );
             this.applyConfig(config);
             this.registrationCode = '';
+            this.isReregistering = false;
             this.testResult = null;
-            this.notifications.success(`Registered with ${config.service_url} as ${config.instance?.name ?? 'this instance'}.`);
+            const name = config.instance?.name ?? this.t('this-instance');
+            if (config.instance?.rotated) {
+                this.notifications.success(this.t('reregistered-toast', { host: config.service_url, name, id: config.instance?.id ?? '' }));
+            } else {
+                this.notifications.success(this.t('registered-toast', { host: config.service_url, name }));
+            }
         } catch (error) {
             this.notifications.serverError(error);
         }
     }
 
+    @action startReregister() {
+        this.registrationCode = '';
+        this.isReregistering = true;
+    }
+
+    @action cancelReregister() {
+        this.registrationCode = '';
+        this.isReregistering = false;
+    }
+
     @action confirmUnregister() {
         this.modalsManager.confirm({
-            title: 'Unregister this instance?',
-            body: 'This instance forgets its registry token and can no longer install or update extensions from the registry service. Installed extensions keep working. To revoke the token itself, remove the instance from your registry organization.',
-            acceptButtonText: 'Unregister',
+            title: this.t('unregister.title'),
+            body: this.t('unregister.body'),
+            acceptButtonText: this.t('unregister.accept'),
             acceptButtonScheme: 'danger',
             confirm: async (modal) => {
                 modal.startLoading();
@@ -147,7 +143,7 @@ export default class RegistryAdminConfigComponent extends Component {
             const config = yield this.fetch.delete('registry-extensions/instance', {}, { namespace: '~registry/v1' });
             this.applyConfig(config);
             this.testResult = null;
-            this.notifications.info('This instance is no longer registered with the registry service.');
+            this.notifications.info(this.t('unregistered-toast'));
         } catch (error) {
             this.notifications.serverError(error);
         }
diff --git a/addon/controllers/application.js b/addon/controllers/application.js
index bd08c42..04fdae7 100644
--- a/addon/controllers/application.js
+++ b/addon/controllers/application.js
@@ -1,8 +1,58 @@
 import Controller from '@ember/controller';
-import config from '../config/environment';
+import { inject as service } from '@ember/service';
+import { isArray } from '@ember/array';
+import { tracked } from '@glimmer/tracking';
 
 export default class ApplicationController extends Controller {
-    get selfHostedRegistry() {
-        return config.registry.selfHosted === true;
+    @service registryContext;
+
+    /**
+     * Listing counts by category slug, taken when the categories load. Explore results embed each
+     * extension's category (same id, `meta.extensions_count: null`), and ember-data merges that into
+     * the sidebar's category records, so the live `meta` loses the count for every category in use.
+     */
+    @tracked categoryCounts = null;
+
+    rememberCategoryCounts(categories) {
+        const counts = {};
+        for (const category of isArray(categories) ? categories : []) {
+            counts[category.slug] = category.meta?.extensions_count ?? category.extensions_count;
+        }
+        this.categoryCounts = counts;
+    }
+
+    /** Installed count for the sidebar, with the updates waiting when there are any (`7 · 2↑`). */
+    get installedCount() {
+        const installed = this.registryContext.countOf('installed');
+        const updates = this.registryContext.countOf('updates');
+        if (installed === null) {
+            return null;
+        }
+        return updates ? `${installed} · ${updates}↑` : String(installed);
+    }
+
+    get purchasedCount() {
+        const purchased = this.registryContext.countOf('purchased');
+        return purchased === null ? null : String(purchased);
+    }
+
+    /**
+     * Categories for the sidebar, each with its listing count and the model
+     * the category route takes (`{ slug }`, so the active item is the one in
+     * the URL).
+     */
+    get sidebarCategories() {
+        const categories = isArray(this.model) ? this.model : [];
+        return categories.map((category) => {
+            const remembered = this.categoryCounts?.[category.slug];
+            const count = remembered ?? category.meta?.extensions_count ?? category.extensions_count;
+            return {
+                name: category.name,
+                slug: category.slug,
+                icon: category.icon,
+                model: { slug: category.slug },
+                count: Number.isFinite(Number(count)) && count !== null && count !== undefined ? String(count) : null,
+            };
+        });
     }
 }
diff --git a/addon/controllers/developers/analytics.js b/addon/controllers/developers/analytics.js
deleted file mode 100644
index 4e60e4a..0000000
--- a/addon/controllers/developers/analytics.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import Controller from '@ember/controller';
-import { tracked } from '@glimmer/tracking';
-import { action } from '@ember/object';
-import { inject as service } from '@ember/service';
-import { task } from 'ember-concurrency';
-
-export default class DevelopersAnalyticsController extends Controller {
-    @service fetch;
-    @service notifications;
-    @tracked selectedExtension;
-    @tracked extensions = [];
-    @tracked metrics = {};
-
-    @action selectExtension(extension) {
-        this.selectedExtension = extension;
-        this.getExtensionAnalytics.perform(extension);
-    }
-
-    @task *getExtensionAnalytics(extension) {
-        try {
-            this.metrics = yield this.fetch.get('registry-extensions/analytics', { id: extension.id }, { namespace: '~registry/v1' });
-        } catch (error) {
-            this.notifications.serverError(error);
-        }
-    }
-}
diff --git a/addon/controllers/developers/credentials.js b/addon/controllers/developers/credentials.js
deleted file mode 100644
index 69f6910..0000000
--- a/addon/controllers/developers/credentials.js
+++ /dev/null
@@ -1,106 +0,0 @@
-import Controller from '@ember/controller';
-import { action } from '@ember/object';
-import { inject as service } from '@ember/service';
-
-export default class DevelopersCredentialsController extends Controller {
-    @service modalsManager;
-    @service notifications;
-    @service hostRouter;
-    @service fetch;
-
-    columns = [
-        {
-            label: 'Owner',
-            valuePath: 'user.name',
-            width: '15%',
-        },
-        {
-            label: 'Fleetbase Token',
-            valuePath: 'token',
-            cellComponent: 'click-to-copy',
-            width: '20%',
-        },
-        {
-            label: 'Registry Token',
-            valuePath: 'registry_token',
-            cellComponent: 'click-to-reveal',
-            cellComponentArgs: {
-                clickToCopy: true,
-            },
-            width: '25%',
-        },
-        {
-            label: 'Expiry',
-            valuePath: 'expires_at',
-            width: '15%',
-        },
-        {
-            label: 'Created',
-            valuePath: 'created_at',
-            width: '15%',
-        },
-        {
-            label: '',
-            cellComponent: 'table/cell/dropdown',
-            ddButtonText: false,
-            ddButtonIcon: 'ellipsis-h',
-            ddButtonIconPrefix: 'fas',
-            ddMenuLabel: 'Credential Actions',
-            cellClassNames: 'overflow-visible',
-            wrapperClass: 'flex items-center justify-end mx-2',
-            width: '10%',
-            align: 'right',
-            actions: [
-                {
-                    label: 'Delete Credentials',
-                    fn: this.deleteCredentials,
-                    className: 'text-red-700 hover:text-red-800',
-                },
-            ],
-        },
-    ];
-
-    @action deleteCredentials(credentials) {
-        this.modalsManager.confirm({
-            title: 'Delete extension registry credentials?',
-            body: 'Are you sure you wish to delete these credentials? Once deleted any service or user using these credentials will loose access to the registry.',
-            confirm: async (modal) => {
-                modal.startLoading();
-
-                try {
-                    await this.fetch.delete(`auth/registry-tokens/${credentials.uuid}`, {}, { namespace: '~registry/v1' });
-                    this.notifications.success('Registry credentials deleted.');
-                    return this.hostRouter.refresh();
-                } catch (error) {
-                    this.notifications.serverError(error);
-                }
-            },
-        });
-    }
-
-    @action createCredentials() {
-        this.modalsManager.show('modals/create-registry-credentials', {
-            title: 'Create new registry credentials',
-            acceptButtonText: 'Create',
-            acceptButtonIcon: 'check',
-            password: null,
-            confirm: async (modal) => {
-                modal.startLoading();
-
-                const password = modal.getOption('password');
-                if (!password) {
-                    this.notifications.warning('Password cannot be empty');
-                    return modal.stopLoading();
-                }
-
-                try {
-                    await this.fetch.post('auth/registry-tokens', { password }, { namespace: '~registry/v1' });
-                    this.notifications.success('Registry credentials created.');
-                    return this.hostRouter.refresh();
-                } catch (error) {
-                    this.notifications.serverError(error);
-                }
-            },
-        });
-    }
-}
diff --git a/addon/controllers/developers/extensions/edit.js b/addon/controllers/developers/extensions/edit.js
deleted file mode 100644
index f661ace..0000000
--- a/addon/controllers/developers/extensions/edit.js
+++ /dev/null
@@ -1,107 +0,0 @@
-import Controller from '@ember/controller';
-import { tracked } from '@glimmer/tracking';
-import { inject as service } from '@ember/service';
-import { action } from '@ember/object';
-import { isArray } from '@ember/array';
-import { isBlank } from '@ember/utils';
-import { task } from 'ember-concurrency';
-import humanize from '@fleetbase/ember-core/utils/humanize';
-
-export default class DevelopersExtensionsEditController extends Controller {
-    @service notifications;
-    @service intl;
-    @tracked isReady = false;
-    @tracked isReadyMessage = null;
-
-    @task *save() {
-        try {
-            yield this.model.save();
-            this.notifications.success('Extension details saved.');
-            const isReady = this.validateExtensionForReview();
-            if (isReady === true) {
-                this.isReady = isReady;
-            } else if (isArray(isReady) && isReady.length) {
-                this.isReadyMessage = isReady[0];
-            }
-        } catch (error) {
-            this.notifications.warning(error.message);
-        }
-    }
-
-    @task *startReview() {
-        try {
-            yield this.model.submitForReview();
-            this.notifications.success(this.intl.t('registry-bridge.developers.extensions.extension-form.submission-success-message'));
-        } catch (error) {
-            if (error && error.message) {
-                this.notifications.error(error.messsage);
-            }
-        }
-    }
-
-    @action onIconUploaded(uploadedFile) {
-        this.model.setProperties({
-            icon_uuid: uploadedFile.id,
-            icon_url: uploadedFile.url,
-        });
-
-        return this.model.save();
-    }
-
-    @action submitForReview() {
-        const result = this.validateExtensionForReview();
-        if (result === true) {
-            // send for review
-            return this.startReview.perform();
-        }
-
-        if (isArray(result)) {
-            this.notifications.warning(result.join('\n'));
-        }
-    }
-
-    getValidations() {
-        const defaultValidationFn = (value) => !isBlank(value);
-        return {
-            name: (value) => {
-                return typeof value === 'string' && value.length > 3;
-            },
-            description: (value) => {
-                return typeof value === 'string' && value.length > 12;
-            },
-            tags: defaultValidationFn,
-            promotional_text: defaultValidationFn,
-            subtitle: defaultValidationFn,
-            copyright: defaultValidationFn,
-            website_url: defaultValidationFn,
-            support_url: defaultValidationFn,
-            privacy_policy_url: defaultValidationFn,
-            icon_uuid: defaultValidationFn,
-            next_bundle_uuid: defaultValidationFn,
-            category_uuid: defaultValidationFn,
-        };
-    }
-
-    validateExtensionForReview() {
-        const extension = this.model;
-        const validations = this.getValidations();
-        const errors = [];
-        // next bundle and current bundle id cannot be equal
-        if (extension.next_bundle_uuid === extension.current_bundle_uuid) {
-            return ['New bundle must be selected fo review.'];
-        }
-
-        Object.keys(validations).forEach((property) => {
-            const isValid = validations[property](extension.get(property));
-            if (!isValid) {
-                errors.push(`${humanize(property)} is required for submission.`);
-            }
-        });
-
-        if (errors.length > 0) {
-            return errors;
-        }
-
-        return true;
-    }
-}
diff --git a/addon/controllers/developers/extensions/edit/bundles.js b/addon/controllers/developers/extensions/edit/bundles.js
deleted file mode 100644
index e5b0cb7..0000000
--- a/addon/controllers/developers/extensions/edit/bundles.js
+++ /dev/null
@@ -1,70 +0,0 @@
-import Controller from '@ember/controller';
-import { tracked } from '@glimmer/tracking';
-import { inject as service } from '@ember/service';
-import { task } from 'ember-concurrency';
-
-export default class DevelopersExtensionsEditBundlesController extends Controller {
-    @service store;
-    @service fetch;
-    @service hostRouter;
-    @service notifications;
-    @tracked extension;
-    @tracked lastError;
-    acceptedBundleTypes = [
-        'application/zip',
-        'application/x-zip',
-        'application/x-zip-compressed',
-        'application/x-compressed',
-        'multipart/x-zip',
-        'application/x-tar',
-        'application/gzip',
-        'application/x-gzip',
-        'application/x-tgz',
-        'application/x-bzip2',
-        'application/x-xz',
-    ];
-
-    @task *uploadBundle(file) {
-        this.lastError = undefined;
-
-        yield this.fetch.uploadFile.perform(
-            file,
-            {
-                path: `uploads/extensions/${this.extension.id}/bundles`,
-                subject_uuid: this.extension.id,
-                subject_type: 'registry-bridge:registry-extension',
-                type: 'extension_bundle',
-                meta: {
-                    version: this.extension.version,
-                },
-            },
-            (uploadedFile) => {
-                return this.createBundle.perform(uploadedFile);
-            },
-            () => {
-                // remove file from queue
-                if (file.queue && typeof file.queue.remove === 'function') {
-                    file.queue.remove(file);
-                }
-            }
-        );
-    }
-
-    @task *createBundle(uploadedFile) {
-        const bundle = this.store.createRecord('registry-extension-bundle', {
-            extension_uuid: this.extension.id,
-            bundle_uuid: uploadedFile.id,
-            bundle: uploadedFile,
-            status: 'pending',
-        });
-
-        try {
-            yield bundle.save();
-        } catch (error) {
-            this.lastError = error.message;
-            return this.notifications.serverError(error);
-        }
-
-        yield this.hostRouter.refresh();
-    }
-}
diff --git a/addon/controllers/developers/extensions/edit/index.js b/addon/controllers/developers/extensions/edit/index.js
deleted file mode 100644
index 8b35c04..0000000
--- a/addon/controllers/developers/extensions/edit/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Controller from '@ember/controller';
-
-export default class DevelopersExtensionsEditIndexController extends Controller {}
diff --git a/addon/controllers/developers/extensions/edit/monetize.js b/addon/controllers/developers/extensions/edit/monetize.js
deleted file mode 100644
index 3b7777f..0000000
--- a/addon/controllers/developers/extensions/edit/monetize.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Controller from '@ember/controller';
-
-export default class DevelopersExtensionsEditMonetizeController extends Controller {}
diff --git a/addon/controllers/developers/extensions/index.js b/addon/controllers/developers/extensions/index.js
deleted file mode 100644
index daa8ef2..0000000
--- a/addon/controllers/developers/extensions/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Controller from '@ember/controller';
-
-export default class DevelopersExtensionsIndexController extends Controller {}
diff --git a/addon/controllers/developers/extensions/new.js b/addon/controllers/developers/extensions/new.js
deleted file mode 100644
index a98b416..0000000
--- a/addon/controllers/developers/extensions/new.js
+++ /dev/null
@@ -1,32 +0,0 @@
-import Controller from '@ember/controller';
-import { tracked } from '@glimmer/tracking';
-import { inject as service } from '@ember/service';
-import { action } from '@ember/object';
-import { task } from 'ember-concurrency';
-
-export default class DevelopersExtensionsNewController extends Controller {
-    @service store;
-    @service universe;
-    @service hostRouter;
-    @service notifications;
-    @tracked extension = this.store.createRecord('registry-extension');
-
-    @task *save() {
-        try {
-            yield this.extension.save();
-        } catch (error) {
-            return this.notifications.warning(error.message);
-        }
-        return this.hostRouter.transitionTo('console.extensions.developers.extensions.edit', this.extension);
-    }
-
-    @action cancel() {
-        this.reset();
-        return this.hostRouter.transitionTo('console.extensions.developers.extensions');
-    }
-
-    reset() {
-        this.extension.destroyRecord();
-        this.extension = this.store.createRecord('registry-extension');
-    }
-}
diff --git a/addon/controllers/developers/payments/index.js b/addon/controllers/developers/payments/index.js
deleted file mode 100644
index 1a631bc..0000000
--- a/addon/controllers/developers/payments/index.js
+++ /dev/null
@@ -1,52 +0,0 @@
-import Controller from '@ember/controller';
-import { tracked } from '@glimmer/tracking';
-import { inject as service } from '@ember/service';
-import { task } from 'ember-concurrency';
-
-export default class DevelopersPaymentsIndexController extends Controller {
-    @service fetch;
-    @tracked hasStripeConnectAccount = true;
-    @tracked table;
-    @tracked page = 1;
-    @tracked limit = 30;
-    @tracked sort = '-created_at';
-    @tracked query = null;
-    queryParams = ['page', 'limit', 'sort', 'query'];
-    columns = [
-        {
-            label: 'Extension',
-            valuePath: 'extension.name',
-            width: '20%',
-        },
-        {
-            label: 'Category',
-            valuePath: 'extension.category_name',
-            width: '20%',
-        },
-        {
-            label: 'Customer',
-            valuePath: 'company.name',
-            width: '20%',
-        },
-        {
-            label: 'Amount',
-            valuePath: 'locked_price',
-            cellComponent: 'table/cell/currency',
-            width: '20%',
-        },
-        {
-            label: 'Date',
-            valuePath: 'created_at',
-            width: '20%',
-        },
-    ];
-
-    @task *lookupStripeConnectAccount() {
-        try {
-            const { hasStripeConnectAccount } = yield this.fetch.get('payments/has-stripe-connect-account', {}, { namespace: '~registry/v1' });
-            this.hasStripeConnectAccount = hasStripeConnectAccount;
-        } catch (error) {
-            this.hasStripeConnectAccount = false;
-        }
-    }
-}
diff --git a/addon/controllers/developers/payments/onboard.js b/addon/controllers/developers/payments/onboard.js
deleted file mode 100644
index 93ea7ab..0000000
--- a/addon/controllers/developers/payments/onboard.js
+++ /dev/null
@@ -1,67 +0,0 @@
-import Controller from '@ember/controller';
-import { tracked } from '@glimmer/tracking';
-import { inject as service } from '@ember/service';
-import { action } from '@ember/object';
-import { task } from 'ember-concurrency';
-import { loadConnectAndInitialize } from '@stripe/connect-js';
-import config from '../../../config/environment';
-
-export default class DevelopersPaymentsOnboardController extends Controller {
-    @service fetch;
-    @service notifications;
-    @tracked connectedAccountId;
-    @tracked onboardInProgress = false;
-    @tracked onboardCompleted = false;
-
-    @task *startOnboard() {
-        try {
-            const { account } = yield this.fetch.post('payments/account', {}, { namespace: '~registry/v1' });
-
-            this.connectedAccountId = account;
-            this.onboardInProgress = true;
-
-            const instance = loadConnectAndInitialize({
-                publishableKey: config.stripe.publishableKey,
-                fetchClientSecret: this.fetchClientSecret.bind(this),
-                appearance: {
-                    overlays: 'dialog',
-                    variables: {
-                        colorPrimary: '#635BFF',
-                    },
-                },
-            });
-
-            const container = this.getTrackedElement('embeddedOnboardingContainer');
-            const embeddedOnboardingComponent = instance.create('account-onboarding');
-            embeddedOnboardingComponent.setOnExit(() => {
-                this.onboardInProgress = false;
-                this.onboardCompleted = true;
-            });
-            container.appendChild(embeddedOnboardingComponent);
-        } catch (error) {
-            this.notifications.serverError(error);
-        }
-    }
-
-    async fetchClientSecret() {
-        try {
-            const { clientSecret } = await this.fetch.post('payments/account-session', { account: this.connectedAccountId }, { namespace: '~registry/v1' });
-
-            return clientSecret;
-        } catch (error) {
-            this.notifications.serverError(error);
-        }
-    }
-
-    @action createTrackedElement(name, el) {
-        this[name] = el;
-    }
-
-    getTrackedElement(name) {
-        if (this[name] instanceof HTMLElement) {
-            return this[name];
-        }
-
-        return null;
-    }
-}
diff --git a/addon/controllers/developers/payments/settings.js b/addon/controllers/developers/payments/settings.js
deleted file mode 100644
index 6a37eb7..0000000
--- a/addon/controllers/developers/payments/settings.js
+++ /dev/null
@@ -1,58 +0,0 @@
-import Controller from '@ember/controller';
-import { inject as service } from '@ember/service';
-import { tracked } from '@glimmer/tracking';
-import { action } from '@ember/object';
-import { loadConnectAndInitialize } from '@stripe/connect-js';
-import config from '../../../config/environment';
-
-export default class DevelopersPaymentsSettingsController extends Controller {
-    @service fetch;
-    @service notifications;
-
-    @tracked connectInstance;
-    @tracked accountManagementComponent;
-    @tracked isLoading = true;
-
-    @action
-    async setupStripe(element) {
-        try {
-            await this.initializeStripe();
-            if (this.accountManagementComponent) {
-                element.appendChild(this.accountManagementComponent);
-            }
-            this.isLoading = false;
-        } catch (error) {
-            this.notifications.serverError(error);
-            this.isLoading = false;
-        }
-    }
-
-    async fetchClientSecret() {
-        try {
-            const { clientSecret } = await this.fetch.post('payments/account-management-session', {}, { namespace: '~registry/v1' });
-            return clientSecret;
-        } catch (error) {
-            this.notifications.serverError(error);
-            return null;
-        }
-    }
-
-    async initializeStripe() {
-        if (this.connectInstance) {
-            return;
-        }
-
-        this.connectInstance = loadConnectAndInitialize({
-            publishableKey: config.stripe.publishableKey,
-            fetchClientSecret: this.fetchClientSecret.bind(this),
-            appearance: {
-                overlays: 'dialog',
-                variables: {
-                    colorPrimary: '#635BFF',
-                },
-            },
-        });
-
-        this.accountManagementComponent = this.connectInstance.create('account-management');
-    }
-}
diff --git a/addon/controllers/explore/category.js b/addon/controllers/explore/category.js
index fb492d5..a590eb1 100644
--- a/addon/controllers/explore/category.js
+++ b/addon/controllers/explore/category.js
@@ -1,31 +1,25 @@
-import Controller from '@ember/controller';
-import { inject as service } from '@ember/service';
+import ExploreIndexController from './index';
 import { tracked } from '@glimmer/tracking';
-import { task, timeout } from 'ember-concurrency';
 
-export default class ExploreCategoryController extends Controller {
-    @service intl;
-    queryParams = ['query'];
-    @tracked query;
-    @tracked category;
+/**
+ * One category of Explore (canvas C3): the same catalog, facets and layout,
+ * scoped to the category in the URL.
+ */
+export default class ExploreCategoryController extends ExploreIndexController {
+    queryParams = ['query', 'pricing', 'hosting', 'hide_installed', 'sort', 'page', 'layout'];
+    @tracked slug = null;
+    @tracked categoryRecord = null;
 
-    /**
-     * Page title: "<Category> Extensions" when the category is known, otherwise the generic Explore title.
-     */
-    get title() {
-        const categoryName = this.category?.name;
-        if (categoryName) {
-            return this.intl.t('registry-bridge.developers.extensions.explore.explore-category-extensions', { categoryName });
-        }
+    get categoryFilter() {
+        return this.categoryRecord?.id ?? this.slug;
+    }
 
-        return this.intl.t('registry-bridge.developers.extensions.explore.explore-extensions');
+    get title() {
+        const categoryName = this.categoryRecord?.name;
+        return categoryName ? this.intl.t('registry-bridge.explore.category-title', { categoryName }) : this.intl.t('registry-bridge.explore.title');
     }
 
-    @task({ restartable: true }) *search(event) {
-        const query = event.target.value;
-        if (query) {
-            this.query = query;
-            yield timeout(300);
-        }
+    get hasFilters() {
+        return Boolean(this.query) || ['pricing', 'hosting', 'hide_installed'].some((param) => Boolean(this[param]));
     }
 }
diff --git a/addon/controllers/explore/index.js b/addon/controllers/explore/index.js
index a873f1d..c113e1c 100644
--- a/addon/controllers/explore/index.js
+++ b/addon/controllers/explore/index.js
@@ -1,16 +1,230 @@
 import Controller from '@ember/controller';
+import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
+import { action } from '@ember/object';
 import { task, timeout } from 'ember-concurrency';
 
+export const FACET_PARAMS = ['pricing', 'hosting', 'hide_installed'];
+export const SORTS = ['popular', 'newest', 'updated', 'name'];
+export const PAGE_SIZE = 24;
+
+/**
+ * Explore (canvas C1): the service catalog on `Layout::Resource::CardsGrid`
+ * or a table, with facets (category, pricing, hosting, hide installed), sort,
+ * search and paging in query params. The category page extends this.
+ */
 export default class ExploreIndexController extends Controller {
-    queryParams = ['query'];
-    @tracked query;
+    @service store;
+    @service intl;
+    @service hostRouter;
+    @service currentUser;
+    @service registryContext;
+    @service filters;
+
+    queryParams = ['query', 'category', 'pricing', 'hosting', 'hide_installed', 'sort', 'page', 'layout'];
+    @tracked query = null;
+    @tracked category = null;
+    @tracked pricing = null;
+    @tracked hosting = null;
+    @tracked hide_installed = null;
+    @tracked sort = null;
+    @tracked page = 1;
+    @tracked layout = 'grid';
+
+    @tracked extensions = [];
+    @tracked categories = [];
+    @tracked error = null;
+
+    /** The category filter sent to the registry: a category id or slug. */
+    get categoryFilter() {
+        return this.category;
+    }
+
+    get title() {
+        return this.intl.t('registry-bridge.explore.title');
+    }
+
+    get isTable() {
+        return this.layout === 'table';
+    }
+
+    get isLoading() {
+        return this.load.isRunning;
+    }
+
+    get total() {
+        return this.extensions?.meta?.total ?? this.extensions?.length ?? 0;
+    }
+
+    get hasFilters() {
+        return Boolean(this.query) || Boolean(this.category) || FACET_PARAMS.some((param) => Boolean(this[param]));
+    }
+
+    get isEmptyCatalog() {
+        return !this.isLoading && !this.error && this.extensions.length === 0 && !this.hasFilters;
+    }
+
+    get isNoResults() {
+        return !this.isLoading && !this.error && this.extensions.length === 0 && this.hasFilters;
+    }
+
+    get canConfigureRegistry() {
+        return this.currentUser.isAdmin === true;
+    }
+
+    get registryHost() {
+        // Until the context arrives (or when it failed) the URL is unknown: never name a default host.
+        return this.registryContext.serviceUrl ?? this.intl.t('registry-bridge.explore.this-registry');
+    }
+
+    get requestParams() {
+        const params = {
+            explore: 1,
+            query: this.query,
+            category: this.categoryFilter,
+            pricing: this.pricing,
+            hosting: this.hosting,
+            hide_installed: this.hide_installed ? 1 : null,
+            sort: this.sort,
+            page: this.page,
+            limit: PAGE_SIZE,
+        };
+
+        return Object.fromEntries(Object.entries(params).filter(([, value]) => value !== null && value !== undefined && value !== ''));
+    }
+
+    get sortOptions() {
+        return SORTS.map((value) => ({ value, label: this.intl.t(`registry-bridge.explore.sort.${value}`) }));
+    }
+
+    get pricingOptions() {
+        return ['free', 'paid'].map((value) => ({ value, label: this.intl.t(`registry-bridge.explore.pricing.${value}`) }));
+    }
+
+    get hostingOptions() {
+        return ['self_hosted', 'cloud', 'both'].map((value) => ({ value, label: this.intl.t(`registry-bridge.explore.hosting.${value}`) }));
+    }
+
+    /** Explore lists everything; without a registration nothing can be installed, so say so once above the list. */
+    get needsRegistration() {
+        return this.registryContext.loaded && !this.registryContext.registered;
+    }
+
+    get categoryOptions() {
+        return (this.categories ?? []).map((category) => ({ value: category.id, label: category.name }));
+    }
+
+    /** Facet definitions for `FiltersPicker`. */
+    get facetColumns() {
+        const t = (key) => this.intl.t(`registry-bridge.explore.filters.${key}`);
+        const columns = [];
+        if (this.queryParams.includes('category')) {
+            columns.push({ label: t('category'), filterable: true, filterParam: 'category', filterComponent: 'filter/select', filterOptions: this.categoryOptions });
+        }
+        columns.push({ label: t('pricing'), filterable: true, filterParam: 'pricing', filterComponent: 'filter/select', filterOptions: this.pricingOptions });
+        columns.push({ label: t('hosting'), filterable: true, filterParam: 'hosting', filterComponent: 'filter/select', filterOptions: this.hostingOptions });
+        columns.push({ label: t('hide-installed'), filterable: true, filterParam: 'hide_installed', filterComponent: 'filter/checkbox' });
+
+        return columns;
+    }
+
+    /** Active facets as removable chips. */
+    get activeFacets() {
+        const t = (key) => this.intl.t(`registry-bridge.explore.filters.${key}`);
+        const facets = [];
+        if (this.queryParams.includes('category') && this.category) {
+            const category = (this.categories ?? []).find((record) => record.id === this.category || record.slug === this.category);
+            facets.push({ param: 'category', label: t('category'), value: category?.name ?? this.category });
+        }
+        if (this.pricing) {
+            facets.push({ param: 'pricing', label: t('pricing'), value: this.pricingOptions.find((option) => option.value === this.pricing)?.label ?? this.pricing });
+        }
+        if (this.hosting) {
+            facets.push({ param: 'hosting', label: t('hosting'), value: this.hostingOptions.find((option) => option.value === this.hosting)?.label ?? this.hosting });
+        }
+        if (this.hide_installed) {
+            facets.push({ param: 'hide_installed', label: t('hide-installed'), value: null });
+        }
+
+        return facets;
+    }
+
+    get tableColumns() {
+        const t = (key) => this.intl.t(`registry-bridge.explore.columns.${key}`);
+        return [
+            { label: t('extension'), valuePath: 'name', cellComponent: 'cell/extension-identity', width: '30%' },
+            { label: t('category'), valuePath: 'category_name', width: '15%' },
+            { label: t('publisher'), valuePath: 'publisher_name', width: '15%' },
+            { label: t('status'), valuePath: 'status', cellComponent: 'cell/extension-status', width: '20%' },
+            { label: t('updated'), valuePath: 'updatedAgo', width: '10%' },
+            { label: '', valuePath: 'id', cellComponent: 'cell/extension-action', width: '10%' },
+        ];
+    }
+
+    @task({ restartable: true }) *load() {
+        this.error = null;
+        try {
+            this.extensions = yield this.store.query('registry-extension', this.requestParams);
+        } catch (error) {
+            this.error = error;
+            this.extensions = [];
+        }
+    }
 
     @task({ restartable: true }) *search(event) {
-        const query = event.target.value;
-        if (query) {
-            this.query = query;
-            yield timeout(300);
+        yield timeout(300);
+        const query = event?.target?.value ?? '';
+        this.query = query.trim() === '' ? null : query;
+        this.page = 1;
+    }
+
+    @action setLayout(layout) {
+        this.layout = layout === 'table' ? 'table' : 'grid';
+    }
+
+    @action setSort(sort) {
+        this.sort = SORTS.includes(sort) && sort !== 'popular' ? sort : null;
+        this.page = 1;
+    }
+
+    @action setPage(page) {
+        this.page = page;
+    }
+
+    @action applyFacets() {
+        this.filters.apply(this);
+    }
+
+    @action resetFacets() {
+        this.filters.reset(this);
+        this.page = 1;
+    }
+
+    @action clearFacet(param) {
+        this[param] = null;
+        this.page = 1;
+    }
+
+    @action clearAll() {
+        this.query = null;
+        FACET_PARAMS.forEach((param) => (this[param] = null));
+        if (this.queryParams.includes('category')) {
+            this.category = null;
+        }
+        this.page = 1;
+    }
+
+    @action retry() {
+        return this.load.perform();
+    }
+
+    @action openRegistryConfig() {
+        return this.hostRouter.transitionTo('console.admin.virtual', 'extension-registry', { queryParams: { view: 'registry-config' } });
+    }
+
+    @action openPublisherPortal() {
+        if (this.registryContext.publisherUrl) {
+            window.open(this.registryContext.publisherUrl, '_blank', 'noopener');
         }
     }
 }
diff --git a/addon/controllers/installed.js b/addon/controllers/installed.js
index 8d29ebf..8278902 100644
--- a/addon/controllers/installed.js
+++ b/addon/controllers/installed.js
@@ -1,66 +1,135 @@
 import Controller from '@ember/controller';
 import { inject as service } from '@ember/service';
+import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
-import { installerChannel, runInstallerJob } from '../utils/installer-job';
+import { task, timeout } from 'ember-concurrency';
+import { PERMISSIONS } from '../utils/extension-state';
 
+export function matchesQuery(extension, query) {
+    const needle = (query ?? '').trim().toLowerCase();
+    if (!needle) {
+        return true;
+    }
+    return [extension.name, extension.publisher_name, extension.category_name, extension.slug].some((value) => typeof value === 'string' && value.toLowerCase().includes(needle));
+}
+
+/**
+ * Installed extensions (canvas C8) on `Layout::Resource::Tabular` with a grid
+ * toggle: installed against latest version, status, and Update, About and
+ * Uninstall per row.
+ */
 export default class InstalledController extends Controller {
-    @service modalsManager;
-    @service currentUser;
-    @service notifications;
-    @service socket;
+    @service extensionPanel;
+    @service extensionInstaller;
     @service hostRouter;
     @service abilities;
     @service intl;
-    @service fetch;
+
+    queryParams = ['query', 'layout'];
+    @tracked query = null;
+    @tracked layout = 'table';
+    @tracked extensions = [];
+    @tracked error = null;
+
+    get rows() {
+        return (this.extensions ?? []).filter((extension) => matchesQuery(extension, this.query));
+    }
+
+    get updatesAvailable() {
+        return (this.extensions ?? []).filter((extension) => extension.update_available === true).length;
+    }
+
+    get isTable() {
+        return this.layout !== 'grid';
+    }
+
+    get columns() {
+        const t = (key) => this.intl.t(`registry-bridge.installed.columns.${key}`);
+        return [
+            { label: t('extension'), valuePath: 'name', cellComponent: 'cell/extension-identity', width: '30%', sortable: false },
+            { label: t('category'), valuePath: 'category_name', width: '15%', sortable: false },
+            { label: t('installed'), valuePath: 'installed_version', width: '12%', sortable: false },
+            { label: t('latest'), valuePath: 'latest_version', width: '12%', sortable: false },
+            { label: t('status'), valuePath: 'update_available', cellComponent: 'cell/extension-status', variant: 'installed', width: '15%', sortable: false },
+            {
+                label: '',
+                cellComponent: 'table/cell/dropdown',
+                ddButtonText: false,
+                ddButtonIcon: 'ellipsis-h',
+                ddButtonIconPrefix: 'fas',
+                ddMenuLabel: this.intl.t('registry-bridge.installed.actions'),
+                cellClassNames: 'overflow-visible',
+                wrapperClass: 'flex items-center justify-end mx-2',
+                width: '8%',
+                sortable: false,
+                actions: this.rowActions,
+            },
+        ];
+    }
+
+    get rowActions() {
+        return [
+            {
+                label: this.intl.t('registry-bridge.installed.update'),
+                icon: 'arrow-up',
+                fn: this.update,
+                permission: PERMISSIONS.install,
+                isVisible: (extension) => extension.update_available === true,
+            },
+            { label: this.intl.t('registry-bridge.common.about'), icon: 'circle-info', fn: this.about },
+            { separator: true },
+            {
+                label: this.intl.t('registry-bridge.common.uninstall'),
+                icon: 'trash',
+                class: 'text-red-500',
+                fn: this.uninstall,
+                permission: PERMISSIONS.uninstall,
+                isVisible: (extension) => extension.core_extension !== true,
+            },
+        ];
+    }
+
+    @task *load() {
+        this.error = null;
+        try {
+            this.extensions = yield this.fetchInstalled();
+        } catch (error) {
+            this.error = error;
+            this.extensions = [];
+        }
+    }
+
+    fetchInstalled() {
+        return this.model?.load ? this.model.load() : Promise.resolve(this.model ?? []);
+    }
+
+    @task({ restartable: true }) *search(event) {
+        yield timeout(250);
+        const query = event?.target?.value ?? '';
+        this.query = query.trim() === '' ? null : query;
+    }
+
+    @action setLayout(layout) {
+        this.layout = layout === 'grid' ? 'grid' : 'table';
+    }
 
     @action about(extension) {
-        this.modalsManager.show('modals/extension-details', {
-            titleComponent: 'extension-modal-title',
-            modalClass: 'flb--extension-modal modal-lg',
-            modalHeaderClass: 'flb--extension-modal-header',
-            acceptButtonText: 'Done',
-            hideDeclineButton: true,
-            extension,
-        });
+        return this.extensionPanel.open(extension);
+    }
+
+    @action update(extension) {
+        return this.extensionInstaller.update(extension, { onCompleted: () => this.load.perform() });
     }
 
     @action uninstall(extension) {
-        const uninstallChannel = installerChannel('uninstall', this.currentUser.companyId, extension.id);
-
-        this.modalsManager.show('modals/extension-uninstall', {
-            title: `Uninstall ${extension.name}`,
-            modalClass: 'flb--extension-modal modal-lg',
-            modalHeaderClass: 'flb--extension-modal-header',
-            acceptButtonText: 'Uninstall',
-            acceptButtonIcon: 'trash',
-            acceptButtonScheme: 'danger',
-            acceptButtonDisabled: this.abilities.cannot('registry-bridge uninstall extension'),
-            process: null,
-            step: null,
-            stepDescription: 'Awaiting uninstall to begin...',
-            progress: 0,
-            extension,
-            // Stay open after a failed uninstall so the error and Retry are shown.
-            keepOpen: true,
-            confirm: async (modal) => {
-                // Queue the uninstall and follow the job until it completes or fails
-                try {
-                    const job = await runInstallerJob({
-                        modal,
-                        intl: this.intl,
-                        fetch: this.fetch,
-                        socket: this.socket,
-                        channel: uninstallChannel,
-                        request: () => extension.uninstall(),
-                    });
-                    if (job.status === 'completed') {
-                        this.notifications.info(this.intl.t('registry-bridge.installer.uninstalled', { extensionName: extension.name }));
-                        await this.hostRouter.refresh();
-                    }
-                } catch (error) {
-                    this.notifications.serverError(error);
-                }
-            },
-        });
+        return this.extensionInstaller.uninstall(extension, { onCompleted: () => this.load.perform() });
+    }
+
+    @action explore() {
+        return this.hostRouter.transitionTo('console.extensions.explore.index');
+    }
+
+    @action purchased() {
+        return this.hostRouter.transitionTo('console.extensions.purchased');
     }
 }
diff --git a/addon/controllers/purchased.js b/addon/controllers/purchased.js
index b1dfb64..ff48145 100644
--- a/addon/controllers/purchased.js
+++ b/addon/controllers/purchased.js
@@ -1,18 +1,116 @@
 import Controller from '@ember/controller';
 import { inject as service } from '@ember/service';
+import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
+import { task, timeout } from 'ember-concurrency';
+import { PERMISSIONS } from '../utils/extension-state';
+import { matchesQuery } from './installed';
 
+/**
+ * Purchased extensions (canvas C9) on `Layout::Resource::Tabular`: the
+ * registry organization's licences with the price paid, the licence state
+ * (active, or refunded or revoked by the service), activations from the
+ * instance API, install status, receipt, and Install or About per row.
+ */
 export default class PurchasedController extends Controller {
-    @service modalsManager;
+    @service extensionPanel;
+    @service extensionInstaller;
+    @service hostRouter;
+    @service intl;
+    @service registryContext;
+
+    queryParams = ['query', 'layout'];
+    @tracked query = null;
+    @tracked layout = 'table';
+    @tracked extensions = [];
+    @tracked error = null;
+
+    get rows() {
+        return (this.extensions ?? []).filter((extension) => matchesQuery(extension, this.query));
+    }
+
+    /** Active licences not installed yet; a refunded or revoked one cannot be installed. */
+    get readyToInstall() {
+        return (this.extensions ?? []).filter((extension) => extension.is_installed !== true && extension.is_purchased === true).length;
+    }
+
+    /** Refunded or revoked licences still listed: their extensions can no longer be installed again or updated. */
+    get blockedCount() {
+        return (this.extensions ?? []).filter((extension) => ['refunded', 'revoked'].includes(extension.meta?.licence_state)).length;
+    }
+
+    get organizationName() {
+        return this.registryContext.organizationName ?? this.intl.t('registry-bridge.purchase.your-organization');
+    }
+
+    get isTable() {
+        return this.layout !== 'grid';
+    }
+
+    get columns() {
+        const t = (key) => this.intl.t(`registry-bridge.purchased.columns.${key}`);
+        return [
+            { label: t('extension'), valuePath: 'name', cellComponent: 'cell/extension-identity', width: '26%', sortable: false },
+            { label: t('price'), valuePath: 'price', cellComponent: 'cell/purchase-price', width: '12%', sortable: false },
+            { label: t('licence'), valuePath: 'meta.licence_state', cellComponent: 'cell/licence-state', width: '12%', sortable: false },
+            { label: t('activations'), valuePath: 'meta.licence', cellComponent: 'cell/licence-activations', width: '12%', sortable: false },
+            { label: t('install-status'), valuePath: 'is_installed', cellComponent: 'cell/extension-status', variant: 'purchased', width: '16%', sortable: false },
+            { label: t('receipt'), valuePath: 'meta.licence.receipt_url', cellComponent: 'cell/licence-receipt', width: '14%', sortable: false },
+            {
+                label: '',
+                cellComponent: 'table/cell/dropdown',
+                ddButtonText: false,
+                ddButtonIcon: 'ellipsis-h',
+                ddButtonIconPrefix: 'fas',
+                cellClassNames: 'overflow-visible',
+                wrapperClass: 'flex items-center justify-end mx-2',
+                width: '8%',
+                sortable: false,
+                actions: [
+                    {
+                        label: this.intl.t('registry-bridge.common.install'),
+                        icon: 'download',
+                        fn: this.install,
+                        permission: PERMISSIONS.install,
+                        isVisible: (extension) => extension.is_installed !== true && extension.is_installable !== false,
+                    },
+                    { label: this.intl.t('registry-bridge.common.about'), icon: 'circle-info', fn: this.about },
+                ],
+            },
+        ];
+    }
+
+    @task *load() {
+        this.error = null;
+        try {
+            this.extensions = yield this.model?.load ? this.model.load() : Promise.resolve(this.model ?? []);
+            // A refund or revoke on the service changes the Purchased count; keep the sidebar in step with the list
+            this.registryContext.loadCounts();
+        } catch (error) {
+            this.error = error;
+            this.extensions = [];
+        }
+    }
+
+    @task({ restartable: true }) *search(event) {
+        yield timeout(250);
+        const query = event?.target?.value ?? '';
+        this.query = query.trim() === '' ? null : query;
+    }
+
+    @action setLayout(layout) {
+        this.layout = layout === 'grid' ? 'grid' : 'table';
+    }
 
     @action about(extension) {
-        this.modalsManager.show('modals/extension-details', {
-            titleComponent: 'extension-modal-title',
-            modalClass: 'flb--extension-modal modal-lg',
-            modalHeaderClass: 'flb--extension-modal-header',
-            acceptButtonText: 'Done',
-            hideDeclineButton: true,
-            extension,
-        });
+        return this.extensionPanel.open(extension);
+    }
+
+    @action install(extension) {
+        return this.extensionInstaller.install(extension, { onCompleted: () => this.load.perform() });
+    }
+
+    @action browsePaid() {
+        return this.hostRouter.transitionTo('console.extensions.explore.index', { queryParams: { pricing: 'paid' } });
     }
 }
diff --git a/addon/extension.js b/addon/extension.js
index d6b53e9..4a84714 100644
--- a/addon/extension.js
+++ b/addon/extension.js
@@ -10,7 +10,7 @@ export default {
             priority: 99,
             id: 'registry-bridge',
             slug: 'registry-bridge',
-            description: 'Discover, install, and publish extensions to the Fleetbase extension registry.',
+            description: 'Discover, install and buy extensions from the Fleetbase extension registry.',
             shortcuts: [
                 {
                     title: 'Explore',
@@ -33,7 +33,7 @@ export default {
             ],
         });
 
-        // Register admin controls
+        // Register admin controls. Review and publishing moved to the publisher website (registry staff console).
         menuService.registerAdminMenuPanel(
             'Extensions Registry',
             [
@@ -42,16 +42,6 @@ export default {
                     icon: 'gear',
                     component: new ExtensionComponent('@fleetbase/registry-bridge-engine', 'registry-admin-config'),
                 }),
-                new MenuItem({
-                    title: 'Awaiting Review',
-                    icon: 'gavel',
-                    component: new ExtensionComponent('@fleetbase/registry-bridge-engine', 'extension-reviewer-control'),
-                }),
-                new MenuItem({
-                    title: 'Pending Publish',
-                    icon: 'rocket',
-                    component: new ExtensionComponent('@fleetbase/registry-bridge-engine', 'extension-pending-publish-viewer'),
-                }),
             ],
             {
                 slug: 'extension-registry',
diff --git a/addon/models/registry-extension-bundle.js b/addon/models/registry-extension-bundle.js
deleted file mode 100644
index 32d8672..0000000
--- a/addon/models/registry-extension-bundle.js
+++ /dev/null
@@ -1,62 +0,0 @@
-import Model, { attr, belongsTo } from '@ember-data/model';
-import { computed } from '@ember/object';
-import { format as formatDate, formatDistanceToNow, isValid as isValidDate } from 'date-fns';
-
-export default class RegistryExtensionBundleModel extends Model {
-    /** @ids */
-    @attr('string') uuid;
-    @attr('string') company_uuid;
-    @attr('string') created_by_uuid;
-    @attr('string') extension_uuid;
-    @attr('string') bundle_uuid;
-    @attr('string') bundle_id;
-    @attr('string') public_id;
-
-    /** @relationships */
-    @belongsTo('file') bundle;
-
-    /** @attributes */
-    @attr('string') bundle_filename;
-    @attr('string') bundle_number;
-    @attr('string') version;
-    @attr('string') status;
-    @attr('object') meta;
-
-    /** @dates */
-    @attr('date') created_at;
-    @attr('date') updated_at;
-    @attr('date') deleted_at;
-
-    /** @computed */
-    @computed('updated_at') get updatedAgo() {
-        if (!isValidDate(this.updated_at)) {
-            return null;
-        }
-
-        return formatDistanceToNow(this.updated_at);
-    }
-
-    @computed('updated_at') get updatedAt() {
-        if (!isValidDate(this.updated_at)) {
-            return null;
-        }
-
-        return formatDate(this.updated_at, 'PP HH:mm');
-    }
-
-    @computed('created_at') get createdAgo() {
-        if (!isValidDate(this.created_at)) {
-            return null;
-        }
-
-        return formatDistanceToNow(this.created_at);
-    }
-
-    @computed('created_at') get createdAt() {
-        if (!isValidDate(this.created_at)) {
-            return null;
-        }
-
-        return formatDate(this.created_at, 'PP HH:mm');
-    }
-}
diff --git a/addon/models/registry-extension.js b/addon/models/registry-extension.js
index c515b7a..8ede003 100644
--- a/addon/models/registry-extension.js
+++ b/addon/models/registry-extension.js
@@ -1,57 +1,42 @@
 import Model, { attr, belongsTo, hasMany } from '@ember-data/model';
-import { action, computed } from '@ember/object';
-import { getOwner } from '@ember/application';
+import { computed } from '@ember/object';
 import { format as formatDate, formatDistanceToNow, isValid as isValidDate } from 'date-fns';
 
+/**
+ * A Registry Service listing as the bridge maps it (`ServiceCatalog::transform`), decorated with this
+ * instance's install and licence state.
+ */
+/** Shown for a listing without an icon image. */
+export const DEFAULT_EXTENSION_ICON = 'https://flb-assets.s3.ap-southeast-1.amazonaws.com/static/default-extension-icon.svg';
+
 export default class RegistryExtensionModel extends Model {
     /** @ids */
     @attr('string') uuid;
-    @attr('string') company_uuid;
-    @attr('string') created_by_uuid;
-    @attr('string') registry_user_uuid;
-    @attr('string') current_bundle_uuid;
-    @attr('string') next_bundle_uuid;
-    @attr('string') category_uuid;
-    @attr('string') icon_uuid;
     @attr('string') public_id;
-    @attr('string') current_bundle_public_id;
-    @attr('string') current_bundle_version;
-    @attr('string') next_bundle_public_id;
-    @attr('string') current_bundle_id;
-    @attr('string') next_bundle_id;
+    @attr('string') category_uuid;
 
     /** @relationships */
-    @belongsTo('company') company;
-    @belongsTo('user') created_by;
     @belongsTo('category') category;
-    @belongsTo('registry-extension-bundle') current_bundle;
-    @belongsTo('registry-extension-bundle') next_bundle;
-    @belongsTo('file') icon;
     @hasMany('file') screenshots;
 
     /** @attributes */
-    @attr('string', { defaultValue: 'https://flb-assets.s3.ap-southeast-1.amazonaws.com/static/default-extension-icon.svg' }) icon_url;
+    @attr('string', { defaultValue: DEFAULT_EXTENSION_ICON }) icon_url;
     @attr('string') name;
     @attr('string') subtitle;
+    @attr('string') description;
+    @attr('string') promotional_text;
+    @attr('string') fa_icon;
+    @attr('string') slug;
+    @attr('string') version;
+    @attr('string', { defaultValue: 'published' }) status;
     @attr('string') category_name;
     @attr('string') publisher_name;
     @attr('boolean') payment_required;
-    @attr('string') price;
-    @attr('string') sale_price;
+    @attr('number') price;
+    @attr('number') sale_price;
     @attr('boolean') on_sale;
-    @attr('boolean') subscription_required;
-    @attr('string', { defaultValue: 'flat_rate' }) subscription_model;
-    @attr('string', { defaultValue: 'monthly' }) subscription_billing_period;
-    @attr('string') subscription_amount;
-    @attr('array') subscription_tiers;
     @attr('string', { defaultValue: 'USD' }) currency;
-    @attr('string') slug;
-    @attr('string', { defaultValue: '1.0.0' }) version;
-    @attr('string') fa_icon;
-    @attr('string') description;
-    @attr('string') current_bundle_filename;
-    @attr('string') next_bundle_filename;
-    @attr('string') promotional_text;
+    @attr('number') installs_count;
     @attr('string') website_url;
     @attr('string') repo_url;
     @attr('string') support_url;
@@ -61,26 +46,25 @@ export default class RegistryExtensionModel extends Model {
     @attr('string') primary_language;
     @attr('array') tags;
     @attr('array') languages;
+    /** `hosting`, `compat`, `package_names`, `publisher`, `licence`, `install_blocked_code`, `install_blocked_reason`, `purchase_available`, … */
     @attr('object') meta;
-    @attr('boolean') core_service;
-    @attr('boolean') self_managed;
+    @attr('boolean') core_extension;
     @attr('boolean') is_purchased;
     @attr('boolean') is_installed;
     @attr('boolean') is_author;
-    /** false when this instance cannot install the record; `meta.install_blocked_reason` says why for Registry Service records */
+    /** false when this instance cannot install the listing; `meta.install_blocked_reason` says why */
     @attr('boolean', { defaultValue: true }) is_installable;
-    /** 'registry' for the cloud catalog (v1), 'registry-service' for the Registry Service (v2) */
     @attr('string') source;
-    /** Registry Service: installed release, newest compatible release, and whether they differ */
+    /** installed release, newest compatible release, and whether they differ */
+    @attr('string') current_bundle_version;
     @attr('string') installed_version;
     @attr('string') latest_version;
     @attr('boolean', { defaultValue: false }) update_available;
-    @attr('string', { defaultValue: 'pending' }) status;
 
     /** @dates */
+    @attr('date') published_at;
     @attr('date') created_at;
     @attr('date') updated_at;
-    @attr('date') deleted_at;
 
     /** @computed */
     @computed('updated_at') get updatedAgo() {
@@ -98,142 +82,4 @@ export default class RegistryExtensionModel extends Model {
 
         return formatDate(this.updated_at, 'MMMM, dd yyyy');
     }
-
-    @computed('created_at') get createdAgo() {
-        if (!isValidDate(this.created_at)) {
-            return null;
-        }
-
-        return formatDistanceToNow(this.created_at);
-    }
-
-    @computed('created_at') get createdAt() {
-        if (!isValidDate(this.created_at)) {
-            return null;
-        }
-
-        return formatDate(this.created_at, 'MMMM, dd yyyy');
-    }
-
-    /** @methods */
-    /**
-     * Submits the registry extension for review.
-     *
-     * @return {Promise<RegistryExtensionModel>}
-     * @memberof RegistryExtensionModel
-     */
-    @action submitForReview(params = {}) {
-        const owner = getOwner(this);
-        const fetch = owner.lookup('service:fetch');
-
-        return fetch.post(`registry-extensions/${this.id}/submit`, params, { namespace: '~registry/v1', normalizeToEmberData: true, modelType: 'registry-extension' });
-    }
-
-    /**
-     * Submits the registry extension for approval.
-     *
-     * @return {Promise<RegistryExtensionModel>}
-     * @memberof RegistryExtensionModel
-     */
-    @action approve(params = {}) {
-        const owner = getOwner(this);
-        const fetch = owner.lookup('service:fetch');
-
-        return fetch.post('registry-extensions/approve', { id: this.id, ...params }, { namespace: '~registry/v1', normalizeToEmberData: true, modelType: 'registry-extension' });
-    }
-
-    /**
-     * Submits the registry extension to be manually published.
-     *
-     * @return {Promise<RegistryExtensionModel>}
-     * @memberof RegistryExtensionModel
-     */
-    @action publish(params = {}) {
-        const owner = getOwner(this);
-        const fetch = owner.lookup('service:fetch');
-
-        return fetch.post('registry-extensions/publish', { id: this.id, ...params }, { namespace: '~registry/v1', normalizeToEmberData: true, modelType: 'registry-extension' });
-    }
-
-    /**
-     * Submits the registry extension for rejection.
-     *
-     * @return {Promise<RegistryExtensionModel>}
-     * @memberof RegistryExtensionModel
-     */
-    @action reject(params = {}) {
-        const owner = getOwner(this);
-        const fetch = owner.lookup('service:fetch');
-
-        return fetch.post('registry-extensions/reject', { id: this.id, ...params }, { namespace: '~registry/v1', normalizeToEmberData: true, modelType: 'registry-extension' });
-    }
-
-    /**
-     * Downloads the extension latest bundle Zip.
-     *
-     * @return {Promise<>}
-     * @memberof RegistryExtensionModel
-     */
-    @action downloadBundle() {
-        const owner = getOwner(this);
-        const fetch = owner.lookup('service:fetch');
-
-        return fetch.download('registry-extensions/download-bundle', { id: this.id }, { namespace: '~registry/v1', fileName: this.latest_bundle_filename, mimeType: 'application/x-zip' });
-    }
-
-    /**
-     * Install the extension.
-     *
-     * @return {Promise<>}
-     * @memberof RegistryExtensionModel
-     */
-    @action install() {
-        const owner = getOwner(this);
-        const fetch = owner.lookup('service:fetch');
-
-        return fetch.post('installer/install', { extension: this.public_id }, { namespace: '~registry/v1' });
-    }
-
-    /**
-     * Uninstall the extension.
-     *
-     * @return {Promise<>}
-     * @memberof RegistryExtensionModel
-     */
-    @action uninstall() {
-        const owner = getOwner(this);
-        const fetch = owner.lookup('service:fetch');
-
-        return fetch.post('installer/uninstall', { extension: this.public_id }, { namespace: '~registry/v1' });
-    }
-
-    /**
-     * Adds a new tag to the tags array.
-     *
-     * This method takes a tag and adds it to the 'tags' array property
-     * of the current instance. The 'pushObject' method is used, which is
-     * typically available in Ember.js or similar frameworks that extend
-     * JavaScript array functionalities.
-     *
-     * @param {string} tag - The tag to be added to the tags array.
-     */
-    @action addTag(tag) {
-        this.tags.push(tag);
-        this.tags = [...this.tags];
-    }
-
-    /**
-     * Removes a tag from the tags array at a specific index.
-     *
-     * This method takes an index and removes the element at that position
-     * from the 'tags' array property of the current instance. The 'removeAt'
-     * method is used, which is typically available in Ember.js or similar
-     * frameworks that provide extended array functionalities.
-     *
-     * @param {number} index - The index of the tag to be removed from the tags array.
-     */
-    @action removeTag(index) {
-        this.tags.removeAt(index);
-        this.tags = [...this.tags];
-    }
 }
diff --git a/addon/routes.js b/addon/routes.js
index 64fab2e..6a03a9f 100644
--- a/addon/routes.js
+++ b/addon/routes.js
@@ -3,25 +3,6 @@ import buildRoutes from 'ember-engines/routes';
 export default buildRoutes(function () {
     this.route('installed');
     this.route('purchased');
-    this.route('developers', function () {
-        this.route('extensions', function () {
-            this.route('index', { path: '/' });
-            this.route('new');
-            this.route('edit', { path: '/distribution/:public_id' }, function () {
-                this.route('index', { path: '/' });
-                this.route('details');
-                this.route('bundles');
-                this.route('monetize');
-            });
-        });
-        this.route('analytics');
-        this.route('payments', function () {
-            this.route('index', { path: '/' });
-            this.route('onboard');
-            this.route('settings');
-        });
-        this.route('credentials');
-    });
     this.route('explore', { path: '/' }, function () {
         this.route('index', { path: '/' });
         this.route('category', { path: '/:slug' });
diff --git a/addon/routes/application.js b/addon/routes/application.js
index d9698bc..06c9eb2 100644
--- a/addon/routes/application.js
+++ b/addon/routes/application.js
@@ -1,5 +1,6 @@
 import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
+import { PANEL_PARAM } from '../services/extension-panel';
 
 export default class ApplicationRoute extends Route {
     @service fetch;
@@ -7,6 +8,10 @@ export default class ApplicationRoute extends Route {
     @service hostRouter;
     @service abilities;
     @service intl;
+    @service registryContext;
+    @service extensionPanel;
+    @service extensionPurchase;
+    @service urlSearchParams;
 
     beforeModel() {
         if (this.abilities.cannot('registry-bridge see extension')) {
@@ -16,12 +21,29 @@ export default class ApplicationRoute extends Route {
     }
 
     model() {
-        return this.fetch.get('categories', {}, { namespace: '~registry/v1', normalizeToEmberData: true, modelType: 'category' });
+        return this.fetch.get('categories', {}, { namespace: '~registry/v1', normalizeToEmberData: true, modelType: 'category' }).catch(() => []);
     }
 
-    // async setupController(controller) {
-    //     super.setupController(...arguments);
-    //     // controller.categories = await this.store.query('category', { for: 'extension_category', core_category: 1 });
-    //     controller.categories = await this.fetch.get('categories', {}, { namespace: '~registry/v1', normalizeToEmberData: true, modelType: 'category' });
-    // }
+    setupController(controller, model) {
+        super.setupController(...arguments);
+        controller.rememberCategoryCounts(model);
+        this.registryContext.load();
+        this.registryContext.loadCounts();
+        this.registryContext.watchCounts(this.hostRouter);
+        this.restoreFromUrl();
+    }
+
+    /**
+     * Reopen the panel from `?extension_id=`, and finish a purchase when the
+     * page is the return from a checkout.
+     */
+    async restoreFromUrl() {
+        const resumed = await this.extensionPurchase.resume();
+        if (resumed === null) {
+            const extensionId = this.urlSearchParams.get(PANEL_PARAM);
+            if (extensionId) {
+                await this.extensionPanel.openById(extensionId);
+            }
+        }
+    }
 }
diff --git a/addon/routes/developers.js b/addon/routes/developers.js
deleted file mode 100644
index 7bace04..0000000
--- a/addon/routes/developers.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Route from '@ember/routing/route';
-
-export default class DevelopersRoute extends Route {}
diff --git a/addon/routes/developers/analytics.js b/addon/routes/developers/analytics.js
deleted file mode 100644
index e649697..0000000
--- a/addon/routes/developers/analytics.js
+++ /dev/null
@@ -1,21 +0,0 @@
-import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
-
-export default class DevelopersAnalyticsRoute extends Route {
-    @service store;
-    @service notifications;
-    @service hostRouter;
-    @service abilities;
-    @service intl;
-
-    beforeModel() {
-        if (this.abilities.cannot('registry-bridge list extension-analytic')) {
-            this.notifications.warning(this.intl.t('common.unauthorized-access'));
-            return this.hostRouter.transitionTo('console');
-        }
-    }
-
-    model() {
-        return this.store.query('registry-extension', { is_author: 1 });
-    }
-}
diff --git a/addon/routes/developers/credentials.js b/addon/routes/developers/credentials.js
deleted file mode 100644
index 3d6c300..0000000
--- a/addon/routes/developers/credentials.js
+++ /dev/null
@@ -1,21 +0,0 @@
-import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
-
-export default class DevelopersCredentialsRoute extends Route {
-    @service fetch;
-    @service notifications;
-    @service hostRouter;
-    @service abilities;
-    @service intl;
-
-    beforeModel() {
-        if (this.abilities.cannot('registry-bridge list registry-token')) {
-            this.notifications.warning(this.intl.t('common.unauthorized-access'));
-            return this.hostRouter.transitionTo('console');
-        }
-    }
-
-    model() {
-        return this.fetch.get('auth/registry-tokens', {}, { namespace: '~registry/v1' });
-    }
-}
diff --git a/addon/routes/developers/extensions.js b/addon/routes/developers/extensions.js
deleted file mode 100644
index 76e53ab..0000000
--- a/addon/routes/developers/extensions.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
-
-export default class DevelopersExtensionsRoute extends Route {
-    @service notifications;
-    @service hostRouter;
-    @service abilities;
-    @service intl;
-
-    beforeModel() {
-        if (this.abilities.cannot('registry-bridge list extension-bundle')) {
-            this.notifications.warning(this.intl.t('common.unauthorized-access'));
-            return this.hostRouter.transitionTo('console');
-        }
-    }
-}
diff --git a/addon/routes/developers/extensions/edit.js b/addon/routes/developers/extensions/edit.js
deleted file mode 100644
index 85358cc..0000000
--- a/addon/routes/developers/extensions/edit.js
+++ /dev/null
@@ -1,29 +0,0 @@
-import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
-
-export default class DevelopersExtensionsEditRoute extends Route {
-    @service store;
-    @service notifications;
-    @service hostRouter;
-    @service abilities;
-    @service intl;
-
-    beforeModel() {
-        if (this.abilities.cannot('registry-bridge update extension-bundle')) {
-            this.notifications.warning(this.intl.t('common.unauthorized-access'));
-            return this.hostRouter.transitionTo('console');
-        }
-    }
-
-    model(params) {
-        return this.store.queryRecord('registry-extension', { public_id: params.public_id, single: true });
-    }
-
-    setupController(controller) {
-        super.setupController(...arguments);
-        const isReady = controller.validateExtensionForReview();
-        if (isReady === true) {
-            controller.isReady = isReady;
-        }
-    }
-}
diff --git a/addon/routes/developers/extensions/edit/bundles.js b/addon/routes/developers/extensions/edit/bundles.js
deleted file mode 100644
index 2c7dc41..0000000
--- a/addon/routes/developers/extensions/edit/bundles.js
+++ /dev/null
@@ -1,21 +0,0 @@
-import Route from '@ember/routing/route';
-import { tracked } from '@glimmer/tracking';
-import { inject as service } from '@ember/service';
-
-export default class DevelopersExtensionsEditBundlesRoute extends Route {
-    @service store;
-    @tracked extension;
-
-    beforeModel() {
-        this.extension = this.modelFor('developers.extensions.edit');
-    }
-
-    model() {
-        return this.store.query('registry-extension-bundle', { extension_uuid: this.extension.id });
-    }
-
-    setupController(controller) {
-        super.setupController(...arguments);
-        controller.extension = this.extension;
-    }
-}
diff --git a/addon/routes/developers/extensions/edit/details.js b/addon/routes/developers/extensions/edit/details.js
deleted file mode 100644
index 873ab23..0000000
--- a/addon/routes/developers/extensions/edit/details.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Route from '@ember/routing/route';
-
-export default class DevelopersExtensionsEditDetailsRoute extends Route {}
diff --git a/addon/routes/developers/extensions/edit/index.js b/addon/routes/developers/extensions/edit/index.js
deleted file mode 100644
index 8782018..0000000
--- a/addon/routes/developers/extensions/edit/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Route from '@ember/routing/route';
-
-export default class DevelopersExtensionsEditIndexRoute extends Route {}
diff --git a/addon/routes/developers/extensions/edit/monetize.js b/addon/routes/developers/extensions/edit/monetize.js
deleted file mode 100644
index 51aec64..0000000
--- a/addon/routes/developers/extensions/edit/monetize.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Route from '@ember/routing/route';
-
-export default class DevelopersExtensionsEditMonetizeRoute extends Route {}
diff --git a/addon/routes/developers/extensions/index.js b/addon/routes/developers/extensions/index.js
deleted file mode 100644
index 7ffe862..0000000
--- a/addon/routes/developers/extensions/index.js
+++ /dev/null
@@ -1,21 +0,0 @@
-import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
-
-export default class DevelopersExtensionsIndexRoute extends Route {
-    @service store;
-    @service notifications;
-    @service hostRouter;
-    @service abilities;
-    @service intl;
-
-    beforeModel() {
-        if (this.abilities.cannot('registry-bridge list extension-bundle')) {
-            this.notifications.warning(this.intl.t('common.unauthorized-access'));
-            return this.hostRouter.transitionTo('console');
-        }
-    }
-
-    model() {
-        return this.store.query('registry-extension', { is_author: 1 });
-    }
-}
diff --git a/addon/routes/developers/extensions/new.js b/addon/routes/developers/extensions/new.js
deleted file mode 100644
index 8cd9301..0000000
--- a/addon/routes/developers/extensions/new.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
-
-export default class DevelopersExtensionsNewRoute extends Route {
-    @service notifications;
-    @service hostRouter;
-    @service abilities;
-    @service intl;
-
-    beforeModel() {
-        if (this.abilities.cannot('registry-bridge create extension-bundle')) {
-            this.notifications.warning(this.intl.t('common.unauthorized-access'));
-            return this.hostRouter.transitionTo('console');
-        }
-    }
-}
diff --git a/addon/routes/developers/payments.js b/addon/routes/developers/payments.js
deleted file mode 100644
index 5a6e897..0000000
--- a/addon/routes/developers/payments.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
-
-export default class DevelopersPaymentsRoute extends Route {
-    @service notifications;
-    @service hostRouter;
-    @service abilities;
-    @service intl;
-
-    beforeModel() {
-        if (this.abilities.cannot('registry-bridge list extension-payment')) {
-            this.notifications.warning(this.intl.t('common.unauthorized-access'));
-            return this.hostRouter.transitionTo('console');
-        }
-    }
-}
diff --git a/addon/routes/developers/payments/index.js b/addon/routes/developers/payments/index.js
deleted file mode 100644
index f071e49..0000000
--- a/addon/routes/developers/payments/index.js
+++ /dev/null
@@ -1,32 +0,0 @@
-import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
-
-export default class DevelopersPaymentsIndexRoute extends Route {
-    @service fetch;
-    @service notifications;
-    @service hostRouter;
-    @service abilities;
-    @service intl;
-
-    queryParams = {
-        page: { refreshModel: true },
-        limit: { refreshModel: true },
-        sort: { refreshModel: true },
-        query: { refreshModel: true },
-    };
-
-    beforeModel() {
-        if (this.abilities.cannot('registry-bridge list extension-payment')) {
-            this.notifications.warning(this.intl.t('common.unauthorized-access'));
-            return this.hostRouter.transitionTo('console');
-        }
-    }
-
-    model() {
-        return this.fetch.get('payments/author-received', {}, { namespace: '~registry/v1' });
-    }
-
-    setupController(controller) {
-        controller.lookupStripeConnectAccount.perform();
-    }
-}
diff --git a/addon/routes/developers/payments/onboard.js b/addon/routes/developers/payments/onboard.js
deleted file mode 100644
index 518c1bf..0000000
--- a/addon/routes/developers/payments/onboard.js
+++ /dev/null
@@ -1,28 +0,0 @@
-import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
-
-export default class DevelopersPaymentsOnboardRoute extends Route {
-    @service fetch;
-    @service notifications;
-    @service hostRouter;
-    @service abilities;
-    @service intl;
-
-    async beforeModel() {
-        if (this.abilities.cannot('registry-bridge onboard extension-payment')) {
-            this.notifications.warning(this.intl.t('common.unauthorized-access'));
-            return this.hostRouter.transitionTo('console');
-        }
-
-        try {
-            const { hasStripeConnectAccount } = await this.fetch.get('payments/has-stripe-connect-account', {}, { namespace: '~registry/v1' });
-            if (hasStripeConnectAccount) {
-                this.notifications.info('Your account is already enabled to accept payments.');
-                this.hostRouter.transitionTo('console.extensions.payments');
-            }
-        } catch (error) {
-            this.notifications.serverError(error);
-            this.hostRouter.transitionTo('console.extensions.payments');
-        }
-    }
-}
diff --git a/addon/routes/developers/payments/settings.js b/addon/routes/developers/payments/settings.js
deleted file mode 100644
index 4f03b28..0000000
--- a/addon/routes/developers/payments/settings.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
-
-export default class DevelopersPaymentsSettingsRoute extends Route {
-    @service notifications;
-    @service hostRouter;
-    @service fetch;
-    @service intl;
-
-    async beforeModel() {
-        // Check if user has a Stripe Connect account before allowing access
-        try {
-            const { hasStripeConnectAccount } = await this.fetch.get('payments/has-stripe-connect-account', {}, { namespace: '~registry/v1' });
-            if (!hasStripeConnectAccount) {
-                this.notifications.warning(this.intl.t('registry-bridge.developers.payments.no-account-warning'));
-                return this.hostRouter.transitionTo('console.extensions.payments.onboard');
-            }
-        } catch (error) {
-            this.notifications.serverError(error);
-            return this.hostRouter.transitionTo('console.extensions.payments');
-        }
-    }
-}
diff --git a/addon/routes/explore/category.js b/addon/routes/explore/category.js
index bbeb73b..5840aa2 100644
--- a/addon/routes/explore/category.js
+++ b/addon/routes/explore/category.js
@@ -1,41 +1,34 @@
-import Route from '@ember/routing/route';
+import ExploreIndexRoute from './index';
 import { inject as service } from '@ember/service';
 import { isArray } from '@ember/array';
 
-export default class ExploreCategoryRoute extends Route {
+const refresh = { refreshModel: true };
+
+export default class ExploreCategoryRoute extends ExploreIndexRoute {
     @service store;
-    @service notifications;
-    @service hostRouter;
-    @service abilities;
-    @service intl;
 
     queryParams = {
-        query: {
-            refreshModel: false,
-        },
+        query: refresh,
+        pricing: refresh,
+        hosting: refresh,
+        hide_installed: refresh,
+        sort: refresh,
+        page: refresh,
     };
 
-    beforeModel() {
-        if (this.abilities.cannot('registry-bridge list extension')) {
-            this.notifications.warning(this.intl.t('common.unauthorized-access'));
-            return this.hostRouter.transitionTo('console');
-        }
+    /** The sidebar transitions with `{ slug }`, the URL with the slug param; both end up here. */
+    model(params) {
+        return { ...params, slug: params.slug };
     }
 
-    async model({ slug, query }) {
-        const category = await this.findCategory(slug);
-        this.category = category;
-
-        try {
-            return await this.store.query('registry-extension', { explore: 1, category: category ? category.id : slug, query });
-        } catch {
-            return [];
-        }
+    async afterModel(model) {
+        this.categoryRecord = await this.findCategory(model?.slug);
     }
 
-    setupController(controller) {
+    setupController(controller, model) {
+        controller.slug = model?.slug ?? null;
+        controller.categoryRecord = this.categoryRecord;
         super.setupController(...arguments);
-        controller.category = this.category;
     }
 
     /**
@@ -43,6 +36,10 @@ export default class ExploreCategoryRoute extends Route {
      * (which come from the registry in use), falling back to a local lookup.
      */
     async findCategory(slug) {
+        if (!slug) {
+            return null;
+        }
+
         const categories = this.modelFor('application');
         if (isArray(categories)) {
             const category = categories.find((category) => category.slug === slug || category.id === slug);
diff --git a/addon/routes/explore/index.js b/addon/routes/explore/index.js
index 53a04d3..620a483 100644
--- a/addon/routes/explore/index.js
+++ b/addon/routes/explore/index.js
@@ -1,17 +1,23 @@
 import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
+import { isArray } from '@ember/array';
+
+const refresh = { refreshModel: true };
 
 export default class ExploreIndexRoute extends Route {
-    @service store;
     @service notifications;
     @service hostRouter;
     @service abilities;
     @service intl;
 
     queryParams = {
-        query: {
-            refreshModel: true,
-        },
+        query: refresh,
+        category: refresh,
+        pricing: refresh,
+        hosting: refresh,
+        hide_installed: refresh,
+        sort: refresh,
+        page: refresh,
     };
 
     beforeModel() {
@@ -21,7 +27,15 @@ export default class ExploreIndexRoute extends Route {
         }
     }
 
-    model({ query }) {
-        return this.store.query('registry-extension', { explore: 1, query });
+    /** The catalog loads in the controller so the page renders skeletons and keeps its header while it does. */
+    model(params) {
+        return { ...params };
+    }
+
+    setupController(controller) {
+        super.setupController(...arguments);
+        const categories = this.modelFor('application');
+        controller.categories = isArray(categories) ? categories : [];
+        controller.load.perform();
     }
 }
diff --git a/addon/routes/installed.js b/addon/routes/installed.js
index 659a2d3..9393a6b 100644
--- a/addon/routes/installed.js
+++ b/addon/routes/installed.js
@@ -15,7 +15,13 @@ export default class InstalledRoute extends Route {
         }
     }
 
-    model(params = {}) {
-        return this.fetch.get('registry-extensions/installed', params, { namespace: '~registry/v1', normalizeToEmberData: true, modelType: 'registry-extension' });
+    /** Loaded by the controller so the page keeps its header and shows a skeleton, an error or the list. */
+    model() {
+        return { load: () => this.fetch.get('registry-extensions/installed', {}, { namespace: '~registry/v1', normalizeToEmberData: true, modelType: 'registry-extension' }) };
+    }
+
+    setupController(controller) {
+        super.setupController(...arguments);
+        controller.load.perform();
     }
 }
diff --git a/addon/routes/purchased.js b/addon/routes/purchased.js
index fd0dc5c..917bcee 100644
--- a/addon/routes/purchased.js
+++ b/addon/routes/purchased.js
@@ -15,7 +15,13 @@ export default class PurchasedRoute extends Route {
         }
     }
 
-    model(params = {}) {
-        return this.fetch.get('registry-extensions/purchased', params, { namespace: '~registry/v1', normalizeToEmberData: true, modelType: 'registry-extension' });
+    /** Loaded by the controller so the page keeps its header and shows a skeleton, an error or the list. */
+    model() {
+        return { load: () => this.fetch.get('registry-extensions/purchased', {}, { namespace: '~registry/v1', normalizeToEmberData: true, modelType: 'registry-extension' }) };
+    }
+
+    setupController(controller) {
+        super.setupController(...arguments);
+        controller.load.perform();
     }
 }
diff --git a/addon/serializers/registry-extension-bundle.js b/addon/serializers/registry-extension-bundle.js
deleted file mode 100644
index 189a453..0000000
--- a/addon/serializers/registry-extension-bundle.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import ApplicationSerializer from '@fleetbase/ember-core/serializers/application';
-import { EmbeddedRecordsMixin } from '@ember-data/serializer/rest';
-
-export default class RegistryExtensionBundleSerializer extends ApplicationSerializer.extend(EmbeddedRecordsMixin) {
-    /**
-     * Embedded relationship attributes
-     *
-     * @var {Object}
-     */
-    get attrs() {
-        return {
-            bundle: { embedded: 'always' },
-        };
-    }
-}
diff --git a/addon/serializers/registry-extension.js b/addon/serializers/registry-extension.js
index 1220d2e..19401ae 100644
--- a/addon/serializers/registry-extension.js
+++ b/addon/serializers/registry-extension.js
@@ -9,12 +9,7 @@ export default class RegistryExtensionSerializer extends ApplicationSerializer.e
      */
     get attrs() {
         return {
-            company: { embedded: 'always' },
-            created_by: { embedded: 'always' },
             category: { embedded: 'always' },
-            icon: { embedded: 'always' },
-            current_bundle: { embedded: 'always' },
-            next_bundle: { embedded: 'always' },
             screenshots: { embedded: 'always' },
         };
     }
diff --git a/addon/services/extension-installer.js b/addon/services/extension-installer.js
new file mode 100644
index 0000000..68cba03
--- /dev/null
+++ b/addon/services/extension-installer.js
@@ -0,0 +1,233 @@
+import Service, { inject as service } from '@ember/service';
+import { action } from '@ember/object';
+import { INSTALLER_NAMESPACE, installerChannel, installerStepGroups, runInstallerJob } from '../utils/installer-job';
+
+export const INSTALLER_ACTIONS = ['install', 'update', 'uninstall'];
+
+/**
+ * Footer buttons of the installer modal for each phase (canvas C5): confirm,
+ * progress, success (reload countdown) and failure (retry).
+ *
+ * @param {Object} intl
+ * @param {String} jobAction install, update or uninstall
+ * @param {String} phase
+ * @return {Object} modal options
+ */
+export function installerButtons(intl, jobAction, phase) {
+    const t = (key) => intl.t(`registry-bridge.${key}`);
+    const uninstall = jobAction === 'uninstall';
+
+    switch (phase) {
+        case 'progress':
+            return {
+                acceptButtonText: t(`${uninstall ? 'uninstall' : 'install'}.progress.button`),
+                acceptButtonIcon: 'spinner',
+                acceptButtonScheme: uninstall ? 'danger' : 'primary',
+                hideDeclineButton: true,
+            };
+        case 'success':
+            return {
+                acceptButtonText: t('install.success.reload-now'),
+                acceptButtonIcon: 'rotate-right',
+                acceptButtonScheme: 'primary',
+                declineButtonText: t('install.success.stay'),
+                declineButtonIcon: 'pause',
+                hideDeclineButton: false,
+            };
+        case 'failure':
+            return {
+                acceptButtonText: t(`${uninstall ? 'uninstall' : 'install'}.failed.retry`),
+                acceptButtonIcon: 'rotate-right',
+                acceptButtonScheme: uninstall ? 'danger' : 'primary',
+                declineButtonText: t('common.close'),
+                declineButtonIcon: 'times',
+                hideDeclineButton: false,
+            };
+        default:
+            return {
+                acceptButtonText: t(`${jobAction}.confirm.accept`),
+                acceptButtonIcon: uninstall ? 'trash' : jobAction === 'update' ? 'arrow-up' : 'download',
+                acceptButtonScheme: uninstall ? 'danger' : 'primary',
+                declineButtonText: t('common.cancel'),
+                declineButtonIcon: 'times',
+                hideDeclineButton: false,
+            };
+    }
+}
+
+/**
+ * Install, update and uninstall an extension through the queued installer
+ * job, in one modal that confirms, shows the named steps while the job runs,
+ * then counts down to the console reload or shows the failed stage with
+ * Retry. Nothing closes on its own.
+ */
+export default class ExtensionInstallerService extends Service {
+    @service modalsManager;
+    @service notifications;
+    @service currentUser;
+    @service socket;
+    @service fetch;
+    @service intl;
+    @service abilities;
+    @service registryContext;
+
+    /** Seconds before the console reloads after a finished job. */
+    reloadAfter = 8;
+
+    /** Replaced in tests. */
+    reload = () => window.location.reload();
+
+    @action install(extension, options = {}) {
+        return this.open('install', extension, options);
+    }
+
+    @action update(extension, options = {}) {
+        return this.open('update', extension, options);
+    }
+
+    @action uninstall(extension, options = {}) {
+        return this.open('uninstall', extension, options);
+    }
+
+    /**
+     * Show the confirm state for a job on an extension.
+     *
+     * @param {String} jobAction install, update or uninstall
+     * @param {Object} extension
+     * @param {Object} [options]
+     * @param {String} [options.version] a specific release (install or update)
+     * @param {Function} [options.onCompleted] called with the job after success
+     */
+    open(jobAction, extension, { version = null, onCompleted } = {}) {
+        if (!INSTALLER_ACTIONS.includes(jobAction)) {
+            throw new Error(`Unknown installer action "${jobAction}".`);
+        }
+
+        const permission = jobAction === 'uninstall' ? 'registry-bridge uninstall extension' : 'registry-bridge install extension';
+        const targetVersion = version ?? (jobAction === 'uninstall' ? extension.installed_version : extension.latest_version || extension.current_bundle_version) ?? null;
+
+        return this.modalsManager.show('modals/extension-installer', {
+            modalClass: 'flb--extension-modal flb--extension-installer-modal modal-md',
+            modalHeaderClass: 'flb--extension-modal-header',
+            title: this.title(jobAction, extension, targetVersion),
+            jobAction,
+            extension,
+            version: targetVersion,
+            installedVersion: extension.installed_version ?? null,
+            companyName: this.currentUser.company?.name ?? this.currentUser.user?.company_name ?? null,
+            phase: 'confirm',
+            steps: installerStepGroups(jobAction, {}),
+            confirmName: '',
+            progress: 0,
+            stepDescription: null,
+            installerError: null,
+            secondsLeft: null,
+            keepOpen: true,
+            closeButton: true,
+            // Uninstall waits for the typed name (see the modal component)
+            acceptButtonDisabled: this.abilities.cannot(permission) || jobAction === 'uninstall',
+            ...installerButtons(this.intl, jobAction, 'confirm'),
+            confirm: (modal) => this.onConfirm(modal, jobAction, extension, targetVersion, onCompleted),
+            decline: (modal) => this.onDecline(modal),
+        });
+    }
+
+    title(jobAction, extension, version) {
+        const name = extension.name;
+        if (jobAction === 'uninstall') {
+            return this.intl.t('registry-bridge.uninstall.confirm.title', { name });
+        }
+        if (jobAction === 'update') {
+            return this.intl.t('registry-bridge.update.confirm.title', { name, version: version ? `v${version}` : '' });
+        }
+        return this.intl.t('registry-bridge.install.confirm.title', { name, version: version ? `v${version}` : '' });
+    }
+
+    async onConfirm(modal, jobAction, extension, version, onCompleted) {
+        const phase = modal.getOption('phase');
+
+        if (phase === 'success') {
+            return this.reload();
+        }
+        if (phase === 'progress') {
+            return;
+        }
+        if (jobAction === 'uninstall' && phase === 'confirm' && (modal.getOption('confirmName') ?? '').trim() !== extension.name) {
+            return;
+        }
+
+        const proxy = this.modalWithButtons(modal, jobAction);
+        try {
+            const job = await runInstallerJob({
+                modal: proxy,
+                intl: this.intl,
+                fetch: this.fetch,
+                socket: this.socket,
+                action: jobAction,
+                channel: installerChannel(jobAction, this.currentUser.companyId, extension.id),
+                request: () => this.request(jobAction, extension, version),
+                reload: () => this.reload(),
+                reloadAfter: this.reloadAfter,
+            });
+
+            if (job.status === 'completed') {
+                const key = jobAction === 'uninstall' ? 'uninstalled' : jobAction === 'update' ? 'updated' : 'installed';
+                this.notifications.info(this.intl.t(`registry-bridge.installer.${key}`, { extensionName: extension.name }));
+                this.registryContext.loadCounts();
+                if (typeof onCompleted === 'function') {
+                    onCompleted(job);
+                }
+            }
+
+            return job;
+        } catch (error) {
+            this.notifications.serverError(error);
+        }
+    }
+
+    /**
+     * Cancel, Close and "Wait, stay here". Closing while the job runs is
+     * allowed: the job keeps running on the server.
+     */
+    onDecline(modal) {
+        if (modal.getOption('phase') === 'success') {
+            modal.invoke('cancelReload');
+        }
+
+        return modal.done();
+    }
+
+    request(jobAction, extension, version) {
+        const payload = { extension: extension.public_id ?? extension.id };
+        if (version && jobAction !== 'uninstall') {
+            payload.version = version;
+        }
+
+        return this.fetch.post(`installer/${jobAction}`, payload, { namespace: INSTALLER_NAMESPACE });
+    }
+
+    /**
+     * The modals manager, with the phase's footer buttons merged into every
+     * options update that changes the phase.
+     */
+    modalWithButtons(modal, jobAction) {
+        const setOptions = (options = {}) => {
+            if (!options.phase) {
+                return modal.setOptions(options);
+            }
+
+            modal.setOptions({ ...options, ...installerButtons(this.intl, jobAction, options.phase) });
+            // Reload now and Wait must be pressable while the countdown runs
+            if (options.phase === 'success') {
+                modal.stopLoading();
+            }
+        };
+
+        return {
+            startLoading: () => modal.startLoading(),
+            stopLoading: () => modal.stopLoading(),
+            setOption: (key, value) => (key === 'phase' ? setOptions({ phase: value }) : modal.setOption(key, value)),
+            setOptions,
+        };
+    }
+}
diff --git a/addon/services/extension-panel.js b/addon/services/extension-panel.js
new file mode 100644
index 0000000..8b6cb23
--- /dev/null
+++ b/addon/services/extension-panel.js
@@ -0,0 +1,102 @@
+import Service, { inject as service } from '@ember/service';
+import { tracked } from '@glimmer/tracking';
+import { action } from '@ember/object';
+import isModel from '@fleetbase/ember-core/utils/is-model';
+
+export const PANEL_PARAM = 'extension_id';
+
+function setUrlParam(name, value) {
+    const url = new URL(window.location.href);
+    if (value) {
+        url.searchParams.set(name, value);
+    } else {
+        url.searchParams.delete(name);
+    }
+    if (url.href !== window.location.href) {
+        window.history.replaceState({ path: url.href }, '', url.href);
+    }
+}
+
+/**
+ * The extension detail panel (canvas C4): one `Layout::Resource::Panel`
+ * rendered by the application template over Explore, Installed and
+ * Purchased. The open extension is kept in `?extension_id=` so the panel can
+ * be linked to and reopens after a checkout redirect.
+ */
+export default class ExtensionPanelService extends Service {
+    @service fetch;
+    @service notifications;
+    @tracked extension = null;
+    @tracked tab = 'overview';
+    @tracked isLoading = false;
+    @tracked error = null;
+
+    get isOpen() {
+        return this.extension !== null || this.isLoading || this.error !== null;
+    }
+
+    @action open(extension, { tab = 'overview' } = {}) {
+        this.extension = extension;
+        this.tab = tab;
+        this.error = null;
+        setUrlParam(PANEL_PARAM, extension?.public_id ?? extension?.id);
+    }
+
+    @action close() {
+        this.extension = null;
+        this.error = null;
+        this.isLoading = false;
+        setUrlParam(PANEL_PARAM, null);
+    }
+
+    @action selectTab(tab) {
+        this.tab = tab;
+    }
+
+    /**
+     * Open the panel for an id from the URL, loading the record first.
+     */
+    @action async openById(id, options = {}) {
+        if (!id) {
+            return null;
+        }
+        if (this.extension && (this.extension.public_id === id || this.extension.id === id)) {
+            return this.extension;
+        }
+
+        this.isLoading = true;
+        this.error = null;
+        try {
+            const extension = await this.load(id);
+            this.open(extension, options);
+            return extension;
+        } catch (error) {
+            this.error = error;
+            return null;
+        } finally {
+            this.isLoading = false;
+        }
+    }
+
+    /**
+     * Reload the open extension (after a purchase or install) and keep the panel on it.
+     */
+    @action async reload() {
+        const id = this.extension?.public_id ?? this.extension?.id;
+        if (!id) {
+            return null;
+        }
+        try {
+            const extension = await this.load(id);
+            this.extension = extension;
+            return extension;
+        } catch {
+            return this.extension;
+        }
+    }
+
+    async load(id) {
+        const extension = await this.fetch.get(`registry-extensions/${id}`, {}, { namespace: '~registry/v1', normalizeToEmberData: true });
+        return isModel(extension) ? extension : (extension ?? null);
+    }
+}
diff --git a/addon/services/extension-purchase.js b/addon/services/extension-purchase.js
new file mode 100644
index 0000000..e0bbde9
--- /dev/null
+++ b/addon/services/extension-purchase.js
@@ -0,0 +1,236 @@
+import Service, { inject as service } from '@ember/service';
+import { tracked } from '@glimmer/tracking';
+import { action } from '@ember/object';
+import { later } from '@ember/runloop';
+
+export const PURCHASE_NAMESPACE = '~registry/v1';
+/** Stripe appends these to the return URL (service contract); `purchase_return` is ours. */
+export const HANDOFF_PARAM = 'handoff';
+export const CANCELLED_PARAM = 'cancelled';
+export const RETURN_PARAM = 'purchase_return';
+export const HANDOFF_STORAGE_KEY = 'registry-bridge:purchase-handoff';
+
+/** Hand-off polling: every 2 s for about a minute, then the purchase is left to the webhook. */
+export const POLL_INTERVAL = 2000;
+export const POLL_TIMEOUT = 60000;
+
+function readStorage(key) {
+    try {
+        return JSON.parse(window.sessionStorage.getItem(key) ?? 'null');
+    } catch {
+        return null;
+    }
+}
+
+function writeStorage(key, value) {
+    try {
+        if (value === null) {
+            window.sessionStorage.removeItem(key);
+        } else {
+            window.sessionStorage.setItem(key, JSON.stringify(value));
+        }
+    } catch {
+        // Private windows can refuse storage; the hand-off then comes back in the URL only
+    }
+}
+
+function removeUrlParams(...names) {
+    const url = new URL(window.location.href);
+    names.forEach((name) => url.searchParams.delete(name));
+    if (url.href !== window.location.href) {
+        window.history.replaceState({ path: url.href }, '', url.href);
+    }
+}
+
+/**
+ * The URL Stripe sends the buyer back to: the current page with the panel's
+ * extension and a return marker. Stripe adds `handoff` (and `cancelled=1`
+ * when the buyer cancels); a stale one is dropped first.
+ */
+export function checkoutReturnUrl(href, extensionId) {
+    const url = new URL(href);
+    url.searchParams.set('extension_id', extensionId);
+    url.searchParams.set(RETURN_PARAM, '1');
+    url.searchParams.delete(HANDOFF_PARAM);
+    url.searchParams.delete(CANCELLED_PARAM);
+    return url.href;
+}
+
+/**
+ * Buying a paid extension (canvas C6) through the Registry Service's hosted
+ * Stripe Checkout (`POST ~registry/v1/purchases/checkout`). On return the
+ * Finalizing state polls the hand-off until the service's webhook has
+ * recorded the licence. A refusal (already licensed, publisher not set up,
+ * hosting) is kept in `lastError` for the detail panel to show.
+ */
+export default class ExtensionPurchaseService extends Service {
+    @service modalsManager;
+    @service notifications;
+    @service fetch;
+    @service intl;
+    @service urlSearchParams;
+    @service extensionPanel;
+    @service extensionInstaller;
+    @service registryContext;
+    @tracked lastError = null;
+    @tracked isStarting = false;
+
+    pollInterval = POLL_INTERVAL;
+    pollTimeout = POLL_TIMEOUT;
+
+    /** Replaced in tests. */
+    redirect = (url) => window.location.assign(url);
+    schedule = (fn, ms) => later(fn, ms);
+
+    /**
+     * Ask the service for a hosted checkout and send the buyer there.
+     */
+    @action async purchase(extension) {
+        const extensionId = extension.public_id ?? extension.id;
+        const returnUrl = checkoutReturnUrl(window.location.href, extensionId);
+        this.lastError = null;
+        this.isStarting = true;
+
+        try {
+            const { url, handoff } = await this.fetch.post('purchases/checkout', { extension: extensionId, return_url: returnUrl, cancel_url: returnUrl }, { namespace: PURCHASE_NAMESPACE });
+            writeStorage(HANDOFF_STORAGE_KEY, { handoff, extension: extensionId, startedAt: Date.now() });
+            this.redirect(url);
+            return { url, handoff };
+        } catch (error) {
+            this.lastError = { extension: extensionId, message: error?.message ?? this.intl.t('registry-bridge.purchase.failed.title') };
+            return null;
+        } finally {
+            this.isStarting = false;
+        }
+    }
+
+    /**
+     * Resume after a checkout redirect. Called once the console has loaded.
+     *
+     * @return {Promise<String|null>} the final status, or null when there was nothing to resume
+     */
+    @action async resume() {
+        if (!this.urlSearchParams.get(RETURN_PARAM) && !this.urlSearchParams.get(HANDOFF_PARAM)) {
+            return null;
+        }
+
+        const extensionId = this.urlSearchParams.get('extension_id');
+        const stored = readStorage(HANDOFF_STORAGE_KEY);
+        const handoff = this.urlSearchParams.get(HANDOFF_PARAM) || (stored && (!extensionId || stored.extension === extensionId) ? stored.handoff : null);
+        const cancelled = this.urlSearchParams.get(CANCELLED_PARAM) === '1';
+        removeUrlParams(HANDOFF_PARAM, CANCELLED_PARAM, RETURN_PARAM);
+        writeStorage(HANDOFF_STORAGE_KEY, null);
+        if (!handoff) {
+            return null;
+        }
+
+        if (cancelled) {
+            const extension = extensionId ? await this.extensionPanel.openById(extensionId) : null;
+            this.showStatus({ phase: 'cancelled', extension, handoff });
+            return 'cancelled';
+        }
+
+        return this.finalize(handoff, extensionId);
+    }
+
+    /**
+     * Show Finalizing and poll the hand-off until it completes, expires, or
+     * the timeout leaves it to the webhook.
+     */
+    async finalize(handoff, extensionId) {
+        const extension = extensionId ? await this.extensionPanel.openById(extensionId) : null;
+        this.showStatus({ phase: 'finalizing', extension, handoff });
+
+        const started = Date.now();
+        let result = { status: 'pending' };
+        while (result.status === 'pending' && Date.now() - started < this.pollTimeout) {
+            try {
+                result = await this.fetch.get(`purchases/${encodeURIComponent(handoff)}`, {}, { namespace: PURCHASE_NAMESPACE });
+            } catch (error) {
+                result = { status: 'pending', message: error?.message };
+            }
+            if (result?.status === 'pending') {
+                await new Promise((resolve) => this.schedule(resolve, this.pollInterval));
+            }
+        }
+
+        const status = result?.status ?? 'pending';
+        const phase = status === 'completed' ? 'success' : status === 'failed' ? 'failed' : 'processing';
+        const refreshed = status === 'completed' ? await this.extensionPanel.reload() : extension;
+        if (status === 'completed') {
+            this.registryContext.loadCounts();
+        }
+        // The context may still have been loading when Finalizing opened
+        await this.registryContext.load();
+        this.modalsManager.setOptions({
+            phase,
+            extension: refreshed ?? extension,
+            organizationName: this.registryContext.organizationName,
+            receiptUrl: result?.receipt_url ?? null,
+            serviceStatus: result?.service_status ?? null,
+            amount: result?.purchase?.amount_total ?? null,
+            currency: result?.purchase?.currency ?? result?.currency ?? null,
+            ...this.statusButtons(phase),
+        });
+
+        return status;
+    }
+
+    statusButtons(phase) {
+        const t = (key) => this.intl.t(`registry-bridge.${key}`);
+        switch (phase) {
+            case 'success':
+                return {
+                    hideFooterActions: false,
+                    acceptButtonText: t('purchase.success.install-now'),
+                    acceptButtonIcon: 'download',
+                    declineButtonText: t('purchase.success.later'),
+                    hideDeclineButton: false,
+                };
+            case 'failed':
+            case 'cancelled':
+                return {
+                    hideFooterActions: false,
+                    acceptButtonText: t('purchase.failed.try-again'),
+                    acceptButtonIcon: 'rotate-right',
+                    declineButtonText: t('common.close'),
+                    hideDeclineButton: false,
+                };
+            case 'processing':
+                return { hideFooterActions: false, acceptButtonText: t('common.close'), acceptButtonIcon: 'check', hideDeclineButton: true };
+            default:
+                return { hideFooterActions: true };
+        }
+    }
+
+    showStatus({ phase, extension, handoff = null }) {
+        return this.modalsManager.show('modals/extension-purchase-status', {
+            title: extension ? this.intl.t('registry-bridge.purchase.title', { name: extension.name }) : this.intl.t('registry-bridge.purchase.finalizing.title'),
+            modalClass: 'flb--extension-modal modal-md',
+            modalHeaderClass: 'flb--extension-modal-header',
+            phase,
+            extension,
+            handoff,
+            organizationName: this.registryContext.organizationName,
+            backdropClose: false,
+            closeButton: false,
+            keepOpen: true,
+            ...this.statusButtons(phase),
+            confirm: (modal) => this.onStatusConfirm(modal),
+            decline: (modal) => modal.done(),
+        });
+    }
+
+    async onStatusConfirm(modal) {
+        const phase = modal.getOption('phase');
+        const extension = modal.getOption('extension');
+        await modal.done();
+
+        if (phase === 'success' && extension) {
+            return this.extensionInstaller.install(extension, { onCompleted: () => this.extensionPanel.reload() });
+        }
+        if ((phase === 'failed' || phase === 'cancelled') && extension) {
+            return this.purchase(extension);
+        }
+    }
+}
diff --git a/addon/services/registry-context.js b/addon/services/registry-context.js
new file mode 100644
index 0000000..000421b
--- /dev/null
+++ b/addon/services/registry-context.js
@@ -0,0 +1,135 @@
+import Service, { inject as service } from '@ember/service';
+import { tracked } from '@glimmer/tracking';
+
+export const CONTEXT_NAMESPACE = '~registry/v1';
+
+/**
+ * What every console user needs to know about the Registry Service this
+ * instance talks to (GET ~registry/v1/registry-extensions/context): its URL,
+ * whether the instance is registered, the registry organization that owns
+ * its licences, the publisher portal to link to and whether paid extensions
+ * can be bought here. Also the sidebar counts
+ * (GET ~registry/v1/registry-extensions/counts).
+ */
+export default class RegistryContextService extends Service {
+    @service fetch;
+    @tracked context = {};
+    @tracked counts = {};
+    @tracked loaded = false;
+    #pending = null;
+    #stopWatching = null;
+    #countsLoadedAt = 0;
+
+    get usesService() {
+        return Boolean(this.context.service_url);
+    }
+
+    get registered() {
+        return this.context.registered === true;
+    }
+
+    get publisherUrl() {
+        return this.context.publisher_url || null;
+    }
+
+    get serviceUrl() {
+        return this.context.service_url || null;
+    }
+
+    get checkoutAvailable() {
+        return this.context.checkout_available === true;
+    }
+
+    get instanceKind() {
+        return this.context.instance_kind ?? 'self_hosted';
+    }
+
+    /** The registry organization this instance is registered to; it owns the licences bought here, not the console company. */
+    get organizationName() {
+        return this.context.organization?.name || null;
+    }
+
+    countOf(key) {
+        const value = this.counts?.[key];
+        return Number.isFinite(Number(value)) && value !== null && value !== undefined ? Number(value) : null;
+    }
+
+    /**
+     * Refresh the sidebar counts (installed, updates, purchased). Failures keep
+     * the last counts; the sidebar then shows none.
+     */
+    async loadCounts() {
+        this.#countsLoadedAt = Date.now();
+        try {
+            this.counts = (await this.fetch.get('registry-extensions/counts', {}, { namespace: CONTEXT_NAMESPACE })) ?? {};
+        } catch {
+            // counts are decoration only
+        }
+        return this.counts;
+    }
+
+    /**
+     * Keep the sidebar counts current without a reload: refresh them when the
+     * console tab becomes visible again and when the user moves between
+     * extensions pages, at most once every `minInterval` ms. A refund or
+     * revoke on the service, or an install from `flb`, then shows up in the
+     * sidebar on its own. Safe to call more than once.
+     */
+    watchCounts(router, { doc = typeof document === 'undefined' ? null : document, minInterval = 15000 } = {}) {
+        if (this.#stopWatching) {
+            return;
+        }
+
+        const refresh = () => {
+            if (Date.now() - this.#countsLoadedAt >= minInterval) {
+                this.loadCounts();
+            }
+        };
+        const onVisible = () => {
+            if (doc.visibilityState !== 'hidden') {
+                refresh();
+            }
+        };
+        const onRoute = (transition) => {
+            if (String(transition?.to?.name ?? '').startsWith('console.extensions')) {
+                refresh();
+            }
+        };
+
+        doc?.addEventListener('visibilitychange', onVisible);
+        router?.on?.('routeDidChange', onRoute);
+        this.#stopWatching = () => {
+            doc?.removeEventListener('visibilitychange', onVisible);
+            router?.off?.('routeDidChange', onRoute);
+        };
+    }
+
+    willDestroy() {
+        this.#stopWatching?.();
+        this.#stopWatching = null;
+        super.willDestroy(...arguments);
+    }
+
+    /**
+     * Load once; later calls share the first request. A failed load leaves
+     * the defaults (no service, not registered) and can be retried.
+     */
+    load() {
+        if (this.loaded) {
+            return Promise.resolve(this.context);
+        }
+        if (!this.#pending) {
+            this.#pending = this.fetch
+                .get('registry-extensions/context', {}, { namespace: CONTEXT_NAMESPACE })
+                .then((context) => {
+                    this.context = context ?? {};
+                    this.loaded = true;
+                    return this.context;
+                })
+                .catch(() => this.context)
+                .finally(() => (this.#pending = null));
+        }
+
+        return this.#pending;
+    }
+}
diff --git a/addon/services/stripe.js b/addon/services/stripe.js
deleted file mode 100644
index ba161b0..0000000
--- a/addon/services/stripe.js
+++ /dev/null
@@ -1,83 +0,0 @@
-import Service from '@ember/service';
-import { tracked } from '@glimmer/tracking';
-import { later } from '@ember/runloop';
-import config from '../config/environment';
-
-const STRIPE_JS_INITIALIZE_DELAY_MS = 900;
-export default class StripeService extends Service {
-    @tracked stripe;
-    @tracked loaded = false;
-
-    constructor() {
-        super(...arguments);
-        this.loadAndInitialize();
-    }
-
-    async initEmbeddedCheckout() {
-        if (!this.stripe) {
-            await this.loadAndInitialize();
-        }
-
-        if (typeof this.stripe.initEmbeddedCheckout === 'function') {
-            return this.stripe.initEmbeddedCheckout(...arguments);
-        }
-
-        throw new Error('Stripe not initialized!');
-    }
-
-    getInstance() {
-        return this.stripe;
-    }
-
-    createStripeInstance(options = {}) {
-        this.stripe = Stripe(config.stripe.publishableKey, options);
-        return this.stripe;
-    }
-
-    async loadAndInitialize() {
-        return new Promise((resolve) => {
-            this.load(() => {
-                resolve(this.createStripeInstance());
-            });
-        });
-    }
-
-    load(callback = null) {
-        const stripeJs = document.querySelector('script[data-stripe-js="loaded"]');
-        if (stripeJs) {
-            later(
-                this,
-                () => {
-                    if (typeof callback === 'function') {
-                        callback();
-                    }
-                },
-                STRIPE_JS_INITIALIZE_DELAY_MS
-            );
-            return;
-        }
-
-        // Create a new script element
-        const script = document.createElement('script');
-        script.src = 'https://js.stripe.com/v3/';
-        script.async = true;
-
-        // Use a data attribute to mark that the script is loaded
-        script.setAttribute('data-stripe-js', 'loaded');
-        script.onload = () => {
-            this.loaded = true;
-            later(
-                this,
-                () => {
-                    if (typeof callback === 'function') {
-                        callback();
-                    }
-                },
-                STRIPE_JS_INITIALIZE_DELAY_MS
-            );
-        };
-
-        // Append the script to the document's head
-        document.head.appendChild(script);
-    }
-}
diff --git a/addon/styles/registry-bridge-engine.css b/addon/styles/registry-bridge-engine.css
index 4ceb3b7..ec6e0cc 100644
--- a/addon/styles/registry-bridge-engine.css
+++ b/addon/styles/registry-bridge-engine.css
@@ -1,37 +1,13 @@
-.developer-extensions-index-container {
-    margin: auto;
-    padding: 2rem 2.25rem;
-}
-
 .flb--modal.flb--default-modal > .flb--modal-dialog > .flb--modal-content > .flb--modal-header,
 .flb--modal.flb--default-modal > .flb--modal-dialog > .flb--modal-content > .flb--modal-header.flb--extension-modal-header {
     align-items: start;
     padding-bottom: 0;
 }
 
-.modal-title--extension-icon-wrapper {
-    width: 5rem;
-    height: 5rem;
-    margin-right: 0.75rem;
-}
-
-.flb--extension-tag {
-    font-size: 0.875rem;
-    line-height: 1.25rem;
-    padding: 0.375rem 1rem;
-    border-radius: 0.5rem;
-}
-
 .flb--modal.flb--extension-modal > .flb--modal-dialog > .flb--modal-content > .flb--modal-body > .modal-body-container {
     padding-top: 0;
 }
 
-.flb--extension-screenshots-container {
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-}
-
 .flb--extension-screenshot {
     width: 150px;
     height: 85px;
@@ -44,17 +20,6 @@ body[data-theme='dark'] .flb--extension-screenshot {
     border: 3px #202a37 solid;
 }
 
-.flb--extension-screenshot-lightbox {
-    position: absolute;
-    z-index: 999999;
-    inset: 0;
-    margin: auto;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    background-color: rgb(0 0 0 / 45%);
-}
-
 .flb--extension-screenshot-lightbox > .flb--extension-screenshot {
     width: 600px;
     height: 350px;
@@ -63,115 +28,6 @@ body[data-theme='dark'] .flb--extension-screenshot {
         0 4px 6px -4px rgb(0 0 0 / 10%);
 }
 
-body[data-theme='dark'] .flb--modal.flb--default-modal.finalize-extension-purchase,
-body[data-theme='light'] .flb--modal.flb--default-modal.finalize-extension-purchase,
-.flb--modal.flb--default-modal.finalize-extension-purchase {
-    pointer-events: none !important;
-}
-
-.flb--modal.flb--default-modal.finalize-extension-purchase > .flb--modal-dialog > .flb--modal-content > .flb--modal-header button.close,
-body[data-theme='dark'] .flb--modal.flb--default-modal.finalize-extension-purchase > .flb--modal-dialog > .flb--modal-content > .flb--modal-header button.close,
-body[data-theme='light'] .flb--modal.flb--default-modal.finalize-extension-purchase > .flb--modal-dialog > .flb--modal-content > .flb--modal-header button.close {
-    display: none !important;
-    pointer-events: none;
-}
-
-.flb--modal.flb--default-modal.stripe-extension-purchase > .flb--modal-dialog > .flb--modal-content,
-body[data-theme='dark'] .flb--modal.flb--default-modal.stripe-extension-purchase > .flb--modal-dialog > .flb--modal-content,
-body[data-theme='light'] .flb--modal.flb--default-modal.stripe-extension-purchase > .flb--modal-dialog > .flb--modal-content {
-    background-color: #fff;
-}
-
-.flb--modal.flb--default-modal.stripe-extension-purchase > .flb--modal-dialog > .flb--modal-content > .flb--modal-header,
-body[data-theme='dark'] .flb--modal.flb--default-modal.stripe-extension-purchase > .flb--modal-dialog > .flb--modal-content > .flb--modal-header,
-body[data-theme='light'] .flb--modal.flb--default-modal.stripe-extension-purchase > .flb--modal-dialog > .flb--modal-content > .flb--modal-header {
-    display: none !important;
-}
-
-.extension-card-container {
-    border-radius: 0.5rem;
-    border: 1px solid #e5e7eb;
-    box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 5%);
-    width: 11rem;
-}
-
-body[data-theme='dark'] .extension-card-container {
-    border-color: #4b5563;
-}
-
-.extension-card-container > .extension-card-icon-container {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    border-radius: 0.5rem 0.5rem 0 0;
-    width: 100%;
-    height: 9rem;
-}
-
-.extension-card-container > .extension-card-icon-container > img {
-    width: 100%;
-    height: 9rem;
-    object-fit: cover;
-    border-radius: 0.5rem 0.5rem 0 0;
-}
-
-.extension-card-container > .extension-card-body-container {
-    text-align: left;
-    padding: 0.5rem 0.75rem;
-    border-radius: 0 0 0.5rem 0.5rem;
-    background-color: white;
-    border-top: 1px solid #e5e7eb;
-    min-height: 5.5rem;
-}
-
-body[data-theme='dark'] .extension-card-container > .extension-card-body-container {
-    border-top-color: #4b5563;
-    background-color: #111827;
-}
-
-.extension-card-grid-container {
-    display: flex;
-    flex-direction: row;
-    align-items: stretch;
-    margin-left: -2rem;
-}
-
-.extension-card-grid-container > * {
-    margin-left: 2rem;
-    margin-bottom: 2rem;
-}
-
-.self-managed-install-instructions {
-    list-style: decimal;
-    color: #000;
-    padding-left: 30px;
-    font-size: 0.85rem;
-    line-height: 1rem;
-}
-
-.self-managed-install-instructions > li {
-    padding-bottom: 1.5rem;
-}
-
-body[data-theme='dark'] .self-managed-install-instructions {
-    list-style: decimal;
-    color: #fff;
-    padding-left: 30px;
-}
-
-.self-managed-install-instructions code {
-    display: flex;
-    font-family: monospace;
-    padding: 0.25rem 0.75rem;
-    box-shadow: 0 1px 2px 0 rgb(0 0 0 / 5%);
-    background-color: #1f2937;
-    border: 1px #374151 solid;
-    color: #86efac;
-    border-radius: 0.5rem;
-    font-size: 0.75rem;
-    line-height: 1rem;
-}
-
 .extension-details-promo-content {
     padding: 0.5rem;
     background-color: #f9fafb;
@@ -277,3 +133,347 @@ body[data-theme='dark'] .extension-details-promo-content table th {
     margin: 1.5rem 0;
     overflow-x: auto;
 }
+
+/* Extension card (canvas C2) */
+.extension-card {
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+}
+
+.extension-card .extension-card-header,
+.extension-card .extension-card-body,
+.extension-card .extension-card-footer {
+    padding: 0.75rem 1rem;
+}
+
+.extension-card .extension-card-body {
+    flex: 1 1 auto;
+    padding-top: 0;
+}
+
+.extension-card-icon {
+    width: 2.5rem;
+    height: 2.5rem;
+    border-radius: 0.5rem;
+    flex-shrink: 0;
+    object-fit: cover;
+}
+
+.extension-card-name {
+    display: block;
+    max-width: 100%;
+    overflow: hidden;
+    text-align: left;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    font-size: 0.875rem;
+    font-weight: 600;
+    color: #111827;
+}
+
+.extension-card-name:hover,
+.extension-card-name:focus-visible {
+    color: #3485e2;
+    text-decoration: underline;
+}
+
+.extension-card-name:focus-visible {
+    outline: 2px solid #3485e2;
+    outline-offset: 2px;
+    border-radius: 0.25rem;
+}
+
+body[data-theme='dark'] .extension-card-name {
+    color: #f3f4f6;
+}
+
+body[data-theme='dark'] .extension-card-name:hover,
+body[data-theme='dark'] .extension-card-name:focus-visible {
+    color: #7dd3fc;
+}
+
+.extension-card-subtitle,
+.extension-card-meta {
+    font-size: 0.75rem;
+    color: #6b7280;
+}
+
+body[data-theme='dark'] .extension-card-subtitle,
+body[data-theme='dark'] .extension-card-meta {
+    color: #9ca3af;
+}
+
+.extension-card-description {
+    display: -webkit-box;
+    overflow: hidden;
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;
+    font-size: 0.75rem;
+    line-height: 1.125rem;
+    color: #374151;
+}
+
+body[data-theme='dark'] .extension-card-description {
+    color: #d1d5db;
+}
+
+.extension-card-badges {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 0.25rem;
+    margin-bottom: 0.5rem;
+}
+
+.extension-card-reason {
+    margin-bottom: 0.5rem;
+    font-size: 0.75rem;
+    line-height: 1rem;
+    color: #92400e;
+}
+
+body[data-theme='dark'] .extension-card-reason {
+    color: #fcd34d;
+}
+
+.extension-card-actions {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    gap: 0.5rem;
+}
+
+/* Explore facets (canvas C1) */
+.explore-facets {
+    display: flex;
+    flex-wrap: wrap;
+    align-items: center;
+    gap: 0.5rem;
+    padding: 0.75rem 1rem 0;
+}
+
+.explore-facet {
+    display: inline-flex;
+    align-items: center;
+    gap: 0.375rem;
+    padding: 0.125rem 0.25rem 0.125rem 0.625rem;
+    border: 1px solid #d1d5db;
+    border-radius: 9999px;
+    font-size: 0.75rem;
+    color: #374151;
+    background-color: #fff;
+}
+
+body[data-theme='dark'] .explore-facet {
+    border-color: #374151;
+    color: #e5e7eb;
+    background-color: #111827;
+}
+
+.explore-facet-clear {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    width: 1.25rem;
+    height: 1.25rem;
+    border-radius: 9999px;
+}
+
+.explore-facet-clear:hover,
+.explore-facet-clear:focus-visible {
+    background-color: rgb(107 114 128 / 15%);
+}
+
+/* Extension detail panel (canvas C4) */
+.extension-panel-header {
+    padding: 1rem 1rem 0.75rem;
+}
+
+.extension-panel-icon {
+    width: 3rem;
+    height: 3rem;
+    border-radius: 0.625rem;
+    flex-shrink: 0;
+}
+
+.extension-panel-title {
+    font-size: 1rem;
+    font-weight: 600;
+    color: #111827;
+}
+
+body[data-theme='dark'] .extension-panel-title {
+    color: #f9fafb;
+}
+
+.extension-panel-subtitle {
+    margin-top: 0.125rem;
+    font-size: 0.8125rem;
+    color: #4b5563;
+}
+
+body[data-theme='dark'] .extension-panel-subtitle {
+    color: #d1d5db;
+}
+
+.extension-panel-cta {
+    display: flex;
+    flex-wrap: wrap;
+    align-items: center;
+    gap: 0.5rem 0.75rem;
+    margin-top: 0.875rem;
+    padding: 0.75rem;
+    border: 1px solid #e5e7eb;
+    border-radius: 0.5rem;
+    background-color: #f9fafb;
+}
+
+body[data-theme='dark'] .extension-panel-cta {
+    border-color: #374151;
+    background-color: #111827;
+}
+
+.extension-panel-cta-note {
+    flex: 1 1 14rem;
+    font-size: 0.75rem;
+    color: #4b5563;
+}
+
+body[data-theme='dark'] .extension-panel-cta-note {
+    color: #9ca3af;
+}
+
+.extension-panel-section {
+    padding: 1rem;
+}
+
+.extension-panel-facts,
+.extension-panel-definitions {
+    display: grid;
+    gap: 0.5rem 1rem;
+    font-size: 0.8125rem;
+}
+
+.extension-panel-facts {
+    grid-template-columns: repeat(auto-fill, minmax(10rem, 1fr));
+}
+
+.extension-panel-definition {
+    display: grid;
+    grid-template-columns: 9rem minmax(0, 1fr);
+    gap: 1rem;
+    padding: 0.375rem 0;
+    border-bottom: 1px solid #f3f4f6;
+}
+
+body[data-theme='dark'] .extension-panel-definition {
+    border-color: #1f2937;
+}
+
+.extension-panel-facts dt,
+.extension-panel-definition dt {
+    color: #6b7280;
+}
+
+.extension-panel-facts dd,
+.extension-panel-definition dd {
+    min-width: 0;
+    overflow-wrap: anywhere;
+    color: #111827;
+}
+
+body[data-theme='dark'] .extension-panel-facts dd,
+body[data-theme='dark'] .extension-panel-definition dd {
+    color: #e5e7eb;
+}
+
+.extension-panel-viewer {
+    margin: 0;
+    border-radius: 0.5rem;
+}
+
+.extension-panel-viewer:focus-visible,
+.extension-panel-thumb:focus-visible {
+    outline: 2px solid #3485e2;
+    outline-offset: 2px;
+}
+
+.extension-panel-viewer-image {
+    width: 100%;
+    max-height: 22rem;
+    object-fit: contain;
+    border-radius: 0.5rem;
+    background-color: #f3f4f6;
+}
+
+body[data-theme='dark'] .extension-panel-viewer-image {
+    background-color: #111827;
+}
+
+.extension-panel-thumb {
+    border-radius: 0.5rem;
+    opacity: 0.7;
+}
+
+.extension-panel-thumb.is-active,
+.extension-panel-thumb:hover {
+    opacity: 1;
+}
+
+.extension-panel-thumb .flb--extension-screenshot {
+    width: 100%;
+    height: 4rem;
+    margin-right: 0;
+    object-fit: cover;
+}
+
+/* Install, update and uninstall modal (canvas C5) */
+.extension-installer-steps {
+    display: flex;
+    flex-direction: column;
+    gap: 0.625rem;
+}
+
+.extension-installer-step {
+    display: flex;
+    align-items: flex-start;
+    gap: 0.625rem;
+}
+
+.extension-installer-step-marker {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    flex-shrink: 0;
+    width: 1.5rem;
+    height: 1.5rem;
+    border: 1px solid #d1d5db;
+    border-radius: 9999px;
+    font-size: 0.75rem;
+    color: #6b7280;
+}
+
+.extension-installer-step.is-done .extension-installer-step-marker {
+    border-color: #16a34a;
+    color: #fff;
+    background-color: #16a34a;
+}
+
+.extension-installer-step.is-active .extension-installer-step-marker {
+    border-color: #3485e2;
+    color: #3485e2;
+}
+
+.extension-installer-step.is-failed .extension-installer-step-marker {
+    border-color: #dc2626;
+    color: #fff;
+    background-color: #dc2626;
+}
+
+.extension-installer-step.is-pending {
+    opacity: 0.7;
+}
+
+.extension-installer-step .fa-spin {
+    animation: none;
+}
diff --git a/addon/templates/application.hbs b/addon/templates/application.hbs
index fa8e531..47343e7 100644
--- a/addon/templates/application.hbs
+++ b/addon/templates/application.hbs
@@ -4,56 +4,59 @@
         @icon="inbox"
         @permission="registry-bridge list extension-install"
         @visible={{can "registry-bridge see extension-install"}}
-    >Installed</Layout::Sidebar::Item>
+        @rightSideStatus={{if this.installedCount "default"}}
+        @rightSideStatusText={{this.installedCount}}
+        @hideRightSideStatusDot={{true}}
+        @disableRightSideStatusHumanize={{true}}
+        data-test-sidebar-installed
+    >{{t "registry-bridge.sidebar.installed"}}</Layout::Sidebar::Item>
     <Layout::Sidebar::Item
         @route="console.extensions.purchased"
         @icon="bag-shopping"
         @permission="registry-bridge list extension-purchase"
         @visible={{can "registry-bridge see extension-purchase"}}
-    >Purchased</Layout::Sidebar::Item>
-    <Layout::Sidebar::Panel @open={{true}} @title="Explore" @visible={{can "registry-bridge see extension"}}>
-        <Layout::Sidebar::Item @route="console.extensions.explore.index" @icon="shapes" @permission="registry-bridge list extension">Explore All</Layout::Sidebar::Item>
-        {{#each @model as |category|}}
-            <LinkTo @route="explore.category" @model={{category.slug}} @disabled={{cannot "registry-bridge list extension"}} class="next-nav-item">
-                <div class="next-nav-item-icon-container">
-                    <FaIcon @icon={{category.icon}} @size="xs" />
-                </div>
-                <div class="truncate w-10/12">{{category.name}}</div>
-                <div class="next-nav-item-right-side" />
-            </LinkTo>
+        @rightSideStatus={{if this.purchasedCount "default"}}
+        @rightSideStatusText={{this.purchasedCount}}
+        @hideRightSideStatusDot={{true}}
+        @disableRightSideStatusHumanize={{true}}
+        data-test-sidebar-purchased
+    >{{t "registry-bridge.sidebar.purchased"}}</Layout::Sidebar::Item>
+    <Layout::Sidebar::Panel @open={{true}} @title={{t "registry-bridge.sidebar.explore"}} @visible={{can "registry-bridge see extension"}}>
+        <Layout::Sidebar::Item @route="console.extensions.explore.index" @icon="shapes" @permission="registry-bridge list extension">{{t "registry-bridge.sidebar.explore-all"}}</Layout::Sidebar::Item>
+        {{#each this.sidebarCategories as |category|}}
+            <Layout::Sidebar::Item
+                @route="console.extensions.explore.category"
+                @model={{category.model}}
+                @icon={{or category.icon "folder"}}
+                @permission="registry-bridge list extension"
+                @rightSideStatus={{if category.count "default"}}
+                @rightSideStatusText={{category.count}}
+                @hideRightSideStatusDot={{true}}
+                @disableRightSideStatusHumanize={{true}}
+                data-test-sidebar-category={{category.slug}}
+            >{{category.name}}</Layout::Sidebar::Item>
         {{/each}}
     </Layout::Sidebar::Panel>
-    {{#if this.selfHostedRegistry}}
-        <Layout::Sidebar::Panel @open={{true}} @title="Developers">
-            <Layout::Sidebar::Item
-                @route="console.extensions.developers.extensions"
-                @icon="box-archive"
-                @permission="registry-bridge list extension-bundle"
-                @visible={{can "registry-bridge see extension-bundle"}}
-            >Extensions</Layout::Sidebar::Item>
-            <Layout::Sidebar::Item
-                @route="console.extensions.developers.analytics"
-                @icon="chart-simple"
-                @permission="registry-bridge list extension-analytic"
-                @visible={{can "registry-bridge see extension-analytic"}}
-            >Analytics</Layout::Sidebar::Item>
-            <Layout::Sidebar::Item
-                @route="console.extensions.developers.payments"
-                @icon="cash-register"
-                @permission="registry-bridge list extension-payment"
-                @visible={{can "registry-bridge see extension-payment"}}
-            >Payments</Layout::Sidebar::Item>
-            <Layout::Sidebar::Item
-                @route="console.extensions.developers.credentials"
-                @icon="key"
-                @permission="registry-bridge list registry-token"
-                @visible={{can "registry-bridge see registry-token"}}
-            >Credentials</Layout::Sidebar::Item>
-        </Layout::Sidebar::Panel>
-    {{/if}}
+    {{!-- The registry context arrives after the first render. EmberWormhole moves its top-level nodes out of
+        place, so a block that appears later must sit inside an element of its own: a top-level {{#if}} here
+        crashes the render ("removeChild ... not a child of this node") when it flips. --}}
+    <div data-test-sidebar-developers>
+        {{#if this.registryContext.publisherUrl}}
+            <Layout::Sidebar::Panel @open={{true}} @title={{t "registry-bridge.sidebar.developers"}}>
+                <Layout::Sidebar::Item
+                    @url={{this.registryContext.publisherUrl}}
+                    @target="_blank"
+                    @icon="arrow-up-right-from-square"
+                    data-test-sidebar-publisher-portal
+                >{{t "registry-bridge.sidebar.publisher-portal"}}</Layout::Sidebar::Item>
+            </Layout::Sidebar::Panel>
+        {{/if}}
+    </div>
     <Spacer @height="200px" />
 </EmberWormhole>
 
 <Layout::Section::Container>
     {{outlet}}
-</Layout::Section::Container>
\ No newline at end of file
+</Layout::Section::Container>
+
+<ExtensionPanel />
diff --git a/addon/templates/developers.hbs b/addon/templates/developers.hbs
deleted file mode 100644
index e2147ca..0000000
--- a/addon/templates/developers.hbs
+++ /dev/null
@@ -1 +0,0 @@
-{{outlet}}
\ No newline at end of file
diff --git a/addon/templates/developers/analytics.hbs b/addon/templates/developers/analytics.hbs
deleted file mode 100644
index 40882d8..0000000
--- a/addon/templates/developers/analytics.hbs
+++ /dev/null
@@ -1,85 +0,0 @@
-<Layout::Section::Header @title="Analytics">
-    <DropdownButton
-        class="h-8"
-        @text={{if this.selectedExtension this.selectedExtension.name "Select Extension"}}
-        @textClass="text-sm mr-2"
-        @buttonClass="flex-row-reverse w-44 justify-between"
-        @icon="caret-down"
-        @iconClass="mr-0i"
-        @size="xs"
-        @iconPrefix="fas"
-        @triggerClass="hidden md:flex"
-        @permission="registry-bridge list extension"
-        @disabled={{not @model}}
-        as |dd|
-    >
-        <div class="next-dd-menu mt-1 mx-0" aria-labelledby="user-menu">
-            <div class="p-1">
-                {{#each @model as |extension|}}
-                    <a href="javascript:;" class="next-dd-item" {{on "click" (dropdown-fn dd this.selectExtension extension)}}>
-                        <div class="flex-1 flex flex-row items-center">
-                            <div class="w-6">
-                                <FaIcon @icon="box-archive" />
-                            </div>
-                            <span>{{extension.name}}</span>
-                        </div>
-                        <div>
-                            {{#if (eq this.selectedExtension.id extension.id)}}
-                                <FaIcon @icon="check" class="text-green-500" />
-                            {{/if}}
-                        </div>
-                    </a>
-                {{/each}}
-            </div>
-        </div>
-    </DropdownButton>
-</Layout::Section::Header>
-
-<Layout::Section::Body class="overflow-y-scroll h-full">
-    <div class="container">
-        <div class="max-w-3xl mx-auto mt-4">
-            <div class="content">
-                <div class="h-10">
-                    {{#if this.getExtensionAnalytics.isRunning}}
-                        <div class="flex items-center justify-center">
-                            <Spinner
-                                @loadingMessage={{concat "Loading analytical metrics for " this.selectedExtension.name}}
-                                @loadingMessageClass="ml-2 text-black dark:text-white"
-                                @wrapperClass="flex flex-row items-center"
-                            />
-                        </div>
-                    {{/if}}
-                </div>
-                {{#if this.selectedExtension}}
-                    <ExtensionModalTitle @extension={{this.selectedExtension}} class="mb-6" />
-                    <div class="grid grid-cols-2 lg:grid-cols-4 gap-4">
-                        {{#each-in this.metrics as |key value|}}
-                            <StatWidget @title={{humanize key}} @value={{value}} />
-                        {{/each-in}}
-                    </div>
-                {{else}}
-                    <div class="flex items-center justify-center flex-col mb-12">
-                        <h1 class="text-black dark:text-white text-lg font-semibold mb-2">Extension Analytics Viewer</h1>
-                        <p class="text-gray-600 dark:text-gray-400">Please select an extension from the list to load and display its associated analytics. Once selected, detailed performance metrics and data
-                            insights will be rendered here.</p>
-                    </div>
-                    <div class="extension-card-grid-container">
-                        {{#each @model as |extension|}}
-                            <button type="button" class="extension-card-container hover:opacity-50" {{on "click" (fn this.selectExtension extension)}}>
-                                <div class="extension-card-icon-container">
-                                    <Image src={{extension.icon_url}} class="w-full h-36 rounded-t-lg" alt={{extension.name}} @fallbackSrc={{config "defaultValues.extensionIcon"}} />
-                                </div>
-                                <div class="extension-card-body-container">
-                                    <div class="flex flex-col">
-                                        <div class="font-semibold text-sm block">{{extension.name}}</div>
-                                        <div class="text-xs truncate">{{n-a extension.description}}</div>
-                                    </div>
-                                </div>
-                            </button>
-                        {{/each}}
-                    </div>
-                {{/if}}
-            </div>
-        </div>
-    </div>
-</Layout::Section::Body>
\ No newline at end of file
diff --git a/addon/templates/developers/credentials.hbs b/addon/templates/developers/credentials.hbs
deleted file mode 100644
index c781ef0..0000000
--- a/addon/templates/developers/credentials.hbs
+++ /dev/null
@@ -1,13 +0,0 @@
-<Layout::Section::Header @title="Credentials">
-    <Button @type="primary" @icon="plus" @iconPrefix="fas" @text="Create new credentials" class="mr-2" @onClick={{this.createCredentials}} @permission="registry-bridge create registry-token" />
-</Layout::Section::Header>
-
-<Layout::Section::Body class="overflow-y-scroll h-full">
-    <Table
-        @rows={{@model}}
-        @columns={{this.columns}}
-        @selectable={{false}}
-        @canSelectAll={{false}}
-        @pagination={{false}}
-    />
-</Layout::Section::Body>
\ No newline at end of file
diff --git a/addon/templates/developers/extensions.hbs b/addon/templates/developers/extensions.hbs
deleted file mode 100644
index e2147ca..0000000
--- a/addon/templates/developers/extensions.hbs
+++ /dev/null
@@ -1 +0,0 @@
-{{outlet}}
\ No newline at end of file
diff --git a/addon/templates/developers/extensions/edit.hbs b/addon/templates/developers/extensions/edit.hbs
deleted file mode 100644
index 4d6ceea..0000000
--- a/addon/templates/developers/extensions/edit.hbs
+++ /dev/null
@@ -1,49 +0,0 @@
-<Layout::Section::Header @title={{concat (t "registry-bridge.developers.extensions.extension") ": " @model.name}}>
-    <div class="flex items-center mr-2">
-        <Badge @status={{@model.status}} />
-    </div>
-    <Button @type="default" @size="sm" @icon="arrow-left" @text={{t "common.back"}} @onClick={{transition-to "developers.extensions"}} @wrapperClass="mr-2" />
-    <Button @type="primary" @size="sm" @icon="save" @text={{t "common.save"}} @onClick={{perform this.save}} @isLoading={{not this.save.isIdle}} @wrapperClass="mr-2" @permission="registry-bridge update registry-bundle" />
-    <Button
-        @type="magic"
-        @size="sm"
-        @icon="paper-plane"
-        @text={{t "registry-bridge.developers.extensions.extension-form.submit-for-review"}}
-        @helpText={{this.isReadyMessage}}
-        @onClick={{this.submitForReview}}
-        @disabled={{not this.isReady}}
-        @isLoading={{not this.startReview.isIdle}}
-        @permission="registry-bridge submit registry-bundle"
-    />
-</Layout::Section::Header>
-
-<Layout::Section::Body class="overflow-y-scroll h-full">
-    <div class="section-header-actions w-full overflow-x-scroll lg:overflow-x-auto py-4 px-10">
-        <div class="fleetops-pill-tabs">
-            <nav>
-                <LinkTo @route="developers.extensions.edit.index" class="ui-tab">
-                    <FaIcon @icon="cog" class="mr-1" />
-                    <span>{{t "registry-bridge.developers.extensions.submission"}}</span>
-                </LinkTo>
-                <LinkTo @route="developers.extensions.edit.details" class="ui-tab">
-                    <FaIcon @icon="circle-info" class="mr-1" />
-                    <span>{{t "registry-bridge.developers.extensions.details"}}</span>
-                </LinkTo>
-                <LinkTo @route="developers.extensions.edit.bundles" class="ui-tab">
-                    <FaIcon @icon="box-archive" class="mr-1" />
-                    <span>{{t "registry-bridge.developers.extensions.bundles"}}</span>
-                </LinkTo>
-                <LinkTo @route="developers.extensions.edit.monetize" class="ui-tab">
-                    <FaIcon @icon="money-bill-1" class="mr-1" />
-                    <span>{{t "registry-bridge.developers.extensions.monetize"}}</span>
-                </LinkTo>
-            </nav>
-        </div>
-    </div>
-    <div class="container">
-        <div class="max-w-3xl mx-auto mt-4">
-            {{outlet}}
-        </div>
-    </div>
-    <Spacer @height="500px" />
-</Layout::Section::Body>
\ No newline at end of file
diff --git a/addon/templates/developers/extensions/edit/bundles.hbs b/addon/templates/developers/extensions/edit/bundles.hbs
deleted file mode 100644
index 91e6ba1..0000000
--- a/addon/templates/developers/extensions/edit/bundles.hbs
+++ /dev/null
@@ -1,71 +0,0 @@
-<div class="flex-1">
-    <ContentPanel @title={{t "registry-bridge.developers.extensions.extension-form.bundles"}} @open={{true}} @wrapperClass="bordered-classic">
-        <div class="px-4 pb-4 pt-2">
-            <div>
-                <FileUpload
-                    @name={{t "registry-bridge.developers.extensions.extension-form.upload-new-bundle"}}
-                    @accept={{join "," this.acceptedBundleTypes}}
-                    @onFileAdded={{perform this.uploadBundle}}
-                    as |queue|
-                >
-                    <a tabindex={{0}} class="flex items-center px-0 mt-2 text-xs no-underline truncate btn btn-sm btn-default" disabled={{not queue.files.length}}>
-                        {{#if queue.files.length}}
-                            <div class="mr-1.5">
-                                <Spinner />
-                            </div>
-                            <span>
-                                {{t "common.uploading"}}
-                            </span>
-                        {{else}}
-                            <FaIcon @icon="box-archive" class="mr-1.5" />
-                            <span>
-                                {{t "registry-bridge.developers.extensions.extension-form.upload-new-bundle"}}
-                            </span>
-                        {{/if}}
-                    </a>
-                </FileUpload>
-            </div>
-            {{#unless this.createBundle.isIdle}}
-                <div class="flex flex-row items-center mt-4">
-                    <Spinner @wrapperClass="flex flex-row items-center space-x-2" @loadingMessage="Creating a new bundle..." />
-                </div>
-            {{/unless}}
-            {{#if this.lastError}}
-                <div class="flex flex-row items-center mt-4 rounded-lg shadow-sm bg-red-100 border-red-200 text-red-900 px-4 py-2 text-xs">
-                    <FaIcon @icon="triangle-exclamation" @size="sm" class="text-red-800" />
-                    <span class="ml-2">{{this.lastError}}</span>
-                </div>
-            {{/if}}
-        </div>
-        {{#if @model.length}}
-            <div class="next-table-wrapper auto-height">
-                <table>
-                    <thead>
-                        <tr>
-                            <th {{set-width "175px"}}>ID</th>
-                            <th {{set-width "145px"}}>Filename</th>
-                            <th {{set-width "80px"}}>Bundle</th>
-                            <th {{set-width "80px"}}>Version</th>
-                            <th {{set-width "165px"}}>Date Uploaded</th>
-                            <th>Status</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        {{#each @model as |bundle|}}
-                            <tr>
-                                <td>{{bundle.bundle_id}}</td>
-                                <td>{{bundle.bundle_filename}}</td>
-                                <td>{{bundle.bundle_number}}</td>
-                                <td>{{bundle.version}}</td>
-                                <td>{{bundle.createdAt}}</td>
-                                <td>
-                                    <Badge @status={{bundle.status}} />
-                                </td>
-                            </tr>
-                        {{/each}}
-                    </tbody>
-                </table>
-            </div>
-        {{/if}}
-    </ContentPanel>
-</div>
\ No newline at end of file
diff --git a/addon/templates/developers/extensions/edit/details.hbs b/addon/templates/developers/extensions/edit/details.hbs
deleted file mode 100644
index c813c83..0000000
--- a/addon/templates/developers/extensions/edit/details.hbs
+++ /dev/null
@@ -1,16 +0,0 @@
-<div class="flex-1">
-    <ContentPanel @title={{t "registry-bridge.developers.extensions.extension-form.details"}} @open={{true}} @wrapperClass="bordered-classic">
-        <InputGroup
-            @name={{t "registry-bridge.developers.extensions.extension-form.extension-id"}}
-            @value={{@model.public_id}}
-            @disabled={{true}}
-            @helpText={{t "registry-bridge.developers.extensions.extension-form.extension-id-help-text"}}
-        />
-        <InputGroup
-            @name={{t "registry-bridge.developers.extensions.extension-form.bundle-id"}}
-            @value={{@model.current_bundle_id}}
-            @disabled={{true}}
-            @helpText={{t "registry-bridge.developers.extensions.extension-form.bundle-id-help-text"}}
-        />
-    </ContentPanel>
-</div>
\ No newline at end of file
diff --git a/addon/templates/developers/extensions/edit/index.hbs b/addon/templates/developers/extensions/edit/index.hbs
deleted file mode 100644
index c57057d..0000000
--- a/addon/templates/developers/extensions/edit/index.hbs
+++ /dev/null
@@ -1 +0,0 @@
-<ExtensionForm @extension={{@model}} />
\ No newline at end of file
diff --git a/addon/templates/developers/extensions/edit/monetize.hbs b/addon/templates/developers/extensions/edit/monetize.hbs
deleted file mode 100644
index df3a148..0000000
--- a/addon/templates/developers/extensions/edit/monetize.hbs
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="flex-1">
-    <ExtensionMonetizeForm @extension={{@model}} />
-</div>
\ No newline at end of file
diff --git a/addon/templates/developers/extensions/index.hbs b/addon/templates/developers/extensions/index.hbs
deleted file mode 100644
index cacd751..0000000
--- a/addon/templates/developers/extensions/index.hbs
+++ /dev/null
@@ -1,34 +0,0 @@
-<Layout::Section::Header @title={{t "registry-bridge.developers.extensions.extensions"}}>
-    <Button
-        @type="primary"
-        @size="sm"
-        @icon="circle-plus"
-        @text={{t "registry-bridge.developers.extensions.create-new-extension"}}
-        @onClick={{transition-to "developers.extensions.new"}}
-        @permission="registry-bridge create registry-bundle"
-    />
-</Layout::Section::Header>
-
-<Layout::Section::Body class="overflow-y-scroll h-full">
-    <Layout::Resource::CardsGrid
-        @resource="registry-extension"
-        @data={{filter-by "isNew" false @model}}
-        @gap="sm"
-        @columns="4"
-        @showPagination={{true}}
-        @page={{this.page}}
-        @onPageChange={{fn (mut this.page)}}
-        @paginationMeta={{@model.meta}}
-        @containerClass="p-4"
-        class="h-full"
-        as |Item|
-    >
-        <ExtensionCard @resource={{Item.model}}>
-            <:footer>
-                <div class="flex flex-row items-center space-x-1">
-                    <Button @icon="eye" @size="xs" @onClick={{fn (transition-to "developers.extensions.edit" Item.model)}} />
-                </div>
-            </:footer>
-        </ExtensionCard>
-    </Layout::Resource::CardsGrid>
-</Layout::Section::Body>
\ No newline at end of file
diff --git a/addon/templates/developers/extensions/new.hbs b/addon/templates/developers/extensions/new.hbs
deleted file mode 100644
index 467e523..0000000
--- a/addon/templates/developers/extensions/new.hbs
+++ /dev/null
@@ -1,42 +0,0 @@
-<Layout::Section::Header @title={{t "registry-bridge.developers.extensions.new-extension"}} />
-
-<Layout::Section::Body class="overflow-y-scroll h-full">
-    <div class="container">
-        <div class="max-w-3xl mx-auto mt-4">
-            <div class="flex-1 px-6">
-                <ContentPanel @title={{t "registry-bridge.developers.extensions.extension-form.details-content-block"}} @open={{true}} @wrapperClass="bordered-classic">
-                    <InputGroup
-                        @name={{t "registry-bridge.developers.extensions.extension-form.extension-name"}}
-                        @value={{this.extension.name}}
-                        @helpText={{t "registry-bridge.developers.extensions.extension-form.extension-name-help-text"}}
-                    />
-                    <InputGroup
-                        @name={{t "registry-bridge.developers.extensions.extension-form.extension-description"}}
-                        @wrapperClass="mb-0i"
-                        @helpText={{t "registry-bridge.developers.extensions.extension-form.extension-description-help-text"}}
-                    >
-                        <Textarea
-                            @value={{this.extension.description}}
-                            placeholder={{t "registry-bridge.developers.extensions.extension-form.extension-description"}}
-                            class="form-input w-full"
-                            rows="3"
-                        />
-                    </InputGroup>
-                </ContentPanel>
-                <div class="mt-4 flex items-center space-x-4">
-                    <Button
-                        @size="lg"
-                        @type="primary"
-                        @text="Continue"
-                        @icon="check"
-                        @onClick={{perform this.save}}
-                        @isLoading={{not this.save.isIdle}}
-                        @permission="registry-bridge create registry-bundle"
-                    />
-                    <Button @size="lg" @type="default" @text="Cancel" @icon="times" @onClick={{this.cancel}} />
-                </div>
-            </div>
-        </div>
-    </div>
-    <Spacer @height="500px" />
-</Layout::Section::Body>
\ No newline at end of file
diff --git a/addon/templates/developers/payments.hbs b/addon/templates/developers/payments.hbs
deleted file mode 100644
index e2147ca..0000000
--- a/addon/templates/developers/payments.hbs
+++ /dev/null
@@ -1 +0,0 @@
-{{outlet}}
\ No newline at end of file
diff --git a/addon/templates/developers/payments/index.hbs b/addon/templates/developers/payments/index.hbs
deleted file mode 100644
index 718de26..0000000
--- a/addon/templates/developers/payments/index.hbs
+++ /dev/null
@@ -1,48 +0,0 @@
-<Layout::Section::Header @title="Payments">
-    {{#if this.hasStripeConnectAccount}}
-        <div class="flex items-center space-x-4">
-            <LinkTo @route="developers.payments.settings" class="btn btn-primary">
-                <FaIcon @icon="cog" class="mr-1" />
-                {{t "registry-bridge.developers.payments.manage-account"}}
-            </LinkTo>
-            <div class="flex flex-row space-x-1">
-                <span class="text-sm text-black dark:text-white font-bold">Total Amount:</span>
-                <span class="text-sm text-black dark:text-white">{{format-currency @model.total_amount "USD"}}</span>
-            </div>
-        </div>
-    {{/if}}
-</Layout::Section::Header>
-
-<Layout::Section::Body class="overflow-y-scroll h-full">
-    {{#if this.lookupStripeConnectAccount.isRunning}}
-        <div class="flex items-center justify-center flex-1 p-4">
-            <Spinner @loadingMessage="Loading monetization settings..." @loadingMessageClass="ml-2 text-black dark:text-white" @wrapperClass="flex flex-row items-center" />
-        </div>
-    {{else}}
-        {{#if this.hasStripeConnectAccount}}
-            <Table
-                @rows={{@model.data}}
-                @columns={{this.columns}}
-                @selectable={{false}}
-                @canSelectAll={{false}}
-                @onSetup={{fn (mut this.table)}}
-                @pagination={{true}}
-                @paginationMeta={{@model.meta}}
-                @page={{this.page}}
-                @onPageChange={{fn (mut this.page)}}
-            />
-        {{else}}
-            <div class="container">
-                <div class="max-w-3xl mx-auto mt-4">
-                    <div class="content">
-                        <div class="flex flex-col items-center justify-center">
-                            <h1 class="text-lg font-semibold mb-1">Your account is not setup to accept payments yet.</h1>
-                            <p class="text-sm mb-2">To accept payments for extensions, you must complete the onboard process via Stripe.</p>
-                            <Button @type="primary" @size="lg" @text="Start payments onboard" @onClick={{transition-to "developers.payments.onboard"}} @permission="registry-bridge onboard extension-payment" />
-                        </div>
-                    </div>
-                </div>
-            </div>
-        {{/if}}
-    {{/if}}
-</Layout::Section::Body>
\ No newline at end of file
diff --git a/addon/templates/developers/payments/onboard.hbs b/addon/templates/developers/payments/onboard.hbs
deleted file mode 100644
index 1ad16f8..0000000
--- a/addon/templates/developers/payments/onboard.hbs
+++ /dev/null
@@ -1,48 +0,0 @@
-<Layout::Section::Header @title="Payments Onboard" />
-
-<Layout::Section::Body class="overflow-y-scroll h-full">
-    <div class="container">
-        <div class="max-w-3xl mx-auto mt-4">
-            <div class="content">
-                <div class="onboard-header">
-                    <h2 id="title" class="text-base font-semibold mb-1 {{if this.onboardCompleted 'text-green-700'}}">
-                        {{#if this.onboardCompleted}}
-                            <FaIcon @icon="check" @size="sm" class="text-green-700" />
-                            Onboarding was completed successfully!
-                        {{else}}
-                            Complete this onboard process to accept payments via Fleetbase.
-                        {{/if}}
-                    </h2>
-                    <p id="subtitle" class="text-sm mb-2">
-                        {{#if this.onboardCompleted}}
-                            Your onboard was successful and you're now able to sell and receive payments for published extensions.
-                        {{else}}
-                            Extension authors who wish to receive payments for their published extensions must complete this onboarding.
-                        {{/if}}
-                    </p>
-                    <div class="flex mb-2">
-                        {{#if this.onboardCompleted}}
-                            <Button @icon="check" @type="primary" @size="lg" @text="Continue" @onClick={{transition-to "developers.payments"}} @disabled={{this.onboardInProgress}} />
-                        {{else}}
-                            <Button
-                                @icon="play"
-                                @type="default"
-                                @size="lg"
-                                @text={{if this.onboardInProgress "Onboard in progress" "Start onboard now"}}
-                                @onClick={{perform this.startOnboard}}
-                                @isLoading={{this.startOnboard.isRunning}}
-                                @disabled={{this.onboardInProgress}}
-                            />
-                        {{/if}}
-                    </div>
-                </div>
-                <div
-                    id="embedded-onboarding-container"
-                    class="p-4 min-h-20 bg-gray-50 dark:bg-gray-100 shadow-md rounded-lg border border-gray-300 dark:border-gray-900 {{unless this.onboardInProgress 'hidden'}}"
-                    {{did-insert (fn this.createTrackedElement "embeddedOnboardingContainer")}}
-                >
-                </div>
-            </div>
-        </div>
-    </div>
-</Layout::Section::Body>
\ No newline at end of file
diff --git a/addon/templates/developers/payments/settings.hbs b/addon/templates/developers/payments/settings.hbs
deleted file mode 100644
index 6d7a99c..0000000
--- a/addon/templates/developers/payments/settings.hbs
+++ /dev/null
@@ -1,30 +0,0 @@
-<Layout::Section::Header @title={{t "registry-bridge.developers.payments.settings.title"}} />
-
-<Layout::Section::Body class="overflow-y-scroll h-full">
-    <div class="container">
-        <div class="max-w-5xl mx-auto mt-4">
-            <div class="content">
-                <div class="mb-4">
-                    <p class="text-sm text-gray-700 dark:text-gray-300">
-                        {{t "registry-bridge.developers.payments.settings.description"}}
-                    </p>
-                </div>
-                {{#if this.isLoading}}
-                    <div class="flex items-center justify-center p-8">
-                        <Spinner
-                            @loadingMessage={{t "registry-bridge.developers.payments.settings.loading"}}
-                            @loadingMessageClass="ml-2 text-black dark:text-white"
-                            @wrapperClass="flex flex-row items-center"
-                        />
-                    </div>
-                {{/if}}
-                <div
-                    id="account-management-container"
-                    {{did-insert this.setupStripe}}
-                    class="p-4 min-h-20 bg-gray-50 dark:bg-gray-100 shadow-md rounded-lg border border-gray-300 dark:border-gray-900"
-                >
-                </div>
-            </div>
-        </div>
-    </div>
-</Layout::Section::Body>
\ No newline at end of file
diff --git a/addon/templates/explore/category.hbs b/addon/templates/explore/category.hbs
index f160d9c..3e7c248 100644
--- a/addon/templates/explore/category.hbs
+++ b/addon/templates/explore/category.hbs
@@ -1,23 +1 @@
-<Layout::Section::Header @searchQuery={{this.query}} @onSearch={{perform this.search}} @title={{this.title}} />
-
-<Layout::Section::Body class="overflow-y-scroll h-full">
-    {{#if @model.length}}
-        <Layout::Resource::CardsGrid
-            @resource="registry-extension"
-            @data={{@model}}
-            @gap="sm"
-            @columns="4"
-            @showPagination={{true}}
-            @page={{this.page}}
-            @onPageChange={{fn (mut this.page)}}
-            @paginationMeta={{@model.meta}}
-            @containerClass="p-4"
-            class="h-full"
-            as |Item|
-        >
-            <ExtensionCard @resource={{Item.model}} />
-        </Layout::Resource::CardsGrid>
-    {{else}}
-        <ExploreEmptyState />
-    {{/if}}
-</Layout::Section::Body>
+<ExploreCatalog @catalog={{this}} />
diff --git a/addon/templates/explore/index.hbs b/addon/templates/explore/index.hbs
index ec3bd2c..3e7c248 100644
--- a/addon/templates/explore/index.hbs
+++ b/addon/templates/explore/index.hbs
@@ -1,23 +1 @@
-<Layout::Section::Header @searchQuery={{this.query}} @onSearch={{perform this.search}} @title={{t "registry-bridge.developers.extensions.explore.explore-extensions"}} />
-
-<Layout::Section::Body class="overflow-y-scroll h-full">
-    {{#if @model.length}}
-        <Layout::Resource::CardsGrid
-            @resource="registry-extension"
-            @data={{@model}}
-            @gap="sm"
-            @columns="4"
-            @showPagination={{true}}
-            @page={{this.page}}
-            @onPageChange={{fn (mut this.page)}}
-            @paginationMeta={{@model.meta}}
-            @containerClass="p-4"
-            class="h-full"
-            as |Item|
-        >
-            <ExtensionCard @resource={{Item.model}} />
-        </Layout::Resource::CardsGrid>
-    {{else}}
-        <ExploreEmptyState />
-    {{/if}}
-</Layout::Section::Body>
+<ExploreCatalog @catalog={{this}} />
diff --git a/addon/templates/installed.hbs b/addon/templates/installed.hbs
index ed2991c..46a0543 100644
--- a/addon/templates/installed.hbs
+++ b/addon/templates/installed.hbs
@@ -1,32 +1,63 @@
-<Layout::Section::Header @title={{t "registry-bridge.installed.title"}} />
-
-<Layout::Section::Body class="overflow-y-scroll h-full">
-    <div class="m-auto p-8">
-        <div class="extension-card-grid-container">
-            {{#each @model as |extension|}}
-                <div class="extension-card-container">
-                    <div class="extension-card-icon-container">
-                        <Image src={{extension.icon_url}} alt={{extension.name}} @fallbackSrc={{config "defaultValues.extensionIcon"}} />
-                    </div>
-                    <div class="extension-card-body-container">
-                        <div class="flex flex-col">
-                            <div class="font-semibold text-sm block">{{extension.name}}</div>
-                            <div class="text-xs">{{n-a extension.description}}</div>
-                        </div>
-                        <div class="flex flex-col flex-1 pt-1 space-y-2">
-                            <Button
-                                @type="default"
-                                @text={{t "registry-bridge.common.about-extension" extensionName=extension.name}}
-                                @icon="circle-info"
-                                @onClick={{fn this.about extension}}
-                                class="w-full btn-block"
-                            />
-                            <Button @type="danger" @text={{t "registry-bridge.common.uninstall"}} @icon="trash" @onClick={{fn this.uninstall extension}} class="w-full btn-block" />
-                        </div>
-                    </div>
-                </div>
-            {{/each}}
-        </div>
-    </div>
-    <Spacer @height="300px" />
-</Layout::Section::Body>
\ No newline at end of file
+<Layout::Resource::Tabular
+    @resource="registry-extension"
+    @title={{t "registry-bridge.installed.title"}}
+    @searchQuery={{this.query}}
+    @onSearch={{perform this.search}}
+    @data={{this.rows}}
+    @columns={{this.columns}}
+    @controller={{this}}
+    @selectable={{false}}
+    @canSelectAll={{false}}
+    @pagination={{false}}
+    @hideColumnsPicker={{not this.isTable}}
+    @onReload={{perform this.load}}
+    data-test-installed
+>
+    <:header>
+        {{#if this.updatesAvailable}}
+            <Badge @status="info" @hideStatusDot={{true}} @disableHumanize={{true}} data-test-installed-updates>{{t "registry-bridge.installed.updates-available" count=this.updatesAvailable}}</Badge>
+        {{/if}}
+        <Button @icon={{if this.isTable "table-cells-large" "table-list"}} @size="xs" @helpText={{if this.isTable (t "registry-bridge.explore.layout.grid") (t "registry-bridge.explore.layout.table")}} @onClick={{fn this.setLayout (if this.isTable "grid" "table")}} aria-label={{if this.isTable (t "registry-bridge.explore.layout.grid") (t "registry-bridge.explore.layout.table")}} data-test-installed-layout />
+    </:header>
+    <:default as |rows|>
+        {{#if this.load.isRunning}}
+            <div class="p-4" aria-busy="true" data-test-installed-loading>
+                {{#if this.isTable}}<Skeleton::Table @rows={{7}} @columns={{6}} @checkbox={{false}} />{{else}}<Skeleton::CardsGrid @count={{8}} @columns={{4}} @hideMedia={{true}} @avatar={{true}} @status="badge" @lines={{2}} @footerActions={{1}} />{{/if}}
+            </div>
+        {{else if this.error}}
+            <div class="p-4" data-test-installed-error>
+                <InfoBlock @type="danger" @icon="triangle-exclamation">
+                    <div>{{t "registry-bridge.installed.error"}}</div>
+                    <div class="mt-2"><Button @size="xs" @icon="rotate-right" @text={{t "registry-bridge.common.retry"}} @onClick={{perform this.load}} /></div>
+                </InfoBlock>
+            </div>
+        {{else if this.isTable}}
+            <Table
+                @rows={{rows}}
+                @columns={{this.columns}}
+                @selectable={{false}}
+                @canSelectAll={{false}}
+                @pagination={{false}}
+                @searchQuery={{this.query}}
+                @emptyStateComponent={{component
+                    "table/empty-state"
+                    icon="inbox"
+                    title=(t "registry-bridge.installed.empty.title")
+                    description=(t "registry-bridge.installed.empty.body")
+                    filteredTitle=(t "registry-bridge.installed.empty.filtered")
+                    primaryText=(t "registry-bridge.installed.empty.explore")
+                    primaryIcon="shapes"
+                    primaryAction=this.explore
+                    secondaryText=(t "registry-bridge.installed.empty.purchased")
+                    secondaryIcon="bag-shopping"
+                    secondaryAction=this.purchased
+                }}
+                data-test-installed-table
+            />
+        {{else}}
+            <Layout::Resource::CardsGrid @resource="registry-extension" @data={{rows}} @gap="sm" @columns="4" @containerClass="p-4" @emptyStateText={{t "registry-bridge.installed.empty.body"}} as |Item|>
+                <ExtensionCard @resource={{Item.model}} />
+            </Layout::Resource::CardsGrid>
+        {{/if}}
+    </:default>
+</Layout::Resource::Tabular>
diff --git a/addon/templates/purchased.hbs b/addon/templates/purchased.hbs
index 47db6a1..a433698 100644
--- a/addon/templates/purchased.hbs
+++ b/addon/templates/purchased.hbs
@@ -1,16 +1,69 @@
-<Layout::Section::Header @title={{t "registry-bridge.purchased.title"}} />
-
-<Layout::Section::Body class="overflow-y-scroll h-full">
-    <div class="m-auto p-8">
-        <div class="extension-card-grid-container">
-            {{#each @model as |extension|}}
-                <ExtensionCard @resource={{extension}}>
-                    {{#if extension.is_installed}}
-                        <Badge @status="success" @hideStatusDot={{true}} class="mt-1"><FaIcon @icon="check" class="mr-1" /> Installed</Badge>
-                    {{/if}}
-                </ExtensionCard>
-            {{/each}}
-        </div>
-    </div>
-    <Spacer @height="300px" />
-</Layout::Section::Body>
\ No newline at end of file
+<Layout::Resource::Tabular
+    @resource="registry-extension"
+    @title={{t "registry-bridge.purchased.title"}}
+    @searchQuery={{this.query}}
+    @onSearch={{perform this.search}}
+    @data={{this.rows}}
+    @columns={{this.columns}}
+    @controller={{this}}
+    @selectable={{false}}
+    @canSelectAll={{false}}
+    @pagination={{false}}
+    @hideColumnsPicker={{not this.isTable}}
+    @onReload={{perform this.load}}
+    data-test-purchased
+>
+    <:header>
+        {{#if this.blockedCount}}
+            <Badge
+                @status="warning"
+                @hideStatusDot={{true}}
+                @disableHumanize={{true}}
+                @helpText={{t "registry-bridge.purchased.blocked-help"}}
+                data-test-purchased-blocked
+            >{{t "registry-bridge.purchased.blocked" count=this.blockedCount}}</Badge>
+        {{/if}}
+        {{#if this.readyToInstall}}
+            <Badge @status="info" @hideStatusDot={{true}} @disableHumanize={{true}} data-test-purchased-ready>{{t "registry-bridge.purchased.ready" count=this.readyToInstall}}</Badge>
+        {{/if}}
+        <Button @icon={{if this.isTable "table-cells-large" "table-list"}} @size="xs" @helpText={{if this.isTable (t "registry-bridge.explore.layout.grid") (t "registry-bridge.explore.layout.table")}} @onClick={{fn this.setLayout (if this.isTable "grid" "table")}} aria-label={{if this.isTable (t "registry-bridge.explore.layout.grid") (t "registry-bridge.explore.layout.table")}} data-test-purchased-layout />
+    </:header>
+    <:default as |rows|>
+        {{#if this.load.isRunning}}
+            <div class="p-4" aria-busy="true" data-test-purchased-loading>
+                {{#if this.isTable}}<Skeleton::Table @rows={{7}} @columns={{7}} @checkbox={{false}} />{{else}}<Skeleton::CardsGrid @count={{8}} @columns={{4}} @hideMedia={{true}} @avatar={{true}} @status="badge" @lines={{2}} @footerActions={{1}} />{{/if}}
+            </div>
+        {{else if this.error}}
+            <div class="p-4" data-test-purchased-error>
+                <InfoBlock @type="danger" @icon="triangle-exclamation">
+                    <div>{{t "registry-bridge.purchased.error"}}</div>
+                    <div class="mt-2"><Button @size="xs" @icon="rotate-right" @text={{t "registry-bridge.common.retry"}} @onClick={{perform this.load}} /></div>
+                </InfoBlock>
+            </div>
+        {{else if this.isTable}}
+            <Table
+                @rows={{rows}}
+                @columns={{this.columns}}
+                @selectable={{false}}
+                @canSelectAll={{false}}
+                @pagination={{false}}
+                @searchQuery={{this.query}}
+                @emptyStateComponent={{component
+        "table/empty-state"
+        icon="bag-shopping"
+        title=(t "registry-bridge.purchased.empty.title")
+        description=(t "registry-bridge.purchased.empty.body" organization=this.organizationName)
+        filteredTitle=(t "registry-bridge.installed.empty.filtered")
+        primaryText=(t "registry-bridge.purchased.empty.browse")
+        primaryIcon="shapes"
+        primaryAction=this.browsePaid
+    }}
+                data-test-purchased-table
+            />
+        {{else}}
+            <Layout::Resource::CardsGrid @resource="registry-extension" @data={{rows}} @gap="sm" @columns="4" @containerClass="p-4" @emptyStateText={{t "registry-bridge.purchased.empty.body" organization=this.organizationName}} as |Item|>
+                <ExtensionCard @resource={{Item.model}} />
+            </Layout::Resource::CardsGrid>
+        {{/if}}
+    </:default>
+</Layout::Resource::Tabular>
diff --git a/addon/utils/extension-state.js b/addon/utils/extension-state.js
new file mode 100644
index 0000000..6f30065
--- /dev/null
+++ b/addon/utils/extension-state.js
@@ -0,0 +1,192 @@
+/**
+ * What an extension card and the detail panel show for a Registry Service
+ * listing: one of the card states (canvas C2) and the call to action in the
+ * detail panel (canvas C4). Pure functions over the record's fields so they
+ * can be tested without the app.
+ *
+ * Labels are returned as `{ key, params }` under `registry-bridge.*`; the
+ * components translate them.
+ */
+
+export const CARD_STATES = ['free', 'paid', 'on-sale', 'installed', 'update', 'purchased', 'unavailable'];
+
+/** Install blocks that mean "not on this instance" rather than "not yet": the card says so. */
+export const UNAVAILABLE_CODES = ['hosting', 'no_release'];
+
+export const CTA = {
+    INSTALL: 'install',
+    PURCHASE: 'purchase',
+    INSTALLED: 'installed',
+    UPDATE: 'update',
+    UNAUTHORIZED: 'unauthorized',
+    AUTHOR: 'author',
+    REGISTRATION: 'registration-required',
+    BLOCKED: 'blocked',
+};
+
+export const PERMISSIONS = {
+    install: 'registry-bridge install extension',
+    uninstall: 'registry-bridge uninstall extension',
+    purchase: 'registry-bridge purchase extension',
+};
+
+const label = (key, params = {}) => ({ key: `registry-bridge.${key}`, params });
+
+function get(record, path) {
+    return path.split('.').reduce((value, key) => (value === null || value === undefined ? undefined : value[key]), record);
+}
+
+function toNumber(value) {
+    const number = Number(value);
+    return Number.isFinite(number) ? number : 0;
+}
+
+/**
+ * The price shown on a card: free, the list price, or the sale price with the
+ * list price struck through. Amounts are in the currency's minor unit, as
+ * `format-currency` expects.
+ */
+export function priceOf(extension = {}) {
+    const currency = extension.currency || 'USD';
+    if (extension.payment_required !== true) {
+        return { free: true, amount: 0, original: null, currency };
+    }
+
+    const price = toNumber(extension.price);
+    const sale = toNumber(extension.sale_price);
+    if (extension.on_sale === true && sale > 0 && sale < price) {
+        return { free: false, amount: sale, original: price, currency };
+    }
+
+    return { free: false, amount: price, original: null, currency };
+}
+
+/** Why this instance cannot install the listing, when it is about the instance rather than a licence. */
+export function unavailableReason(extension = {}) {
+    const code = get(extension, 'meta.install_blocked_code');
+    return extension.is_installed !== true && UNAVAILABLE_CODES.includes(code) ? get(extension, 'meta.install_blocked_reason') || null : null;
+}
+
+export function cardState(extension = {}) {
+    if (extension.is_installed === true && extension.update_available === true) {
+        return 'update';
+    }
+    if (extension.is_installed === true) {
+        return 'installed';
+    }
+    if (UNAVAILABLE_CODES.includes(get(extension, 'meta.install_blocked_code'))) {
+        return 'unavailable';
+    }
+
+    const price = priceOf(extension);
+    if (!price.free && extension.is_purchased === true) {
+        return 'purchased';
+    }
+    if (!price.free && price.original !== null) {
+        return 'on-sale';
+    }
+
+    return price.free ? 'free' : 'paid';
+}
+
+/**
+ * Everything a card renders besides the record's own text: the state, the
+ * price badge, the state badges (an unavailable listing's badge carries the
+ * reason as `help`) and the footer action.
+ *
+ * `action.kind` is what the card does when the action is pressed:
+ * `details` (open the panel), `install`, `update` or `none`.
+ */
+export function cardModel(extension = {}) {
+    const state = cardState(extension);
+    const price = priceOf(extension);
+    const latest = extension.latest_version || extension.current_bundle_version || extension.version;
+    const hosting = get(extension, 'meta.hosting');
+    const badges = [];
+    let priceBadge = price.free ? { label: label('card.free'), status: 'success' } : { amount: price.amount, original: price.original, currency: price.currency, status: 'info' };
+    let action = { kind: 'details', label: label('card.view-details'), type: 'default' };
+
+    switch (state) {
+        case 'on-sale':
+            badges.push({ label: label('card.on-sale'), status: 'warning' });
+            break;
+        case 'installed':
+            badges.push({ label: label('card.installed'), status: 'success' });
+            action = { kind: 'none', label: label('card.installed'), type: 'default', disabled: true };
+            break;
+        case 'update':
+            badges.push({ label: label('card.update', { version: latest }), status: 'info' });
+            if (extension.installed_version) {
+                badges.push({ label: label('card.installed-version', { version: extension.installed_version }), status: 'success' });
+            }
+            action = { kind: 'update', label: label('card.update-to', { version: latest }), type: 'primary', permission: PERMISSIONS.install };
+            break;
+        case 'purchased':
+            priceBadge = { label: label('card.purchased'), status: 'success' };
+            badges.push({ label: label('card.ready-to-install'), status: 'info' });
+            action =
+                extension.is_installable === false
+                    ? { kind: 'details', label: label('card.view-details'), type: 'default' }
+                    : { kind: 'install', label: label('card.install'), type: 'primary', permission: PERMISSIONS.install };
+            break;
+        case 'unavailable':
+            badges.push({ label: label('card.unavailable'), status: 'warning', help: unavailableReason(extension) });
+            break;
+    }
+
+    if (get(extension, 'meta.publisher.is_verified') === true) {
+        badges.push({ label: label('card.verified'), status: 'default' });
+    }
+
+    if (hosting === 'self_hosted' || hosting === 'cloud') {
+        badges.push({ label: label(hosting === 'cloud' ? 'card.cloud-only' : 'card.self-hosted-only'), status: 'default' });
+    }
+
+    return { state, priceBadge, badges, action, version: latest || null, unavailableReason: unavailableReason(extension) };
+}
+
+/**
+ * The call to action in the detail panel (canvas C4 CTA matrix).
+ *
+ * @param {Object} extension
+ * @param {Object} context
+ * @param {Boolean} context.canInstall the user may install, update and uninstall
+ * @param {Boolean} context.canPurchase the user may purchase
+ * @return {{ kind: String, permission?: String, reason?: String, code?: String, version?: String, installedVersion?: String }}
+ */
+export function detailCta(extension = {}, { canInstall = true, canPurchase = true } = {}) {
+    const latest = extension.latest_version || extension.current_bundle_version || extension.version || null;
+    const reason = get(extension, 'meta.install_blocked_reason') || null;
+    const code = get(extension, 'meta.install_blocked_code') || null;
+
+    if (extension.is_author === true) {
+        return { kind: CTA.AUTHOR };
+    }
+
+    if (extension.is_installed === true) {
+        if (extension.update_available !== true) {
+            return { kind: CTA.INSTALLED, version: extension.installed_version || latest };
+        }
+        if (!canInstall) {
+            return { kind: CTA.UNAUTHORIZED, permission: PERMISSIONS.install };
+        }
+        return { kind: CTA.UPDATE, version: latest, installedVersion: extension.installed_version || null };
+    }
+
+    if (code === 'licence_required' && get(extension, 'meta.purchase_available') === true) {
+        return canPurchase ? { kind: CTA.PURCHASE } : { kind: CTA.UNAUTHORIZED, permission: PERMISSIONS.purchase };
+    }
+
+    if (extension.is_installable === false || reason) {
+        if (code === 'not_registered') {
+            return { kind: CTA.REGISTRATION, reason, code };
+        }
+        return { kind: CTA.BLOCKED, reason: reason || null, code };
+    }
+
+    if (!canInstall) {
+        return { kind: CTA.UNAUTHORIZED, permission: PERMISSIONS.install };
+    }
+
+    return { kind: CTA.INSTALL, version: latest };
+}
diff --git a/addon/utils/installer-job.js b/addon/utils/installer-job.js
index bbed8c5..29d9f2e 100644
--- a/addon/utils/installer-job.js
+++ b/addon/utils/installer-job.js
@@ -38,6 +38,57 @@ export const INSTALLER_STEPS = {
     rollback: 'rollback',
 };
 
+/**
+ * The three named steps the install modal shows (canvas C5), each covering
+ * the installer steps that belong to it. Uninstalls remove instead of
+ * install; updates install.
+ */
+export const INSTALLER_STEP_GROUPS = {
+    install: [
+        { key: 'server', steps: ['release.resolve', 'release.download', 'snapshot.create', 'server.install'] },
+        { key: 'engine', steps: ['engine.install'] },
+        { key: 'build', steps: ['console.build', 'cache.clear', 'install.record'] },
+    ],
+    uninstall: [
+        { key: 'server', steps: ['snapshot.create', 'server.uninstall'] },
+        { key: 'engine', steps: ['engine.uninstall'] },
+        { key: 'build', steps: ['console.build', 'cache.clear', 'install.record'] },
+    ],
+};
+
+/**
+ * The named steps for a job with their status: `done`, `active`, `pending`
+ * or `failed`.
+ *
+ * @param {String} action install, update or uninstall
+ * @param {Object} job
+ * @return {Array<{ key: String, status: String }>}
+ */
+export function installerStepGroups(action, job = {}) {
+    const groups = INSTALLER_STEP_GROUPS[action === 'uninstall' ? 'uninstall' : 'install'];
+    const status = job?.status;
+    const step = status === 'failed' && (job.step === 'rollback' || !job.step) ? (job.result?.step ?? job.step) : job?.step;
+    const index = groups.findIndex((group) => group.steps.includes(step));
+
+    return groups.map((group, i) => {
+        if (status === 'completed') {
+            return { key: group.key, status: 'done' };
+        }
+        if (status === 'queued' || status === undefined || status === null) {
+            return { key: group.key, status: 'pending' };
+        }
+
+        const current = index === -1 ? 0 : index;
+        if (i < current) {
+            return { key: group.key, status: 'done' };
+        }
+        if (i === current) {
+            return { key: group.key, status: status === 'failed' ? 'failed' : 'active' };
+        }
+        return { key: group.key, status: 'pending' };
+    });
+}
+
 /**
  * The socket channel for a job: uninstalls publish on `uninstall.…`,
  * installs and updates on `install.…`.
@@ -306,11 +357,26 @@ export function countdown(seconds, onTick, onDone, schedule = (fn, ms) => setTim
  * @param {Function} [options.cancel]
  * @return {Promise<Object>}
  */
-export async function runInstallerJob({ modal, intl, fetch, socket, channel, request, reload = () => window.location.reload(), reloadAfter = 3, schedule, cancel, pollInterval }) {
+export async function runInstallerJob({
+    modal,
+    intl,
+    fetch,
+    socket,
+    channel,
+    request,
+    action = 'install',
+    reload = () => window.location.reload(),
+    reloadAfter = 3,
+    schedule,
+    cancel,
+    pollInterval,
+}) {
+    const progress = (job) => ({ ...describeInstallerJob(intl, job), steps: installerStepGroups(action, job), phase: 'progress', job });
+
     modal.startLoading();
-    modal.setOptions({ installerError: null, ...describeInstallerJob(intl, { status: 'running' }) });
+    modal.setOptions({ installerError: null, ...progress({ status: 'running' }) });
 
-    const tracker = new InstallerJobTracker({ fetch, socket, channel, schedule, cancel, pollInterval, onUpdate: (job) => modal.setOptions(describeInstallerJob(intl, job)) }).listen();
+    const tracker = new InstallerJobTracker({ fetch, socket, channel, schedule, cancel, pollInterval, onUpdate: (job) => modal.setOptions(progress(job)) }).listen();
 
     let job;
     try {
@@ -319,7 +385,7 @@ export async function runInstallerJob({ modal, intl, fetch, socket, channel, req
     } catch (error) {
         tracker.stop();
         modal.stopLoading();
-        modal.setOptions({ progress: 0 });
+        modal.setOptions({ progress: 0, phase: 'confirm' });
         throw error;
     }
 
@@ -327,6 +393,8 @@ export async function runInstallerJob({ modal, intl, fetch, socket, channel, req
         modal.stopLoading();
         modal.setOptions({
             progress: 0,
+            phase: 'failure',
+            steps: installerStepGroups(action, job),
             installerError: describeInstallerFailure(intl, job),
             acceptButtonText: intl.t('registry-bridge.installer.retry'),
             acceptButtonIcon: 'rotate-right',
@@ -334,8 +402,22 @@ export async function runInstallerJob({ modal, intl, fetch, socket, channel, req
         return job;
     }
 
-    modal.setOptions(describeInstallerJob(intl, job));
-    countdown(reloadAfter, (seconds) => modal.setOption('stepDescription', intl.t('registry-bridge.installer.reloading', { seconds })), reload, schedule, cancel);
+    modal.setOptions({ ...describeInstallerJob(intl, job), phase: 'success', steps: installerStepGroups(action, job), job, secondsLeft: reloadAfter });
+    const stopCountdown = countdown(
+        reloadAfter,
+        (seconds) => modal.setOptions({ stepDescription: intl.t('registry-bridge.installer.reloading', { seconds }), secondsLeft: seconds }),
+        reload,
+        schedule,
+        cancel
+    );
+    // "Wait, stay here" on the success state
+    modal.setOptions({
+        cancelReload: () => {
+            stopCountdown();
+            modal.stopLoading();
+            modal.setOptions({ secondsLeft: null, reloadCancelled: true });
+        },
+    });
 
     return job;
 }
diff --git a/app/adapters/registry-extension-bundle.js b/app/adapters/registry-extension-bundle.js
deleted file mode 100644
index 3b3f097..0000000
--- a/app/adapters/registry-extension-bundle.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from '@fleetbase/registry-bridge-engine/adapters/registry-extension-bundle';
diff --git a/app/components/extension-modal-title.js b/app/components/cell/extension-action.js
similarity index 68%
rename from app/components/extension-modal-title.js
rename to app/components/cell/extension-action.js
index fe36110..ed4eea5 100644
--- a/app/components/extension-modal-title.js
+++ b/app/components/cell/extension-action.js
@@ -1 +1 @@
-export { default } from '@fleetbase/registry-bridge-engine/components/extension-modal-title';
+export { default } from '@fleetbase/registry-bridge-engine/components/cell/extension-action';
diff --git a/app/components/extension-monetize-form.js b/app/components/cell/extension-identity.js
similarity index 66%
rename from app/components/extension-monetize-form.js
rename to app/components/cell/extension-identity.js
index 8664b1d..8259d78 100644
--- a/app/components/extension-monetize-form.js
+++ b/app/components/cell/extension-identity.js
@@ -1 +1 @@
-export { default } from '@fleetbase/registry-bridge-engine/components/extension-monetize-form';
+export { default } from '@fleetbase/registry-bridge-engine/components/cell/extension-identity';
diff --git a/app/components/cell/extension-status.js b/app/components/cell/extension-status.js
new file mode 100644
index 0000000..76baa1e
--- /dev/null
+++ b/app/components/cell/extension-status.js
@@ -0,0 +1 @@
+export { default } from '@fleetbase/registry-bridge-engine/components/cell/extension-status';
diff --git a/app/components/cell/licence-activations.js b/app/components/cell/licence-activations.js
new file mode 100644
index 0000000..f89e0c3
--- /dev/null
+++ b/app/components/cell/licence-activations.js
@@ -0,0 +1 @@
+export { default } from '@fleetbase/registry-bridge-engine/components/cell/licence-activations';
diff --git a/app/components/cell/licence-receipt.js b/app/components/cell/licence-receipt.js
new file mode 100644
index 0000000..9325550
--- /dev/null
+++ b/app/components/cell/licence-receipt.js
@@ -0,0 +1 @@
+export { default } from '@fleetbase/registry-bridge-engine/components/cell/licence-receipt';
diff --git a/app/components/explore-empty-state.js b/app/components/cell/licence-state.js
similarity index 69%
rename from app/components/explore-empty-state.js
rename to app/components/cell/licence-state.js
index 606d650..8109f8b 100644
--- a/app/components/explore-empty-state.js
+++ b/app/components/cell/licence-state.js
@@ -1 +1 @@
-export { default } from '@fleetbase/registry-bridge-engine/components/explore-empty-state';
+export { default } from '@fleetbase/registry-bridge-engine/components/cell/licence-state';
diff --git a/app/components/installer-job-error.js b/app/components/cell/purchase-price.js
similarity index 69%
rename from app/components/installer-job-error.js
rename to app/components/cell/purchase-price.js
index 6a8f8aa..9cb5c20 100644
--- a/app/components/installer-job-error.js
+++ b/app/components/cell/purchase-price.js
@@ -1 +1 @@
-export { default } from '@fleetbase/registry-bridge-engine/components/installer-job-error';
+export { default } from '@fleetbase/registry-bridge-engine/components/cell/purchase-price';
diff --git a/app/components/cell/release-action.js b/app/components/cell/release-action.js
new file mode 100644
index 0000000..85033c5
--- /dev/null
+++ b/app/components/cell/release-action.js
@@ -0,0 +1 @@
+export { default } from '@fleetbase/registry-bridge-engine/components/cell/release-action';
diff --git a/app/components/cell/release-version.js b/app/components/cell/release-version.js
new file mode 100644
index 0000000..0ca5d3e
--- /dev/null
+++ b/app/components/cell/release-version.js
@@ -0,0 +1 @@
+export { default } from '@fleetbase/registry-bridge-engine/components/cell/release-version';
diff --git a/app/components/extension-form.js b/app/components/explore-catalog.js
similarity index 72%
rename from app/components/extension-form.js
rename to app/components/explore-catalog.js
index 76531f9..f0003ff 100644
--- a/app/components/extension-form.js
+++ b/app/components/explore-catalog.js
@@ -1 +1 @@
-export { default } from '@fleetbase/registry-bridge-engine/components/extension-form';
+export { default } from '@fleetbase/registry-bridge-engine/components/explore-catalog';
diff --git a/app/components/extension-card/action.js b/app/components/extension-card/action.js
new file mode 100644
index 0000000..69fabd8
--- /dev/null
+++ b/app/components/extension-card/action.js
@@ -0,0 +1 @@
+export { default } from '@fleetbase/registry-bridge-engine/components/extension-card/action';
diff --git a/app/components/extension-panel.js b/app/components/extension-panel.js
new file mode 100644
index 0000000..175564d
--- /dev/null
+++ b/app/components/extension-panel.js
@@ -0,0 +1 @@
+export { default } from '@fleetbase/registry-bridge-engine/components/extension-panel';
diff --git a/app/components/extension-panel/details.js b/app/components/extension-panel/details.js
new file mode 100644
index 0000000..c6d254b
--- /dev/null
+++ b/app/components/extension-panel/details.js
@@ -0,0 +1 @@
+export { default } from '@fleetbase/registry-bridge-engine/components/extension-panel/details';
diff --git a/app/components/extension-panel/header.js b/app/components/extension-panel/header.js
new file mode 100644
index 0000000..9b751aa
--- /dev/null
+++ b/app/components/extension-panel/header.js
@@ -0,0 +1 @@
+export { default } from '@fleetbase/registry-bridge-engine/components/extension-panel/header';
diff --git a/app/components/extension-panel/overview.js b/app/components/extension-panel/overview.js
new file mode 100644
index 0000000..cc2f222
--- /dev/null
+++ b/app/components/extension-panel/overview.js
@@ -0,0 +1 @@
+export { default } from '@fleetbase/registry-bridge-engine/components/extension-panel/overview';
diff --git a/app/components/extension-panel/screenshots.js b/app/components/extension-panel/screenshots.js
new file mode 100644
index 0000000..d5c02a4
--- /dev/null
+++ b/app/components/extension-panel/screenshots.js
@@ -0,0 +1 @@
+export { default } from '@fleetbase/registry-bridge-engine/components/extension-panel/screenshots';
diff --git a/app/components/extension-panel/versions.js b/app/components/extension-panel/versions.js
new file mode 100644
index 0000000..9af7d84
--- /dev/null
+++ b/app/components/extension-panel/versions.js
@@ -0,0 +1 @@
+export { default } from '@fleetbase/registry-bridge-engine/components/extension-panel/versions';
diff --git a/app/components/extension-pending-publish-viewer.js b/app/components/extension-pending-publish-viewer.js
deleted file mode 100644
index 28e2e92..0000000
--- a/app/components/extension-pending-publish-viewer.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from '@fleetbase/registry-bridge-engine/components/extension-pending-publish-viewer';
diff --git a/app/components/extension-reviewer-control.js b/app/components/extension-reviewer-control.js
deleted file mode 100644
index d24b05c..0000000
--- a/app/components/extension-reviewer-control.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from '@fleetbase/registry-bridge-engine/components/extension-reviewer-control';
diff --git a/app/components/modals/confirm-extension-purchase.js b/app/components/modals/confirm-extension-purchase.js
deleted file mode 100644
index aca0879..0000000
--- a/app/components/modals/confirm-extension-purchase.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from '@fleetbase/registry-bridge-engine/components/modals/confirm-extension-purchase';
diff --git a/app/components/modals/create-registry-credentials.js b/app/components/modals/create-registry-credentials.js
deleted file mode 100644
index 2183b2a..0000000
--- a/app/components/modals/create-registry-credentials.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from '@fleetbase/registry-bridge-engine/components/modals/create-registry-credentials';
diff --git a/app/components/modals/extension-details.js b/app/components/modals/extension-details.js
deleted file mode 100644
index ee69ddb..0000000
--- a/app/components/modals/extension-details.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from '@fleetbase/registry-bridge-engine/components/modals/extension-details';
diff --git a/app/components/modals/extension-installer.js b/app/components/modals/extension-installer.js
new file mode 100644
index 0000000..5ba52d3
--- /dev/null
+++ b/app/components/modals/extension-installer.js
@@ -0,0 +1 @@
+export { default } from '@fleetbase/registry-bridge-engine/components/modals/extension-installer';
diff --git a/app/components/modals/extension-purchase-form.js b/app/components/modals/extension-purchase-form.js
deleted file mode 100644
index 3464101..0000000
--- a/app/components/modals/extension-purchase-form.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from '@fleetbase/registry-bridge-engine/components/modals/extension-purchase-form';
diff --git a/app/components/modals/extension-purchase-status.js b/app/components/modals/extension-purchase-status.js
new file mode 100644
index 0000000..3079af3
--- /dev/null
+++ b/app/components/modals/extension-purchase-status.js
@@ -0,0 +1 @@
+export { default } from '@fleetbase/registry-bridge-engine/components/modals/extension-purchase-status';
diff --git a/app/components/modals/extension-uninstall.js b/app/components/modals/extension-uninstall.js
deleted file mode 100644
index 7d74241..0000000
--- a/app/components/modals/extension-uninstall.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from '@fleetbase/registry-bridge-engine/components/modals/extension-uninstall';
diff --git a/app/components/modals/select-extension-bundle.js b/app/components/modals/select-extension-bundle.js
deleted file mode 100644
index 7eb2866..0000000
--- a/app/components/modals/select-extension-bundle.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from '@fleetbase/registry-bridge-engine/components/modals/select-extension-bundle';
diff --git a/app/components/modals/self-managed-install-instructions.js b/app/components/modals/self-managed-install-instructions.js
deleted file mode 100644
index 3ec45df..0000000
--- a/app/components/modals/self-managed-install-instructions.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from '@fleetbase/registry-bridge-engine/components/modals/self-managed-install-instructions';
diff --git a/app/controllers/developers/analytics.js b/app/controllers/developers/analytics.js
deleted file mode 100644
index 677fb66..0000000
--- a/app/controllers/developers/analytics.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from '@fleetbase/registry-bridge-engine/controllers/developers/analytics';
diff --git a/app/controllers/developers/credentials.js b/app/controllers/developers/credentials.js
deleted file mode 100644
index 270c673..0000000
--- a/app/controllers/developers/credentials.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from '@fleetbase/registry-bridge-engine/controllers/developers/credentials';
diff --git a/app/controllers/developers/extensions/edit.js b/app/controllers/developers/extensions/edit.js
deleted file mode 100644
index 818fc50..0000000
--- a/app/controllers/developers/extensions/edit.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from '@fleetbase/registry-bridge-engine/controllers/developers/extensions/edit';
diff --git a/app/controllers/developers/extensions/edit/bundles.js b/app/controllers/developers/extensions/edit/bundles.js
deleted file mode 100644
index b4b5e9d..0000000
--- a/app/controllers/developers/extensions/edit/bundles.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from '@fleetbase/registry-bridge-engine/controllers/developers/extensions/edit/bundles';
diff --git a/app/controllers/developers/extensions/edit/index.js b/app/controllers/developers/extensions/edit/index.js
deleted file mode 100644
index 6300f78..0000000
--- a/app/controllers/developers/extensions/edit/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from '@fleetbase/registry-bridge-engine/controllers/developers/extensions/edit/index';
diff --git a/app/controllers/developers/extensions/edit/monetize.js b/app/controllers/developers/extensions/edit/monetize.js
deleted file mode 100644
index 21012c4..0000000
--- a/app/controllers/developers/extensions/edit/monetize.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from '@fleetbase/registry-bridge-engine/controllers/developers/extensions/edit/monetize';
diff --git a/app/controllers/developers/extensions/index.js b/app/controllers/developers/extensions/index.js
deleted file mode 100644
index 477a557..0000000
--- a/app/controllers/developers/extensions/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from '@fleetbase/registry-bridge-engine/controllers/developers/extensions/index';
diff --git a/app/controllers/developers/extensions/new.js b/app/controllers/developers/extensions/new.js
deleted file mode 100644
index 6cb20d1..0000000
--- a/app/controllers/developers/extensions/new.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from '@fleetbase/registry-bridge-engine/controllers/developers/extensions/new';
diff --git a/app/controllers/developers/payments/index.js b/app/controllers/developers/payments/index.js
deleted file mode 100644
index 2da37a7..0000000
--- a/app/controllers/developers/payments/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from '@fleetbase/registry-bridge-engine/controllers/developers/payments/index';
diff --git a/app/controllers/developers/payments/onboard.js b/app/controllers/developers/payments/onboard.js
deleted file mode 100644
index aa899fa..0000000
--- a/app/controllers/developers/payments/onboard.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from '@fleetbase/registry-bridge-engine/controllers/developers/payments/onboard';
diff --git a/app/models/registry-extension-bundle.js b/app/models/registry-extension-bundle.js
deleted file mode 100644
index 158da00..0000000
--- a/app/models/registry-extension-bundle.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from '@fleetbase/registry-bridge-engine/models/registry-extension-bundle';
diff --git a/app/routes/developers.js b/app/routes/developers.js
deleted file mode 100644
index 36d0edd..0000000
--- a/app/routes/developers.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from '@fleetbase/registry-bridge-engine/routes/developers';
diff --git a/app/routes/developers/analytics.js b/app/routes/developers/analytics.js
deleted file mode 100644
index 6367597..0000000
--- a/app/routes/developers/analytics.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from '@fleetbase/registry-bridge-engine/routes/developers/analytics';
diff --git a/app/routes/developers/credentials.js b/app/routes/developers/credentials.js
deleted file mode 100644
index cdf6ce7..0000000
--- a/app/routes/developers/credentials.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from '@fleetbase/registry-bridge-engine/routes/developers/credentials';
diff --git a/app/routes/developers/extensions.js b/app/routes/developers/extensions.js
deleted file mode 100644
index 4712583..0000000
--- a/app/routes/developers/extensions.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from '@fleetbase/registry-bridge-engine/routes/developers/extensions';
diff --git a/app/routes/developers/extensions/edit.js b/app/routes/developers/extensions/edit.js
deleted file mode 100644
index aa61327..0000000
--- a/app/routes/developers/extensions/edit.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from '@fleetbase/registry-bridge-engine/routes/developers/extensions/edit';
diff --git a/app/routes/developers/extensions/edit/bundles.js b/app/routes/developers/extensions/edit/bundles.js
deleted file mode 100644
index 6e38f3c..0000000
--- a/app/routes/developers/extensions/edit/bundles.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from '@fleetbase/registry-bridge-engine/routes/developers/extensions/edit/bundles';
diff --git a/app/routes/developers/extensions/edit/details.js b/app/routes/developers/extensions/edit/details.js
deleted file mode 100644
index a7fe715..0000000
--- a/app/routes/developers/extensions/edit/details.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from '@fleetbase/registry-bridge-engine/routes/developers/extensions/edit/details';
diff --git a/app/routes/developers/extensions/edit/index.js b/app/routes/developers/extensions/edit/index.js
deleted file mode 100644
index 434e6fd..0000000
--- a/app/routes/developers/extensions/edit/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from '@fleetbase/registry-bridge-engine/routes/developers/extensions/edit/index';
diff --git a/app/routes/developers/extensions/edit/monetize.js b/app/routes/developers/extensions/edit/monetize.js
deleted file mode 100644
index f887fe2..0000000
--- a/app/routes/developers/extensions/edit/monetize.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from '@fleetbase/registry-bridge-engine/routes/developers/extensions/edit/monetize';
diff --git a/app/routes/developers/extensions/index.js b/app/routes/developers/extensions/index.js
deleted file mode 100644
index 0120019..0000000
--- a/app/routes/developers/extensions/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from '@fleetbase/registry-bridge-engine/routes/developers/extensions/index';
diff --git a/app/routes/developers/extensions/new.js b/app/routes/developers/extensions/new.js
deleted file mode 100644
index 84e1b6a..0000000
--- a/app/routes/developers/extensions/new.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from '@fleetbase/registry-bridge-engine/routes/developers/extensions/new';
diff --git a/app/routes/developers/payments.js b/app/routes/developers/payments.js
deleted file mode 100644
index eb47683..0000000
--- a/app/routes/developers/payments.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from '@fleetbase/registry-bridge-engine/routes/developers/payments';
diff --git a/app/routes/developers/payments/index.js b/app/routes/developers/payments/index.js
deleted file mode 100644
index 20238ea..0000000
--- a/app/routes/developers/payments/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from '@fleetbase/registry-bridge-engine/routes/developers/payments/index';
diff --git a/app/routes/developers/payments/onboard.js b/app/routes/developers/payments/onboard.js
deleted file mode 100644
index d1fc30a..0000000
--- a/app/routes/developers/payments/onboard.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from '@fleetbase/registry-bridge-engine/routes/developers/payments/onboard';
diff --git a/app/serializers/registry-extension-bundle.js b/app/serializers/registry-extension-bundle.js
deleted file mode 100644
index e4a046d..0000000
--- a/app/serializers/registry-extension-bundle.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from '@fleetbase/registry-bridge-engine/serializers/registry-extension-bundle';
diff --git a/app/services/extension-installer.js b/app/services/extension-installer.js
new file mode 100644
index 0000000..9e3cf75
--- /dev/null
+++ b/app/services/extension-installer.js
@@ -0,0 +1 @@
+export { default } from '@fleetbase/registry-bridge-engine/services/extension-installer';
diff --git a/app/services/stripe.js b/app/services/extension-panel.js
similarity index 74%
rename from app/services/stripe.js
rename to app/services/extension-panel.js
index 071f306..d1435f5 100644
--- a/app/services/stripe.js
+++ b/app/services/extension-panel.js
@@ -1 +1 @@
-export { default } from '@fleetbase/registry-bridge-engine/services/stripe';
+export { default } from '@fleetbase/registry-bridge-engine/services/extension-panel';
diff --git a/app/services/extension-purchase.js b/app/services/extension-purchase.js
new file mode 100644
index 0000000..f206f18
--- /dev/null
+++ b/app/services/extension-purchase.js
@@ -0,0 +1 @@
+export { default } from '@fleetbase/registry-bridge-engine/services/extension-purchase';
diff --git a/app/services/registry-context.js b/app/services/registry-context.js
new file mode 100644
index 0000000..e384285
--- /dev/null
+++ b/app/services/registry-context.js
@@ -0,0 +1 @@
+export { default } from '@fleetbase/registry-bridge-engine/services/registry-context';
diff --git a/app/templates/developers.js b/app/templates/developers.js
deleted file mode 100644
index fe8e173..0000000
--- a/app/templates/developers.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from '@fleetbase/registry-bridge-engine/templates/developers';
diff --git a/app/templates/developers/analytics.js b/app/templates/developers/analytics.js
deleted file mode 100644
index 6d69078..0000000
--- a/app/templates/developers/analytics.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from '@fleetbase/registry-bridge-engine/templates/developers/analytics';
diff --git a/app/templates/developers/credentials.js b/app/templates/developers/credentials.js
deleted file mode 100644
index dd2ca26..0000000
--- a/app/templates/developers/credentials.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from '@fleetbase/registry-bridge-engine/templates/developers/credentials';
diff --git a/app/templates/developers/extensions.js b/app/templates/developers/extensions.js
deleted file mode 100644
index de77ac5..0000000
--- a/app/templates/developers/extensions.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from '@fleetbase/registry-bridge-engine/templates/developers/extensions';
diff --git a/app/templates/developers/extensions/edit.js b/app/templates/developers/extensions/edit.js
deleted file mode 100644
index 3dd4510..0000000
--- a/app/templates/developers/extensions/edit.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from '@fleetbase/registry-bridge-engine/templates/developers/extensions/edit';
diff --git a/app/templates/developers/extensions/edit/bundles.js b/app/templates/developers/extensions/edit/bundles.js
deleted file mode 100644
index ff219ca..0000000
--- a/app/templates/developers/extensions/edit/bundles.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from '@fleetbase/registry-bridge-engine/templates/developers/extensions/edit/bundles';
diff --git a/app/templates/developers/extensions/edit/details.js b/app/templates/developers/extensions/edit/details.js
deleted file mode 100644
index bb3f8d3..0000000
--- a/app/templates/developers/extensions/edit/details.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from '@fleetbase/registry-bridge-engine/templates/developers/extensions/edit/details';
diff --git a/app/templates/developers/extensions/edit/index.js b/app/templates/developers/extensions/edit/index.js
deleted file mode 100644
index 0f28b53..0000000
--- a/app/templates/developers/extensions/edit/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from '@fleetbase/registry-bridge-engine/templates/developers/extensions/edit/index';
diff --git a/app/templates/developers/extensions/edit/monetize.js b/app/templates/developers/extensions/edit/monetize.js
deleted file mode 100644
index 8433b2d..0000000
--- a/app/templates/developers/extensions/edit/monetize.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from '@fleetbase/registry-bridge-engine/templates/developers/extensions/edit/monetize';
diff --git a/app/templates/developers/extensions/index.js b/app/templates/developers/extensions/index.js
deleted file mode 100644
index 5cf84d3..0000000
--- a/app/templates/developers/extensions/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from '@fleetbase/registry-bridge-engine/templates/developers/extensions/index';
diff --git a/app/templates/developers/extensions/new.js b/app/templates/developers/extensions/new.js
deleted file mode 100644
index 6400493..0000000
--- a/app/templates/developers/extensions/new.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from '@fleetbase/registry-bridge-engine/templates/developers/extensions/new';
diff --git a/app/templates/developers/payments.js b/app/templates/developers/payments.js
deleted file mode 100644
index bcb6de9..0000000
--- a/app/templates/developers/payments.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from '@fleetbase/registry-bridge-engine/templates/developers/payments';
diff --git a/app/templates/developers/payments/index.js b/app/templates/developers/payments/index.js
deleted file mode 100644
index 2c26320..0000000
--- a/app/templates/developers/payments/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from '@fleetbase/registry-bridge-engine/templates/developers/payments/index';
diff --git a/app/templates/developers/payments/onboard.js b/app/templates/developers/payments/onboard.js
deleted file mode 100644
index 36b4102..0000000
--- a/app/templates/developers/payments/onboard.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from '@fleetbase/registry-bridge-engine/templates/developers/payments/onboard';
diff --git a/composer.json b/composer.json
index 9dcbeb3..59460b2 100644
--- a/composer.json
+++ b/composer.json
@@ -21,11 +21,8 @@
     "require": {
         "php": "^8.0",
         "fleetbase/core-api": "*",
-        "laravel/cashier": "^16.2.0",
-        "opis/json-schema": "^2.3",
         "php-http/guzzle7-adapter": "^1.0",
-        "psr/http-factory-implementation": "*",
-        "stripe/stripe-php": "^17.0"
+        "psr/http-factory-implementation": "*"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.34.1",
@@ -37,8 +34,7 @@
     },
     "autoload": {
         "psr-4": {
-            "Fleetbase\\RegistryBridge\\": "server/src/",
-            "Fleetbase\\RegistryBridge\\Seeders\\": "server/seeders/"
+            "Fleetbase\\RegistryBridge\\": "server/src/"
         }
     },
     "autoload-dev": {
diff --git a/config/environment.js b/config/environment.js
index a49a865..4c07381 100644
--- a/config/environment.js
+++ b/config/environment.js
@@ -1,21 +1,11 @@
 'use strict';
 const { name, fleetbase } = require('../package');
 
-function getenv(variable, defaultValue = null) {
-    return process.env[variable] !== undefined ? process.env[variable] : defaultValue;
-}
-
 module.exports = function (environment) {
     let ENV = {
         modulePrefix: name,
         environment,
         mountedEngineRoutePrefix: getMountedEngineRoutePrefix(),
-        stripe: {
-            publishableKey: getenv('STRIPE_KEY'),
-        },
-        registry: {
-            selfHosted: toBoolean(getenv('SELF_HOSTED_REGISTRY', false)),
-        },
     };
 
     return ENV;
@@ -29,23 +19,3 @@ function getMountedEngineRoutePrefix() {
 
     return `console.${mountedEngineRoutePrefix}.`;
 }
-
-function toBoolean(value) {
-    switch (value) {
-        case 'true':
-        case '1':
-        case 1:
-        case true:
-            return true;
-        case 'false':
-        case '0':
-        case 0:
-        case false:
-        case null:
-        case undefined:
-        case '':
-            return false;
-        default:
-            return false;
-    }
-}
diff --git a/package.json b/package.json
index cf4e30c..0be36f4 100644
--- a/package.json
+++ b/package.json
@@ -45,13 +45,10 @@
         "@fortawesome/fontawesome-svg-core": "6.4.0",
         "@fortawesome/free-brands-svg-icons": "6.4.0",
         "@fortawesome/free-solid-svg-icons": "6.4.0",
-        "@stripe/connect-js": "^3.3.10",
         "ember-auto-import": "^2.7.4",
         "ember-cli-babel": "^8.2.0",
         "ember-cli-htmlbars": "^6.3.0",
         "ember-intl": "6.3.2",
-        "ember-radio-button": "^3.0.0-beta.1",
-        "ember-tag-input": "^3.1.0",
         "ember-wormhole": "^0.6.0"
     },
     "devDependencies": {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index fa20ef6..7e6ac76 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -29,9 +29,6 @@ importers:
       '@fortawesome/free-solid-svg-icons':
         specifier: 6.4.0
         version: 6.4.0
-      '@stripe/connect-js':
-        specifier: ^3.3.10
-        version: 3.3.12
       ember-auto-import:
         specifier: ^2.7.4
         version: 2.7.4(webpack@5.94.0)
@@ -44,12 +41,6 @@ importers:
       ember-intl:
         specifier: 6.3.2
         version: 6.3.2(@babel/core@7.25.2)(webpack@5.94.0)
-      ember-radio-button:
-        specifier: ^3.0.0-beta.1
-        version: 3.0.0-beta.1
-      ember-tag-input:
-        specifier: ^3.1.0
-        version: 3.1.0
       ember-wormhole:
         specifier: ^0.6.0
         version: 0.6.0
@@ -2182,9 +2173,6 @@ packages:
   '@socket.io/component-emitter@3.1.2':
     resolution: {integrity: sha512-9BCxFwvbGg/RsZK9tjXd8s4UcwR0MWeFQ1XEKIQVVvAGJyINdrqKMcTRyLoK8Rse1GjzLV9cwjWV1olXRWEXVA==}
 
-  '@stripe/connect-js@3.3.12':
-    resolution: {integrity: sha512-hXbgvGq9Lb6BYgsb8lcbjL76Yqsxr0yAj6T9ZFTfUK0O4otI5GSEWum9do9rf/E5OfYy6fR1FG/77Jve2w1o6Q==}
-
   '@sveltejs/acorn-typescript@1.0.13':
     resolution: {integrity: sha512-wgKggnhZVL9Bfx1OaKKTrYY9BFRk6C8UAkQNUcIv1+llzYrIqy+RZm5HPKzn0NpEBvTVhTqB4kQyllZywsRBRQ==}
     peerDependencies:
@@ -4741,10 +4729,6 @@ packages:
       ember-source: '>=4.0.0'
       qunit: ^2.13.0
 
-  ember-radio-button@3.0.0-beta.1:
-    resolution: {integrity: sha512-KcSCXQHNosYRFB2t5GDpXQaHzu3A/UwoKgxVQ2XwV9n4xico7HqWReyt7s3OAMxRYmfZTxeQw7F5THawNd3SYA==}
-    engines: {node: 12.* || 14.* || >= 16}
-
   ember-ref-bucket@4.1.0:
     resolution: {integrity: sha512-oEUU2mDtuYuMM039U9YEqrrOCVHH6rQfvbFOmh3WxOVEgubmLVyKEpGgU4P/6j0B/JxTqqTwM3ULTQyDto8dKg==}
     engines: {node: 10.* || >= 12}
@@ -12797,8 +12781,6 @@ snapshots:
 
   '@socket.io/component-emitter@3.1.2': {}
 
-  '@stripe/connect-js@3.3.12': {}
-
   '@sveltejs/acorn-typescript@1.0.13(acorn@8.19.0)':
     dependencies:
       acorn: 8.19.0
@@ -16774,18 +16756,6 @@ snapshots:
       - '@glint/template'
       - supports-color
 
-  ember-radio-button@3.0.0-beta.1:
-    dependencies:
-      ember-cli-babel: 7.26.11
-      ember-cli-htmlbars: 5.7.2
-      webpack: 5.94.0
-    transitivePeerDependencies:
-      - '@swc/core'
-      - esbuild
-      - supports-color
-      - uglify-js
-      - webpack-cli
-
   ember-ref-bucket@4.1.0(@babel/core@7.28.5):
     dependencies:
       ember-cli-babel: 7.26.11
diff --git a/server/config/registry-bridge.php b/server/config/registry-bridge.php
index 184a46e..4bb87e9 100644
--- a/server/config/registry-bridge.php
+++ b/server/config/registry-bridge.php
@@ -17,36 +17,26 @@
         ],
     ],
     'registry' => [
-        'host' => env('REGISTRY_HOST', 'https://registry.fleetbase.io'),
-        'token' => env('REGISTRY_TOKEN', env('REGISTRY_AUTH_TOKEN')),
-        // When false (the default) this instance browses the central Fleetbase registry catalog
-        // instead of its own `registry_extensions` tables. Set to true on an instance that runs
-        // its own registry and publishes extensions locally.
-        'self_hosted' => Utils::castBoolean(env('REGISTRY_SELF_HOSTED', false)),
-        // Registry Service (v2). When a service URL is set the catalog, installs and updates go through it;
-        // without one the cloud `~registry/v1/extensions` endpoint on `host` stays the fallback. Pin
-        // `api_version` to `v1` to keep the fallback while a service URL is configured.
-        'service_url' => env('REGISTRY_SERVICE_URL'),
-        'api_version' => env('REGISTRY_API_VERSION'),
+        // Registry Service: catalog, package endpoints and the instance API.
+        'service_url' => env('REGISTRY_SERVICE_URL', 'https://registry.fleetbase.io'),
         // Issued by the service when an admin registers this instance; stored encrypted in settings.
         'instance_token' => env('REGISTRY_INSTANCE_TOKEN'),
-        // `self_hosted` or `cloud`; defaults to `cloud` when `self_hosted` (this instance is the v1 registry) is true.
+        // `self_hosted` (default) or `cloud`; matched against each listing's hosting.
         'instance_kind' => env('REGISTRY_INSTANCE_KIND'),
         'instance' => [],
+        // Publisher portal the console links to (the service's website). Defaults to the service URL.
+        'publisher_url' => env('REGISTRY_PUBLISHER_URL'),
+        // Purchases through the service checkout: `auto` (on for a registered instance unless the service
+        // has no checkout endpoint), `true` or `false`.
+        'checkout' => env('REGISTRY_SERVICE_CHECKOUT', 'auto'),
         // Seconds the stored registry settings stay in the application cache between requests; writing one of
         // them forgets the cache at once. 0 reads the settings table on every request.
         'settings_cache_ttl' => env('REGISTRY_SETTINGS_CACHE_TTL', 30),
     ],
-    'stripe' => [
-        'key' => env('STRIPE_KEY', env('STRIPE_API_KEY')),
-        'secret' => env('STRIPE_SECRET', env('STRIPE_API_SECRET')),
-        'webhook_secret' => env('STRIPE_WEBHOOK_SECRET'),
-    ],
     'extensions' => [
         'preinstalled' => Utils::castBoolean(env('REGISTRY_PREINSTALLED_EXTENSIONS', false)),
         'protected_prefixes' => explode(',', env('REGISTRY_PROTECTED_PREFIXES', '@fleetbase,fleetbase,@flb,@fleetbase-extension,@flb-extension'))
     ],
-    'facilitator_fee' => env('REGISTRY_FACILITATOR_FEE', 10),
     'installer' => [
         // Queue installs and return a job id (the console follows the job). False runs the job inside the request, e.g. where no queue worker runs.
         'async' => Utils::castBoolean(env('REGISTRY_INSTALLER_ASYNC', true)),
diff --git a/server/resources/schemas/extension.schema.json b/server/resources/schemas/extension.schema.json
deleted file mode 100644
index 33a2866..0000000
--- a/server/resources/schemas/extension.schema.json
+++ /dev/null
@@ -1,119 +0,0 @@
-{
-    "$schema": "https://json-schema.org/draft/2020-12/schema",
-    "$id": "https://registry.fleetbase.io/schemas/extension.schema.json",
-    "title": "Fleetbase extension manifest",
-    "description": "Schema for the `extension.json` file that every Fleetbase extension bundle ships at its root. The manifest names the extension, pins its version and points at the engine (console) and/or api (server) packages the bundle contains.",
-    "type": "object",
-    "properties": {
-        "name": {
-            "type": "string",
-            "description": "Human readable extension name shown in the registry and console.",
-            "minLength": 1,
-            "maxLength": 120
-        },
-        "version": {
-            "type": "string",
-            "description": "Release version of the bundle, as a semantic version (https://semver.org).",
-            "$ref": "#/$defs/semver"
-        },
-        "description": {
-            "type": "string",
-            "description": "Short summary of what the extension does.",
-            "maxLength": 2000
-        },
-        "engine": {
-            "description": "The console (Ember engine) package in this bundle: either its npm package name or the manifest file that declares it (`package.json`).",
-            "$ref": "#/$defs/packageRef"
-        },
-        "api": {
-            "description": "The server (Laravel) package in this bundle: either its Composer package name or the manifest file that declares it (`composer.json`).",
-            "$ref": "#/$defs/packageRef"
-        },
-        "compat": {
-            "type": "object",
-            "description": "Version ranges of the Fleetbase console and API this release is compatible with.",
-            "properties": {
-                "console": {
-                    "description": "node-semver style range for `@fleetbase/console`, for example `>=0.7 <1.0`.",
-                    "$ref": "#/$defs/versionRange"
-                },
-                "api": {
-                    "description": "Composer style range for `fleetbase/core-api`, for example `^1.6`.",
-                    "$ref": "#/$defs/versionRange"
-                }
-            },
-            "additionalProperties": false
-        },
-        "channel": {
-            "type": "string",
-            "description": "Release channel the bundle is published to. Defaults to `stable` when omitted.",
-            "enum": ["stable", "beta"],
-            "default": "stable"
-        },
-        "keywords": {
-            "type": "array",
-            "description": "Search keywords for the registry.",
-            "items": {
-                "type": "string",
-                "minLength": 1,
-                "maxLength": 64
-            },
-            "maxItems": 20,
-            "uniqueItems": true
-        },
-        "repository": {
-            "type": "string",
-            "description": "URL of the source repository."
-        },
-        "license": {
-            "type": "string",
-            "description": "SPDX license identifier or expression."
-        },
-        "author": {
-            "type": "string",
-            "description": "Author or publisher, for example `Fleetbase Pte Ltd <hello@fleetbase.io>`."
-        }
-    },
-    "required": ["name", "version"],
-    "anyOf": [
-        {
-            "required": ["engine"]
-        },
-        {
-            "required": ["api"]
-        }
-    ],
-    "additionalProperties": true,
-    "$defs": {
-        "semver": {
-            "type": "string",
-            "pattern": "^(0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)(?:-((?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\\.(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?$"
-        },
-        "packageRef": {
-            "type": "string",
-            "minLength": 1,
-            "maxLength": 214,
-            "anyOf": [
-                {
-                    "$comment": "Manifest file name inside the bundle.",
-                    "enum": ["package.json", "composer.json"]
-                },
-                {
-                    "$comment": "npm package name, optionally scoped.",
-                    "pattern": "^(@[a-z0-9-~][a-z0-9-._~]*/)?[a-z0-9-~][a-z0-9-._~]*$"
-                },
-                {
-                    "$comment": "Composer package name (vendor/name).",
-                    "pattern": "^[a-z0-9]([_.-]?[a-z0-9]+)*/[a-z0-9](([_.]|-{1,2})?[a-z0-9]+)*$"
-                }
-            ]
-        },
-        "versionRange": {
-            "type": "string",
-            "minLength": 1,
-            "maxLength": 100,
-            "$comment": "Loose check: the characters used by node-semver and Composer range syntax (operators, wildcards, hyphen ranges, `||`).",
-            "pattern": "^[0-9A-Za-z.*^~<>=|! +-]+$"
-        }
-    }
-}
diff --git a/server/seeders/ExtensionsCategorySeeder.php b/server/seeders/ExtensionsCategorySeeder.php
deleted file mode 100644
index 5d2fb28..0000000
--- a/server/seeders/ExtensionsCategorySeeder.php
+++ /dev/null
@@ -1,359 +0,0 @@
-<?php
-
-namespace Fleetbase\RegistryBridge\Seeders;
-
-use Fleetbase\Models\Category;
-use Illuminate\Database\Seeder;
-
-class ExtensionsCategorySeeder extends Seeder
-{
-    /**
-     * Run the database seeds.
-     *
-     * @return void
-     */
-    public function run()
-    {
-        $categories = [
-            [
-                'name' => 'Telematics',
-                'description' => 'Advanced tracking and diagnostics for vehicle fleets, including real-time data and analytics.',
-                'internal_id' => 'FLBTELEMATICS',
-                'icon' => 'satellite-dish',
-                'tags' => ['tracking', 'diagnostics', 'real-time', 'analytics'],
-                'for' => 'extension_category'
-            ],
-            [
-                'name' => 'Inventory',
-                'description' => 'Tools for inventory management, stock control, and supply chain visibility.',
-                'internal_id' => 'FLBINVENTORY',
-                'icon' => 'boxes-packing',
-                'tags' => ['management', 'stock', 'supply chain'],
-                'for' => 'extension_category'
-            ],
-            [
-                'name' => 'Accounting',
-                'description' => 'Financial management solutions including invoicing, expense tracking, and financial reporting.',
-                'internal_id' => 'FLBACCOUNTING',
-                'icon' => 'cash-register',
-                'tags' => ['finance', 'invoicing', 'expenses', 'reporting'],
-                'for' => 'extension_category'
-            ],
-            [
-                'name' => 'Route Optimization',
-                'description' => 'Enhancements for efficient route planning and optimization to reduce travel time and costs.',
-                'internal_id' => 'FLBROUTE',
-                'icon' => 'route',
-                'tags' => ['route', 'planning', 'optimization', 'GPS', 'mapping'],
-                'for' => 'extension_category'
-            ],
-            [
-                'name' => 'Fleet Management',
-                'description' => 'Tools for managing fleet vehicles, including maintenance, tracking, and performance analysis.',
-                'internal_id' => 'FLBFLEET',
-                'icon' => 'truck-moving',
-                'tags' => ['vehicles', 'maintenance', 'tracking', 'analytics'],
-                'for' => 'extension_category'
-            ],
-            [
-                'name' => 'Order Management',
-                'description' => 'Solutions for handling orders from placement to delivery, including tracking and customer communication.',
-                'internal_id' => 'FLBORDER',
-                'icon' => 'clipboard-list',
-                'tags' => ['orders', 'tracking', 'delivery', 'customer service'],
-                'for' => 'extension_category'
-            ],
-            [
-                'name' => 'Warehouse Management',
-                'description' => 'Systems for managing warehouse operations, inventory storage, and logistics.',
-                'internal_id' => 'FLBWAREHOUSE',
-                'icon' => 'warehouse',
-                'tags' => ['warehouse', 'inventory', 'logistics', 'storage'],
-                'for' => 'extension_category'
-            ],
-            [
-                'name' => 'Compliance and Regulations',
-                'description' => 'Tools to ensure compliance with local and international shipping and logistics regulations.',
-                'internal_id' => 'FLBCOMPLIANCE',
-                'icon' => 'scale-balanced',
-                'tags' => ['compliance', 'regulations', 'shipping', 'international'],
-                'for' => 'extension_category'
-            ],
-            [
-                'name' => 'Analytics and Reporting',
-                'description' => 'Advanced analytics and reporting tools for insights into logistics operations.',
-                'internal_id' => 'FLBANALYTICS',
-                'icon' => 'chart-line',
-                'tags' => ['analytics', 'reporting', 'data', 'insights'],
-                'for' => 'extension_category'
-            ],
-            [
-                'name' => 'Customer Relationship Management (CRM)',
-                'description' => 'Extensions to manage customer interactions, support, and relationships.',
-                'internal_id' => 'FLBCRM',
-                'icon' => 'users',
-                'tags' => ['CRM', 'customer', 'support', 'relationship'],
-                'for' => 'extension_category'
-            ],
-            [
-                'name' => 'E-commerce',
-                'description' => 'Comprehensive e-commerce solutions, ranging from integration tools with existing platforms to complete e-commerce applications, enhancing online retail and digital transactions.',
-                'internal_id' => 'FLBECOMMERCE',
-                'icon' => 'store',
-                'tags' => ['e-commerce', 'integration', 'shopping', 'online'],
-                'for' => 'extension_category'
-            ],
-            [
-                'name' => 'Security and Risk Management',
-                'description' => 'Enhancements for improving security and managing risks in logistics operations.',
-                'internal_id' => 'FLBSECURITY',
-                'icon' => 'shield-alt',
-                'tags' => ['security', 'risk management', 'safety', 'protection'],
-                'for' => 'extension_category'
-            ],
-            [
-                'name' => 'Transportation Management',
-                'description' => 'Solutions for managing and optimizing different modes of transportation, including carrier selection and freight consolidation.',
-                'internal_id' => 'FLBTRANSPORT',
-                'icon' => 'truck-fast',
-                'tags' => ['transportation', 'freight', 'carrier management', 'optimization'],
-                'for' => 'extension_category'
-            ],
-            [
-                'name' => 'Customs and Trade Compliance',
-                'description' => 'Tools to navigate and comply with international trade laws, customs regulations, and import/export requirements.',
-                'internal_id' => 'FLBCUSTOMS',
-                'icon' => 'passport',
-                'tags' => ['customs', 'trade', 'compliance', 'import', 'export'],
-                'for' => 'extension_category'
-            ],
-            [
-                'name' => 'Supplier Relationship Management',
-                'description' => 'Extensions to manage and enhance relationships with suppliers, including communication and performance tracking.',
-                'internal_id' => 'FLBSUPPLIER',
-                'icon' => 'handshake',
-                'tags' => ['suppliers', 'relationship management', 'performance', 'communication'],
-                'for' => 'extension_category'
-            ],
-            [
-                'name' => 'Quality Control',
-                'description' => 'Tools for quality assurance in supply chain processes, including product inspections and compliance monitoring.',
-                'internal_id' => 'FLBQUALITY',
-                'icon' => 'check-circle',
-                'tags' => ['quality control', 'inspection', 'compliance', 'assurance'],
-                'for' => 'extension_category'
-            ],
-            [
-                'name' => 'Forecasting and Demand Planning',
-                'description' => 'Analytical tools for accurate demand forecasting and inventory optimization based on market trends and data analysis.',
-                'internal_id' => 'FLBFORECASTING',
-                'icon' => 'magnifying-glass-location',
-                'tags' => ['forecasting', 'demand planning', 'inventory', 'market trends'],
-                'for' => 'extension_category'
-            ],
-            [
-                'name' => 'Procurement and Purchasing',
-                'description' => 'Solutions for managing procurement processes, including purchase orders, vendor selection, and contract management.',
-                'internal_id' => 'FLBPROCUREMENT',
-                'icon' => 'basket-shopping',
-                'tags' => ['procurement', 'purchasing', 'vendors', 'contracts'],
-                'for' => 'extension_category'
-            ],
-            [
-                'name' => 'Asset Tracking and Management',
-                'description' => 'Tools for tracking and managing assets within the supply chain, including RFID, barcode, and IoT technologies.',
-                'internal_id' => 'FLBASSET',
-                'icon' => 'barcode',
-                'tags' => ['asset tracking', 'management', 'RFID', 'IoT'],
-                'for' => 'extension_category'
-            ],
-            [
-                'name' => 'Sustainability and Environmental Compliance',
-                'description' => 'Solutions focused on environmental compliance and sustainable practices in logistics and supply chain operations.',
-                'internal_id' => 'FLBENVIRONMENT',
-                'icon' => 'leaf',
-                'tags' => ['sustainability', 'environmental compliance', 'green logistics', 'eco-friendly'],
-                'for' => 'extension_category'
-            ],
-            [
-                'name' => 'Human Resources Management',
-                'description' => 'Extensions for managing logistics workforce, including scheduling, training, and performance evaluations.',
-                'internal_id' => 'FLBHR',
-                'icon' => 'user-tie',
-                'tags' => ['human resources', 'workforce management', 'training', 'scheduling'],
-                'for' => 'extension_category'
-            ],
-            [
-                'name' => 'Collaboration and Communication Tools',
-                'description' => 'Platforms and tools to facilitate effective collaboration and communication among supply chain stakeholders.',
-                'internal_id' => 'FLBCOLLABORATION',
-                'icon' => 'comments',
-                'tags' => ['collaboration', 'communication', 'teamwork', 'stakeholders'],
-                'for' => 'extension_category'
-            ],
-            [
-                'name' => 'Artificial Intelligence',
-                'description' => 'Advanced AI-driven tools and applications for predictive analytics, automation, and intelligent decision-making in logistics.',
-                'internal_id' => 'FLBAI',
-                'icon' => 'robot',
-                'tags' => ['AI', 'predictive analytics', 'automation', 'intelligence'],
-                'for' => 'extension_category'
-            ],
-            [
-                'name' => 'Freight Forwarding',
-                'description' => 'Comprehensive solutions for managing and optimizing the process of freight forwarding, including documentation, cargo handling, and customs brokerage.',
-                'internal_id' => 'FLBFREIGHTFORWARD',
-                'icon' => 'truck-ramp-box',
-                'tags' => ['freight forwarding', 'cargo handling', 'customs', 'logistics'],
-                'for' => 'extension_category'
-            ],
-            [
-                'name' => 'Air Cargo Logistics',
-                'description' => 'Specialized tools for air cargo handling, including tracking, capacity management, and air freight optimization.',
-                'internal_id' => 'FLBAIRCARGO',
-                'icon' => 'plane',
-                'tags' => ['air cargo', 'tracking', 'capacity management', 'air freight'],
-                'for' => 'extension_category'
-            ],
-            [
-                'name' => 'Bulk Shipping',
-                'description' => 'Solutions for managing bulk cargo shipments, including vessel chartering, loading and unloading operations, and safety compliance.',
-                'internal_id' => 'FLBBULKSHIPPING',
-                'icon' => 'anchor',
-                'tags' => ['bulk shipping', 'vessel chartering', 'cargo operations', 'safety'],
-                'for' => 'extension_category'
-            ],
-            [
-                'name' => 'LNG Logistics',
-                'description' => 'Tools and technologies for handling Liquefied Natural Gas (LNG) logistics, covering transportation, storage, and distribution.',
-                'internal_id' => 'FLBLNGLOGISTICS',
-                'icon' => 'gas-pump',
-                'tags' => ['LNG', 'liquefied natural gas', 'transportation', 'storage'],
-                'for' => 'extension_category'
-            ],
-            [
-                'name' => 'Train Cargo Management',
-                'description' => 'Systems for managing train cargo logistics, including scheduling, cargo tracking, and railway compliance.',
-                'internal_id' => 'FLBTRAINCARGO',
-                'icon' => 'train',
-                'tags' => ['train cargo', 'scheduling', 'tracking', 'railway'],
-                'for' => 'extension_category'
-            ],
-            [
-                'name' => 'Container Haulage',
-                'description' => 'Efficient management of container haulage operations, with features for container tracking, port operations, and haulier scheduling.',
-                'internal_id' => 'FLBCONTAINERHAULAGE',
-                'icon' => 'trailer',
-                'tags' => ['container', 'haulage', 'tracking', 'port operations'],
-                'for' => 'extension_category'
-            ],
-            [
-                'name' => 'Tactical Logistics',
-                'description' => 'Solutions for tactical support, including field logistics, deployment planning, and military supply chain management.',
-                'internal_id' => 'FLBTACTICAL',
-                'icon' => 'jet-fighter',
-                'tags' => ['tactical', 'field logistics', 'deployment', 'military supply'],
-                'for' => 'extension_category'
-            ],
-            [
-                'name' => 'Secure Communications',
-                'description' => 'Secure and encrypted communication tools designed for military-grade confidentiality and reliability.',
-                'internal_id' => 'FLBSECURECOMMS',
-                'icon' => 'walkie-talkie',
-                'tags' => ['secure', 'encrypted', 'communication', 'military'],
-                'for' => 'extension_category'
-            ],
-            [
-                'name' => 'Surveillance and Reconnaissance',
-                'description' => 'Advanced surveillance and reconnaissance tools, including UAVs, sensors, and satellite imaging for operational intelligence.',
-                'internal_id' => 'FLBSURVEILLANCE',
-                'icon' => 'binoculars',
-                'tags' => ['surveillance', 'reconnaissance', 'UAV', 'intelligence'],
-                'for' => 'extension_category'
-            ],
-            [
-                'name' => 'Cybersecurity',
-                'description' => 'Cybersecurity solutions to protect logistics data and operations from cyber threats and attacks.',
-                'internal_id' => 'FLBCYBERSECURITY',
-                'icon' => 'fingerprint',
-                'tags' => ['cybersecurity', 'data protection', 'cyber threats', 'security'],
-                'for' => 'extension_category'
-            ],
-            [
-                'name' => 'Mission Planning and Analysis',
-                'description' => 'Tools for strategic mission planning and analysis, including scenario modeling and operational readiness assessments.',
-                'internal_id' => 'FLBMISSIONPLANNING',
-                'icon' => 'map-marked-alt',
-                'tags' => ['mission planning', 'analysis', 'modeling', 'readiness'],
-                'for' => 'extension_category'
-            ],
-            [
-                'name' => 'Armaments and Ammunition Management',
-                'description' => 'Management tools for tracking and maintaining armaments and ammunition inventories.',
-                'internal_id' => 'FLBARMAMANAGEMENT',
-                'icon' => 'person-rifle',
-                'tags' => ['armaments', 'ammunition', 'inventory', 'management'],
-                'for' => 'extension_category'
-            ],
-            [
-                'name' => 'Emergency and Disaster Response',
-                'description' => 'Solutions for organizing and managing logistics in emergency and disaster response scenarios.',
-                'internal_id' => 'FLBEMERGENCYRESPONSE',
-                'icon' => 'truck-medical',
-                'tags' => ['emergency', 'disaster response', 'logistics', 'crisis management'],
-                'for' => 'extension_category'
-            ],
-            [
-                'name' => 'Training and Simulation',
-                'description' => 'Advanced training tools and simulation software for military logistics and operational training.',
-                'internal_id' => 'FLBTRAININGSIM',
-                'icon' => 'person-running',
-                'tags' => ['training', 'simulation', 'military', 'logistics'],
-                'for' => 'extension_category'
-            ],
-            [
-                'name' => 'Vehicle and Equipment Maintenance',
-                'description' => 'Maintenance management systems for military vehicles and equipment, including predictive maintenance tools.',
-                'internal_id' => 'FLBVEHICLEMAINT',
-                'icon' => 'wrench',
-                'tags' => ['vehicle', 'equipment', 'maintenance', 'predictive tools'],
-                'for' => 'extension_category'
-            ],
-            [
-                'name' => 'Manufacturing Operations',
-                'description' => 'Tools and systems designed for the manufacturing industry, including automation, process control, and production planning.',
-                'internal_id' => 'FLBMANUFACTURING',
-                'icon' => 'industry',
-                'tags' => ['manufacturing', 'automation', 'process control', 'production'],
-                'for' => 'extension_category'
-            ],
-            [
-                'name' => 'Medical Logistics',
-                'description' => 'Solutions tailored for the medical industry, focusing on medical supply chain, equipment tracking, and pharmaceutical logistics.',
-                'internal_id' => 'FLBMEDICAL',
-                'icon' => 'kit-medical',
-                'tags' => ['medical', 'pharmaceutical', 'supply chain', 'equipment tracking'],
-                'for' => 'extension_category'
-            ],
-            [
-                'name' => 'Mining Industry',
-                'description' => 'Specialized solutions for the mining industry, encompassing resource management, excavation planning, and safety protocols.',
-                'internal_id' => 'FLBMINING',
-                'icon' => 'gem',
-                'tags' => ['mining', 'resource management', 'excavation', 'safety'],
-                'for' => 'extension_category'
-            ]
-        ];
-
-        // Insert core extension categories
-        foreach ($categories as $category) {
-            Category::updateOrCreate(
-                [
-                    'internal_id' => $category['internal_id'],
-                    'for' => 'extension_category'
-                ],
-                array_merge($category, ['core_category' => 1])
-            );
-        }
-    }
-}
diff --git a/server/src/Auth/Schemas/RegistryBridge.php b/server/src/Auth/Schemas/RegistryBridge.php
index a0d495d..75cd400 100644
--- a/server/src/Auth/Schemas/RegistryBridge.php
+++ b/server/src/Auth/Schemas/RegistryBridge.php
@@ -2,6 +2,12 @@
 
 namespace Fleetbase\RegistryBridge\Auth\Schemas;
 
+/**
+ * Permissions for the console's Extensions module: browsing, installing and buying from the Registry Service.
+ *
+ * Publishing, review and payouts live on the publisher website, so their resources (registry tokens, bundles,
+ * analytics, payments) and the developer roles are gone.
+ */
 class RegistryBridge
 {
     /**
@@ -23,19 +29,10 @@ class RegistryBridge
      * The permission schema resources.
      */
     public array $resources = [
-        [
-            'name'    => 'registry-token',
-            'actions' => ['export'],
-        ],
         [
             'name'    => 'extension',
             'actions' => ['uninstall', 'install', 'purchase'],
         ],
-        [
-            'name'           => 'extension-bundle',
-            'actions'        => ['submit'],
-            'remove_actions' => [],
-        ],
         [
             'name'           => 'extension-purchase',
             'actions'        => [],
@@ -46,16 +43,6 @@ class RegistryBridge
             'actions'        => [],
             'remove_actions' => ['create', 'update', 'delete'],
         ],
-        [
-            'name'           => 'extension-analytic',
-            'actions'        => [],
-            'remove_actions' => ['create', 'update', 'delete'],
-        ],
-        [
-            'name'           => 'extension-payment',
-            'actions'        => ['onboard'],
-            'remove_actions' => ['create', 'update', 'delete'],
-        ],
     ];
 
     /**
@@ -63,92 +50,19 @@ class RegistryBridge
      */
     public array $policies = [
         [
-            'name'        => 'ExtensionDeveloper',
-            'description' => 'Policy for developing and publishing extensions.',
-            'permissions' => [
-                'see extension',
-                'see registry-token',
-                'list registry-token',
-                'create registry-token',
-                'see extension-bundle',
-                'list extension-bundle',
-                'view extension-bundle',
-                'create extension-bundle',
-                'update extension-bundle',
-                'delete extension-bundle',
-                'submit extension-bundle',
-                'see extension-analytic',
-                'view extension-analytic',
-                'see extension-payment',
-                'view extension-payment',
-                'list extension',
-            ],
-        ],
-        [
-            'name'        => 'ExtensionMarketing',
-            'description' => 'Policy to provide insight for marketing extensions.',
+            'name'        => 'ExtensionOperator',
+            'description' => 'Policy for browsing, installing and buying extensions.',
             'permissions' => [
                 'see extension',
-                'see extension-bundle',
-                'list extension-bundle',
-                'update extension-bundle',
-                'see extension-analytic',
-                'view extension-analytic',
-                'list extension-analytic',
                 'list extension',
-            ],
-        ],
-        [
-            'name'        => 'ExtensionFinance',
-            'description' => 'Policy for managing finance and accounting for extensions.',
-            'permissions' => [
-                'see extension',
-                'see extension-analytic',
-                'view extension-analytic',
-                'list extension-analytic',
-                'see extension-payment',
-                'view extension-payment',
-                'list extension-payment',
-                'onboard extension-payment',
-                'list extension',
-            ],
-        ],
-        [
-            'name'        => 'ExtensionSales',
-            'description' => 'Policy for managing sales reports of extensions.',
-            'permissions' => [
-                'see extension',
-                'see extension-analytic',
-                'view extension-analytic',
-                'list extension-analytic',
-                'see extension-payment',
-                'view extension-payment',
-                'list extension-payment',
+                'view extension',
+                'install extension',
+                'uninstall extension',
+                'purchase extension',
+                'see extension-install',
+                'list extension-install',
                 'see extension-purchase',
-                'view extension-purchase',
                 'list extension-purchase',
-                'list extension',
-            ],
-        ],
-        [
-            'name'        => 'ExtensionManager',
-            'description' => 'Policy for complete management of extensions.',
-            'permissions' => [
-                'see extension',
-                'see extension-bundle',
-                'list extension-bundle',
-                'view extension-bundle',
-                'create extension-bundle',
-                'update extension-bundle',
-                'delete extension-bundle',
-                'submit extension-bundle',
-                'see extension-analytic',
-                'view extension-analytic',
-                'list extension-analytic',
-                'see extension-payment',
-                'view extension-payment',
-                'list extension-payment',
-                'list extension',
             ],
         ],
     ];
@@ -158,57 +72,10 @@ class RegistryBridge
      */
     public array $roles = [
         [
-            'name'        => 'Extension Developer',
-            'description' => 'Role for developing and publishing extensions.',
+            'name'        => 'Extension Admin',
+            'description' => 'Role for installing, updating, uninstalling and buying extensions.',
             'policies'    => [
-                'ExtensionDeveloper',
-            ],
-        ],
-        [
-            'name'           => 'Quality Assurance',
-            'description'    => 'Role for testing extensions.',
-            'permissions'    => [
-                'see extension',
-                'list extension',
-                'view extension',
-                'see extension-bundle',
-                'list extension-bundle',
-                'view extension-bundle',
-                'create extension-bundle',
-                'update extension-bundle',
-                'delete extension-bundle',
-                'submit extension-bundle',
-            ],
-        ],
-        [
-            'name'           => 'Extension Auditor',
-            'description'    => 'Role for auditing and creating reports for extensions.',
-            'permissions'    => [
-                'see extension',
-                'list extension',
-                'view extension',
-                'see extension-bundle',
-                'list extension-bundle',
-                'view extension-bundle',
-                'see extension-analytic',
-                'list extension-analytic',
-                'view extension-analytic',
-                'see extension-payment',
-                'list extension-payment',
-                'view extension-payment',
-            ],
-        ],
-        [
-            'name'           => 'Extension Admin',
-            'description'    => 'Role for full control of extensions.',
-            'permissions'    => [
-                '* extension',
-                '* extension-bundle',
-                '* extension-analytic',
-                '* extension-payment',
-                '* extension-purchase',
-                '* extension-install',
-                '* registry-token',
+                'ExtensionOperator',
             ],
         ],
     ];
diff --git a/server/src/Console/Commands/Initialize.php b/server/src/Console/Commands/Initialize.php
index ccbafd0..b007e3f 100644
--- a/server/src/Console/Commands/Initialize.php
+++ b/server/src/Console/Commands/Initialize.php
@@ -2,41 +2,21 @@
 
 namespace Fleetbase\RegistryBridge\Console\Commands;
 
-use Fleetbase\RegistryBridge\Support\RegistryConfig;
-use Fleetbase\RegistryBridge\Support\Utils;
 use Illuminate\Console\Command;
 
+/**
+ * Kept for deploy scripts that still call it. Installs from the Registry Service inject package
+ * credentials per process, so there is no `.npmrc` or `auth.json` to write any more.
+ */
 class Initialize extends Command
 {
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
     protected $signature = 'registry:init';
 
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Runs initialization for registry bridge.';
+    protected $description = 'No-op: the registry bridge needs no initialization with the Registry Service.';
 
-    /**
-     * Execute the console command.
-     *
-     * @return int
-     */
     public function handle()
     {
-        // Installs from the Registry Service inject credentials per process; nothing is written to disk
-        if (RegistryConfig::current()->usesService()) {
-            $this->info('Registry Service configured; skipping .npmrc and auth.json setup.');
-
-            return 0;
-        }
-
-        Utils::bootRegistryAuth(true);
+        $this->info('Nothing to initialize: installs from the Registry Service carry their own credentials.');
 
         return 0;
     }
diff --git a/server/src/Expansions/CategoryExpansion.php b/server/src/Expansions/CategoryExpansion.php
deleted file mode 100644
index 7cca4e5..0000000
--- a/server/src/Expansions/CategoryExpansion.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-namespace Fleetbase\RegistryBridge\Expansions;
-
-use Fleetbase\Build\Expansion;
-use Fleetbase\RegistryBridge\Models\RegistryExtension;
-
-class CategoryExpansion implements Expansion
-{
-    /**
-     * Get the target class to expand.
-     *
-     * @return string|Class
-     */
-    public static function target()
-    {
-        return \Fleetbase\Models\Category::class;
-    }
-
-    /**
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany
-     */
-    public static function registryExtensions()
-    {
-        return function () {
-            /* @var \Illuminate\Database\Eloquent\Model $this */
-            return $this->hasMany(RegistryExtension::class, 'category_uuid', 'uuid')->where('status', 'published');
-        };
-    }
-}
diff --git a/server/src/Http/Controllers/Internal/v1/ExtensionInstallerController.php b/server/src/Http/Controllers/Internal/v1/ExtensionInstallerController.php
index d7ea4f6..7a41515 100644
--- a/server/src/Http/Controllers/Internal/v1/ExtensionInstallerController.php
+++ b/server/src/Http/Controllers/Internal/v1/ExtensionInstallerController.php
@@ -4,32 +4,26 @@
 
 use Fleetbase\Http\Controllers\Controller;
 use Fleetbase\RegistryBridge\Http\Requests\InstallExtensionRequest;
-use Fleetbase\RegistryBridge\Models\RegistryExtension;
-use Fleetbase\RegistryBridge\Models\RegistryExtensionInstall;
 use Fleetbase\RegistryBridge\Models\RegistryServiceInstall;
-use Fleetbase\RegistryBridge\Support\Installer\ExtensionRef;
 use Fleetbase\RegistryBridge\Support\Installer\InstallerException;
 use Fleetbase\RegistryBridge\Support\Installer\InstallerService;
 
 class ExtensionInstallerController extends Controller
 {
     /**
-     * Queue an install of an extension for the current company.
+     * Queue an install of a Registry Service extension for the current company.
      *
      * Returns `202 { status: "queued", job }` straight away; progress arrives on
      * the `install.{company}.{extension}` socket channel and through
      * GET installer/jobs/{id}. When `registry-bridge.installer.async` is off
      * the job runs inside the request and the response is
-     * `{ status: "ok", job, install }` as before.
+     * `{ status: "ok", job, install }`.
      *
-     * Instances with preinstalled extensions (cloud) only record the install.
+     * Instances with preinstalled extensions (cloud) only record the install
+     * (see InstallerService).
      */
     public function install(InstallExtensionRequest $request, InstallerService $installer)
     {
-        if (config('registry-bridge.extensions.preinstalled') === true && $this->isLocalExtension($request)) {
-            return $this->installPreinstalled($request);
-        }
-
         return $this->enqueue($installer, 'install', $request);
     }
 
@@ -39,13 +33,18 @@ public function install(InstallExtensionRequest $request, InstallerService $inst
      */
     public function uninstall(InstallExtensionRequest $request, InstallerService $installer)
     {
-        if (config('registry-bridge.extensions.preinstalled') === true && $this->isLocalExtension($request)) {
-            return $this->uninstallPreinstalled($request);
-        }
-
         return $this->enqueue($installer, 'uninstall', $request);
     }
 
+    /**
+     * Queue an update of an installed extension, to `version` or the newest compatible release. Same
+     * responses as install(); progress arrives on `install.{company}.{extension}`.
+     */
+    public function update(InstallExtensionRequest $request, InstallerService $installer)
+    {
+        return $this->enqueue($installer, 'update', $request);
+    }
+
     /**
      * An installer job of the current company: status, stage, progress, queue
      * position and, once finished, the result (failed stage, message and the
@@ -79,58 +78,8 @@ private function enqueue(InstallerService $installer, string $action, InstallExt
             return response()->error($job['message'] ?? 'The installer job failed.');
         }
 
-        $install = ($job['extension']['source'] ?? ExtensionRef::LOCAL) === ExtensionRef::REGISTRY_SERVICE
-            ? RegistryServiceInstall::where(['company_uuid' => session('company'), 'extension_id' => $job['extension']['id'] ?? null])->first()
-            : RegistryExtensionInstall::where(['company_uuid' => session('company'), 'extension_uuid' => $job['extension']['uuid'] ?? null])->first();
-
-        return response()->json(['status' => 'ok', 'job' => $job, $action === 'install' ? 'install' : 'uninstalled' => $action === 'install' ? $install : $install === null]);
-    }
-
-    /**
-     * Whether the requested extension is in this instance's registry tables.
-     * Registry Service extensions go through the InstallerService, which
-     * handles preinstalled mode itself and reports to the service.
-     */
-    private function isLocalExtension(InstallExtensionRequest $request): bool
-    {
-        return RegistryExtension::where('public_id', $request->input('extension'))->exists();
-    }
-
-    private function installPreinstalled(InstallExtensionRequest $request)
-    {
-        $extension = RegistryExtension::where('public_id', $request->input('extension'))->first();
-
-        $installed = RegistryExtensionInstall::where(['company_uuid' => session('company'), 'extension_uuid' => $extension->uuid])->exists();
-        if ($installed) {
-            return response()->error('This extension is already installed.');
-        }
-
-        $extension->currentBundle->runInstallerProgress();
-
-        $install = RegistryExtensionInstall::create([
-            'company_uuid'   => session('company'),
-            'extension_uuid' => $extension->uuid,
-        ]);
-
-        return response()->json(['status' => 'ok', 'install' => $install]);
-    }
-
-    private function uninstallPreinstalled(InstallExtensionRequest $request)
-    {
-        $extension = RegistryExtension::where('public_id', $request->input('extension'))->first();
-
-        $notInstalled = RegistryExtensionInstall::where(['company_uuid' => session('company'), 'extension_uuid' => $extension->uuid])->doesntExist();
-        if ($notInstalled) {
-            return response()->error('This extension is not installed.');
-        }
-
-        $extension->currentBundle->runUninstallerProgress();
-
-        $uninstalled = RegistryExtensionInstall::where([
-            'company_uuid'   => session('company'),
-            'extension_uuid' => $extension->uuid,
-        ])->delete();
+        $install = RegistryServiceInstall::where(['company_uuid' => session('company'), 'extension_id' => $job['extension']['id'] ?? null])->first();
 
-        return response()->json(['status' => 'ok', 'uninstalled' => $uninstalled]);
+        return response()->json(['status' => 'ok', 'job' => $job, $action === 'uninstall' ? 'uninstalled' : 'install' => $action === 'uninstall' ? $install === null : $install]);
     }
 }
diff --git a/server/src/Http/Controllers/Internal/v1/RegistryAuthController.php b/server/src/Http/Controllers/Internal/v1/RegistryAuthController.php
deleted file mode 100644
index cedad35..0000000
--- a/server/src/Http/Controllers/Internal/v1/RegistryAuthController.php
+++ /dev/null
@@ -1,435 +0,0 @@
-<?php
-
-namespace Fleetbase\RegistryBridge\Http\Controllers\Internal\v1;
-
-use Fleetbase\Http\Controllers\Controller;
-use Fleetbase\Models\User;
-use Fleetbase\RegistryBridge\Http\Requests\AddRegistryUserRequest;
-use Fleetbase\RegistryBridge\Http\Requests\AuthenticateRegistryUserRequest;
-use Fleetbase\RegistryBridge\Http\Requests\RegistryAuthRequest;
-use Fleetbase\RegistryBridge\Http\Resources\RegistryUser as RegistryUserResource;
-use Fleetbase\RegistryBridge\Models\RegistryDeveloperAccount;
-use Fleetbase\RegistryBridge\Models\RegistryExtension;
-use Fleetbase\RegistryBridge\Models\RegistryUser;
-use Fleetbase\RegistryBridge\Support\Bridge;
-use Fleetbase\Support\Auth;
-use Illuminate\Http\Request;
-use Illuminate\Support\Str;
-
-class RegistryAuthController extends Controller
-{
-    /**
-     * Handle Composer authentication and return a list of unauthorized packages.
-     *
-     * This function authenticates the user based on the provided registry token.
-     * If the token is valid, it returns a list of packages that the user is not authorized to access.
-     *
-     * @param Request $request the incoming HTTP request containing the registry token
-     *
-     * @return \Illuminate\Http\JsonResponse a JSON response containing the status and a list of unauthorized packages
-     */
-    public function composerAuthentication(Request $request)
-    {
-        $registryToken = $request->input('registryToken');
-        if (!$registryToken) {
-            return response()->error('No registry token provided for authentication.', 401);
-        }
-
-        // Get registry user via token
-        $registryUser = RegistryUser::where('registry_token', $registryToken)->first();
-        if (!$registryUser) {
-            return response()->error('Invalid registry token provided for authentication.', 401);
-        }
-
-        // Init unauthorized extensions
-        $unauthorizedExtensionNames = collect();
-
-        // Unless admin the registry user is only allowed access to their extensions
-        if ($registryUser->isNotAdmin()) {
-            // Fetch unauthorized extensions
-            $unauthorizedExtensions = RegistryExtension::where('payment_required', true)
-            ->whereDoesntHave('purchases', function ($query) use ($registryUser) {
-                $query->where('company_uuid', $registryUser->company_uuid);
-            })
-            ->whereHas('currentBundle')
-            ->with('currentBundle')
-            ->get();
-
-            // Map to unathorized to package names
-            $unauthorizedExtensionNames = $unauthorizedExtensions->map(function ($registryExtension) {
-                $composerJson = $registryExtension->currentBundle->meta['composer.json'] ?? [];
-
-                return $composerJson['name'] ?? null;
-            })->filter()->values();
-        }
-
-        // Done
-        return response()->json([
-            'status'               => 'ok',
-            'unauthorizedPackages' => $unauthorizedExtensionNames,
-        ]);
-    }
-
-    /**
-     * Authenticates a registry user based on provided credentials.
-     *
-     * This method attempts to authenticate a user using an identity (which can be either an email or username)
-     * and a password. Upon successful authentication, it either retrieves an existing token associated with
-     * the user or generates a new one. The method returns the token and user information in JSON format.
-     *
-     * If authentication fails or a token cannot be generated or retrieved, an error response is returned.
-     *
-     * @param AuthenticateRegistryUserRequest $request the request object containing identity and password
-     *
-     * @return RegistryUserResource Returns a JSON resource representing the registry user along with groups and containing the auth token and additional user data.
-     *                              Returns an error response if authentication fails or token generation is unsuccessful.
-     */
-    public function authenticate(AuthenticateRegistryUserRequest $request)
-    {
-        $identity = $request->input('identity');
-        $password = $request->input('password');
-
-        // First, try to find a cloud user
-        $user = User::where(function ($query) use ($identity) {
-            $query->where('email', $identity)->orWhere('phone', $identity)->orWhere('username', $identity);
-        })->first();
-
-        if ($user && Auth::checkPassword($password, $user->password)) {
-            // Cloud user authentication
-            $registryUser = RegistryUser::firstOrCreate(
-                [
-                    'company_uuid' => $user->company_uuid,
-                    'user_uuid'    => $user->uuid,
-                ],
-                [
-                    'account_type' => 'cloud',
-                    'scope'        => '*',
-                    'expires_at'   => now()->addYear(),
-                    'name'         => $user->public_id . ' developer token',
-                ]
-            );
-
-            return new RegistryUserResource($registryUser);
-        }
-
-        // If not a cloud user, try Registry Developer Account
-        $developerAccount = RegistryDeveloperAccount::where(function ($query) use ($identity) {
-            $query->where('email', $identity)->orWhere('username', $identity);
-        })->first();
-
-        if (!$developerAccount) {
-            return response()->error('Invalid credentials.', 401);
-        }
-
-        if ($developerAccount->status !== 'active') {
-            return response()->error('Account is not active. Please verify your email.', 401);
-        }
-
-        if (Auth::isInvalidPassword($password, $developerAccount->password)) {
-            return response()->error('Invalid credentials.', 401);
-        }
-
-        // Developer account authentication
-        $registryUser = RegistryUser::firstOrCreate(
-            [
-                'developer_account_uuid' => $developerAccount->uuid,
-            ],
-            [
-                'account_type' => 'developer',
-                'scope'        => '*',
-                'expires_at'   => now()->addYear(),
-                'name'         => $developerAccount->username . ' developer token',
-            ]
-        );
-
-        return new RegistryUserResource($registryUser);
-    }
-
-    /**
-     * Adds a new user to the registry with authentication credentials.
-     *
-     * This method creates a registry user linked to the currently active company
-     * of the user. It requires an identity (email or username) and password for
-     * authentication. After successful authentication, it generates a developer
-     * key for the user with a scope and expiration date.
-     *
-     * @param AddRegistryUserRequest $request the request object containing identity and password
-     *
-     * @return \Illuminate\Http\JsonResponse returns the newly created registry user data in JSON format
-     */
-    public function addUser(AddRegistryUserRequest $request)
-    {
-        $identity    = $request->input('identity');
-        $password    = $request->input('password');
-
-        // Find user by email or username
-        $user = User::where(function ($query) use ($identity) {
-            $query->where('email', $identity)->orWhere('phone', $identity)->orWhere('username', $identity);
-        })->first();
-
-        // Authenticate user with password
-        if (Auth::isInvalidPassword($password, $user->password)) {
-            return response()->error('Invalid credentials.', 401);
-        }
-
-        // Check if registry user already exists first
-        $registryUser = RegistryUser::where(['company_uuid' => $user->company_uuid, 'user_uuid' => $user->uuid])->first();
-        if (!$registryUser) {
-            // Create registry user
-            $registryUser = RegistryUser::create([
-                'company_uuid' => $user->company_uuid,
-                'user_uuid'    => $user->uuid,
-                'scope'        => '*',
-                'expires_at'   => now()->addYear(),
-                'name'         => $user->public_id . ' developer token',
-            ]);
-        }
-
-        return response()->json($registryUser);
-    }
-
-    /**
-     * Checks if a user has access to the registry based on their identity.
-     *
-     * This function receives a request containing an 'identity' (which could be an email or username) and
-     * attempts to find a corresponding user. If the user is found and they have admin privileges, it grants access
-     * to the registry by returning a JSON response indicating that access is allowed. If the user doesn't have
-     * admin privileges or the user can't be found based on the provided identity, it returns an error response.
-     *
-     * @param RegistryAuthRequest $request the request containing the user's identity information
-     *
-     * @return \Illuminate\Http\JsonResponse|\Illuminate\Http\Response
-     *                                                                 Returns a JSON response indicating access is allowed if the user is an admin,
-     *                                                                 or an error response if the user is not an admin or can't be found
-     */
-    public function checkAccess(RegistryAuthRequest $request)
-    {
-        $packageName       = $request->input('package');
-        $identity          = $request->input('identity');
-        $protectedPackage  = Str::startsWith($packageName, config('registry-bridge.extensions.protected_prefixes'));
-
-        // If no identity and not a protected package allow access
-        if (!$identity && !$protectedPackage) {
-            return response()->json(['allowed' => true]);
-        }
-
-        // if no identity provided
-        if (!$identity) {
-            return response()->error('No identity provided.', 401);
-        }
-
-        // Get registry user via identity
-        try {
-            $registryUser = RegistryUser::findFromUsername($identity);
-        } catch (\Exception $e) {
-            return response()->error($e->getMessage(), 401);
-        }
-
-        // If registry user is admin allow access
-        if ($registryUser->is_admin) {
-            return response()->json(['allowed' => true]);
-        }
-
-        // Check if package is protected, if so verify user has access to package
-        if ($protectedPackage) {
-            $extension = RegistryExtension::findByPackageName($packageName);
-            if ($extension && $extension->doesntHaveAccess($registryUser)) {
-                return response()->error('This package requires payment to access.', 401);
-            }
-        }
-
-        // For now only admin users can access registry
-        return response()->json(['allowed' => true]);
-    }
-
-    /**
-     * Validates whether a user is allowed to publish or unpublish a specified package in the registry.
-     *
-     * This function extracts the user's identity, the package name, and the desired action ('publish' or 'unpublish')
-     * from the request. It then performs several checks:
-     *   1. Verifies that the specified package (extension) exists in the registry.
-     *   2. Confirms the existence of the user associated with the provided identity.
-     *   3. Checks if the user has administrative privileges.
-     *   4. Ensures that the extension's status allows the desired action (either 'approved' or 'published' for publishing,
-     *      'published' for unpublishing).
-     * If these conditions are met, the function updates the extension's status based on the action and returns a
-     * JSON response indicating the action is allowed. If any of these checks fail, it returns an error response.
-     *
-     * @param RegistryAuthRequest $request the request containing the user's identity, package information, and action
-     *
-     * @return \Illuminate\Http\JsonResponse|\Illuminate\Http\Response
-     *                                                                 Returns a JSON response indicating the action is allowed if all checks pass, or
-     *                                                                 an error response if any check fails
-     */
-    public function checkPublishAllowed(RegistryAuthRequest $request)
-    {
-        $identity    = $request->input('identity');
-        $package     = $request->input('package');
-        $action      = $request->input('action', 'publish');
-        $force       = $request->boolean('force');
-        $password    = $request->input('password');
-
-        // Find user by email or username
-        $registryUser = RegistryUser::findFromUsername($identity);
-        if (!$registryUser) {
-            return response()->error('Attempting to publish extension with invalid user.', 401);
-        }
-
-        // If force publish bypass checks, authenticate by user login
-        if ($force === true) {
-            // Authenticate user with password
-            if (Auth::isInvalidPassword($password, $registryUser->user->password)) {
-                return response()->error('Invalid credentials, unable to force publish.', 401);
-            }
-
-            return response()->json(['allowed' => true]);
-        }
-
-        // Make sure package is provided
-        if (!$package) {
-            return response()->error('No package specified for publish.', 401);
-        }
-
-        // Find package
-        $extension = RegistryExtension::findByPackageName($package);
-
-        if (!$extension) {
-            // First time publishing - create extension record
-            $publisherUuid = $registryUser->isDeveloperAccount()
-                ? $registryUser->developer_account_uuid
-                : $registryUser->company_uuid;
-
-            $extension = RegistryExtension::create([
-                'uuid'             => (string) Str::uuid(),
-                'package_name'     => $package,
-                'publisher_type'   => $registryUser->account_type,
-                'publisher_uuid'   => $publisherUuid,
-                'company_uuid'     => $registryUser->company_uuid, // Keep for backwards compatibility
-                'status'           => 'published',
-                'payment_required' => false, // Default to free
-            ]);
-
-            return response()->json(['allowed' => true]);
-        }
-
-        // Check ownership
-        if ($registryUser->isCloudAccount()) {
-            if ($extension->publisher_type === 'cloud' && $extension->publisher_uuid !== $registryUser->company_uuid) {
-                return response()->error('You do not own this extension.', 403);
-            }
-        } elseif ($registryUser->isDeveloperAccount()) {
-            if ($extension->publisher_type === 'developer' && $extension->publisher_uuid !== $registryUser->developer_account_uuid) {
-                return response()->error('You do not own this extension.', 403);
-            }
-        }
-
-        // If publisher types don't match, deny access
-        if ($extension->publisher_type !== $registryUser->account_type) {
-            return response()->error('Account type mismatch for this extension.', 403);
-        }
-
-        // Update extension status
-        if ($action === 'publish') {
-            $extension->update(['status' => 'published']);
-            if ($extension->currentBundle) {
-                $extension->currentBundle->update(['status' => 'published']);
-            }
-        } elseif ($action === 'unpublish') {
-            $extension->update(['status' => 'unpublished']);
-            if ($extension->currentBundle) {
-                $extension->currentBundle->update(['status' => 'unpublished']);
-            }
-        }
-
-        // Passed all checks
-        return response()->json(['allowed' => true]);
-    }
-
-    /**
-     * Creates a registry user by authenticating with the provided password.
-     *
-     * This method retrieves the current authenticated user and checks the provided password.
-     * If the password is valid, it logs in to the npm registry using the user's credentials,
-     * retrieves the authentication token, and associates it with the user. The registry token
-     * is stored in the database for the user's current session.
-     *
-     * @param Request $request the incoming HTTP request containing the user's password
-     *
-     * @return \Illuminate\Http\JsonResponse the JSON response containing the created RegistryUser or an error message
-     */
-    public function createRegistryUser(Request $request)
-    {
-        set_time_limit(120 * 6);
-        $password = $request->input('password');
-        if (!$password) {
-            return response()->error('Password is required.');
-        }
-
-        // Get current user
-        $user = Auth::getUserFromSession();
-        if (!$user) {
-            return response()->error('No user authenticated.');
-        }
-
-        // Authenticate user with password
-        if (Auth::isInvalidPassword($password, $user->password)) {
-            return response()->error('Invalid credentials.', 401);
-        }
-
-        // Create registry user
-        try {
-            $registryUser = Bridge::loginWithUser($user, $password);
-        } catch (\Throwable $e) {
-            return response()->json($e->getMessage());
-        }
-
-        return response()->json($registryUser);
-    }
-
-    /**
-     * Retrieves all registry tokens for the current company.
-     *
-     * This method queries the `RegistryUser` model to get all registry tokens
-     * associated with the current company's UUID from the session. It also includes
-     * user details for each registry token and returns the data as a JSON response.
-     *
-     * @return \Illuminate\Http\JsonResponse the JSON response containing a list of registry tokens with user details
-     */
-    public function getRegistryTokens()
-    {
-        $registryUsers = RegistryUser::select(
-            ['uuid', 'user_uuid', 'company_uuid', 'token', 'registry_token', 'expires_at', 'created_at']
-        )->where('company_uuid', session('company'))->with(
-            [
-                'user' => function ($query) {
-                    $query->select(['uuid', 'company_uuid', 'name', 'email']);
-                },
-            ]
-        )->get();
-
-        return response()->json($registryUsers);
-    }
-
-    /**
-     * Deletes a specific registry token by its UUID.
-     *
-     * This method deletes a registry token identified by its UUID. If the registry token
-     * does not exist, it returns an error response. If successful, it returns a JSON response
-     * with a status indicating the deletion was successful.
-     *
-     * @param string $id the UUID of the registry token to be deleted
-     *
-     * @return \Illuminate\Http\JsonResponse the JSON response indicating the status of the deletion
-     */
-    public function deleteRegistryToken(string $id)
-    {
-        $registryUser = RegistryUser::where('uuid', $id)->first();
-        if (!$registryUser) {
-            return response()->error('Registry token does not exist.');
-        }
-
-        $registryUser->delete();
-
-        return response()->json(['status' => 'ok']);
-    }
-}
diff --git a/server/src/Http/Controllers/Internal/v1/RegistryController.php b/server/src/Http/Controllers/Internal/v1/RegistryController.php
index 91e991e..8cc046d 100644
--- a/server/src/Http/Controllers/Internal/v1/RegistryController.php
+++ b/server/src/Http/Controllers/Internal/v1/RegistryController.php
@@ -3,344 +3,61 @@
 namespace Fleetbase\RegistryBridge\Http\Controllers\Internal\v1;
 
 use Fleetbase\Http\Controllers\Controller;
-use Fleetbase\Http\Resources\Category as CategoryResource;
-use Fleetbase\Models\Category;
-use Fleetbase\Models\File;
 use Fleetbase\RegistryBridge\Exceptions\RegistryException;
-use Fleetbase\RegistryBridge\Models\RegistryExtension;
-use Fleetbase\RegistryBridge\Models\RegistryExtensionBundle;
 use Fleetbase\RegistryBridge\Models\RegistryServiceInstall;
-use Fleetbase\RegistryBridge\Models\RegistryUser;
-use Fleetbase\RegistryBridge\Support\CentralCatalog;
-use Fleetbase\RegistryBridge\Support\ExtensionManifest;
 use Fleetbase\RegistryBridge\Support\RegistryClient;
 use Fleetbase\RegistryBridge\Support\RegistryConfig;
 use Fleetbase\RegistryBridge\Support\ServiceCatalog;
-use Fleetbase\RegistryBridge\Support\Utils;
 use Illuminate\Http\Request;
 
 class RegistryController extends Controller
 {
     /**
-     * Retrieve a collection of categories that have registry extensions.
+     * Categories of the Registry Service catalog with their published listing counts.
      *
-     * When a Registry Service is configured, or this instance is not a self-hosted registry,
-     * the categories come from the central registry catalog. Otherwise this method fetches local categories that
-     * have associated registry extensions and meet the specified criteria
-     * (core_category equals 1 and 'for' equals 'extension_category'). The retrieved
-     * categories are then wrapped using the CategoryResource and returned as a
-     * collection of CategoryResource.
-     *
-     * @return \Illuminate\Http\Resources\Json\AnonymousResourceCollection|\Illuminate\Http\JsonResponse
-     *                                                                                                   A collection of CategoryResource objects representing the categories
+     * @return \Illuminate\Http\JsonResponse
      */
     public function categories()
     {
-        if (CentralCatalog::enabled()) {
-            try {
-                return response()->json(['categories' => CentralCatalog::categories()]);
-            } catch (RegistryException $e) {
-                return response()->error($e->getMessage(), 503);
-            }
+        try {
+            return response()->json(['categories' => ServiceCatalog::categories(RegistryClient::fromConfig(RegistryConfig::current()))]);
+        } catch (RegistryException $e) {
+            return response()->error($e->getMessage(), 503);
         }
-
-        // Registry categories and the `registry_extensions` table only exist in the live
-        // database. Run the whole query (including the `whereHas` subquery, which is
-        // executed on the parent query's connection) against the live connection so it
-        // does not resolve to the sandbox database in test mode.
-        $categories = Category::on((new RegistryExtension())->getConnectionName())->whereHas('registryExtensions')->where(['core_category' => 1, 'for' => 'extension_category'])->get();
-
-        CategoryResource::wrap('categories');
-
-        return CategoryResource::collection($categories);
     }
 
     /**
-     * Retrieve a list of installed engines for the current company session.
+     * Engines installed for the current company (`{name, version}`), read by the console to load them.
      *
-     * This method fetches registry extensions that have been installed by the
-     * company identified in the current session. It disables caching for the
-     * query, filters the results based on the company's UUID stored in the session,
-     * and maps the retrieved extensions to extract the 'package.json' metadata, then adds
-     * engines installed from the Registry Service (`{name, version}`).
-     * The result is returned as a JSON response.
-     *
-     * @return \Illuminate\Http\JsonResponse
-     *                                       A JSON response containing a list of installed engines with their metadata
+     * @return \Illuminate\Http\JsonResponse|array<int, mixed>
      */
     public function getInstalledEngines(Request $request)
     {
-        if ($request->session()->has('company')) {
-            $installedExtensions = RegistryExtension::whereHas('installs', function ($query) {
-                $query->where('company_uuid', session('company'));
-            })->get()->map(function ($extension) {
-                return $extension->currentBundle->meta['package.json'] ?? [];
-            });
-
-            $serviceEngines = RegistryServiceInstall::where('company_uuid', session('company'))
-                ->whereNotNull('npm_package')
-                ->get()
-                ->map(fn ($install) => ['name' => $install->npm_package, 'version' => $install->version]);
-
-            return response()->json($installedExtensions->concat($serviceEngines)->values());
+        if (!$request->session()->has('company')) {
+            return [];
         }
 
-        return [];
+        $engines = RegistryServiceInstall::where('company_uuid', session('company'))
+            ->whereNotNull('npm_package')
+            ->get()
+            ->map(fn ($install) => ['name' => $install->npm_package, 'version' => $install->version])
+            ->values();
+
+        return response()->json($engines);
     }
 
     /**
-     * Determines if a specified engine is installed for the authenticated user's company.
+     * Whether an engine (`engine`, the npm package name) is installed for the current company.
      *
-     * Retrieves the 'engine' input from the request and checks if the user is authenticated,
-     * the session has a 'company', and the 'engine' parameter is provided. It then queries
-     * the `RegistryExtension` model to determine if the engine is installed for the company.
-     *
-     * @param Request $request the incoming HTTP request containing the 'engine' parameter
-     *
-     * @return array An associative array with the installation status, e.g., ['installed' => true].
+     * @return array{installed: bool}
      */
     public function getEngineInstallStatus(Request $request)
     {
         $engine = $request->input('engine');
-
-        if ($request->session()->has('company') && $engine) {
-            $installed = RegistryExtension::whereHas(
-                'currentBundle',
-                function ($query) use ($engine) {
-                    $query->where('meta->package.json->name', $engine);
-                }
-            )
-            ->whereHas(
-                'installs',
-                function ($query) {
-                    $query->where('company_uuid', session('company'));
-                }
-            )->exists();
-
-            if (!$installed) {
-                $installed = RegistryServiceInstall::where(['company_uuid' => session('company'), 'npm_package' => $engine])->exists();
-            }
-
-            return ['installed' => $installed];
+        if (!$request->session()->has('company') || !$engine) {
+            return ['installed' => false];
         }
 
-        return ['installed' => false];
-    }
-
-    /**
-     * Lookup and retrieve package information based on the provided package name.
-     *
-     * This method handles a request to lookup a package by its name. It utilizes the `RegistryExtension::lookup` method to find the
-     * corresponding registry extension. If no extension is found or if the extension does not have valid package or composer data,
-     * an error response is returned.
-     *
-     * If a valid extension and its associated bundle are found, the function extracts the package and composer names from the
-     * `package.json` and `composer.json` metadata. These names are then returned in a JSON response.
-     *
-     * With a Registry Service configured the package name, slug or id is resolved from the service catalog first;
-     * the local tables are only consulted when the service does not list it.
-     *
-     * @param Request $request the incoming HTTP request containing the 'package' input parameter
-     *
-     * @return \Illuminate\Http\JsonResponse a JSON response containing the package and composer names if found, or an error message otherwise
-     */
-    public function lookupPackage(Request $request)
-    {
-        $packageName = $request->input('package');
-
-        $config = RegistryConfig::current();
-        if ($config->usesService() && is_string($packageName) && $packageName !== '') {
-            try {
-                $resolved = ServiceCatalog::lookup($packageName, RegistryClient::fromConfig($config));
-            } catch (RegistryException $e) {
-                return response()->error($e->getMessage(), 503);
-            }
-
-            if ($resolved) {
-                return response()->json([
-                    'npm'       => $resolved['npm'],
-                    'composer'  => $resolved['composer'],
-                    'extension' => $resolved['extension']['id'] ?? null,
-                    'slug'      => $resolved['extension']['slug'] ?? null,
-                    'version'   => $resolved['extension']['latest_release']['version'] ?? ($resolved['extension']['latest_version'] ?? null),
-                    'source'    => ServiceCatalog::SOURCE,
-                ]);
-            }
-        }
-
-        $registryExtension = RegistryExtension::lookup($packageName);
-        if (!$registryExtension) {
-            return response()->error('No extension found by this name for install');
-        }
-
-        if (!$registryExtension->currentBundle) {
-            return response()->error('No valid package data found for this extension install');
-        }
-
-        $packageJson = $registryExtension->currentBundle->meta['package.json'];
-        if (!$packageJson) {
-            return response()->error('No valid package data found for this extension install');
-        }
-
-        $composerJson = $registryExtension->currentBundle->meta['composer.json'];
-        if (!$composerJson) {
-            return response()->error('No valid package data found for this extension install');
-        }
-
-        $packageJsonName  = data_get($packageJson, 'name');
-        $composerJsonName = data_get($composerJson, 'name');
-
-        return response()->json([
-            'npm'      => $packageJsonName,
-            'composer' => $composerJsonName,
-        ]);
-    }
-
-    /**
-     * Handles the upload of an extension bundle to the registry.
-     *
-     * This method performs the following operations:
-     * - Authenticates the user using a Bearer token from the Authorization header.
-     * - Validates the uploaded bundle file (ensuring it's a valid tar.gz file).
-     * - Extracts necessary files (`extension.json`, `package.json`, `composer.json`) from the bundle.
-     * - Associates the bundle with the correct extension based on package information.
-     * - Checks if the user is authorized to upload bundles for the extension.
-     * - Uploads the bundle to the storage system.
-     * - Creates a file record in the database.
-     * - Updates metadata and versioning information.
-     * - Creates a new extension bundle record.
-     *
-     * @param Request $request the HTTP request containing the bundle file and authentication token
-     *
-     * @return \Illuminate\Http\JsonResponse a JSON response indicating the success or failure of the upload process
-     */
-    public function bundleUpload(Request $request)
-    {
-        // Check for Authorization header
-        $authHeader = $request->header('Authorization');
-        if (!$authHeader) {
-            return response()->json(['error' => 'Unauthorized.'], 401);
-        }
-
-        // Extract the token from the 'Bearer ' prefix
-        $token = null;
-        if (preg_match('/Bearer\s(\S+)/', $authHeader, $matches)) {
-            $token = $matches[1];
-        }
-
-        // Validate the token (implement your own token validation logic)
-        $registryUser = RegistryUser::findFromToken($token);
-        if (!$registryUser) {
-            return response()->json(['error' => 'Unauthorized.', 'token' => $token], 401);
-        }
-
-        // Check if file was uploaded
-        if (!$request->hasFile('bundle')) {
-            return response()->json(['error' => 'No bundle uploaded.'], 400);
-        }
-
-        $bundle = $request->file('bundle');
-
-        // Validate the file
-        if (!$bundle->isValid()) {
-            return response()->json(['error' => 'Invalid bundle file uploaded.'], 400);
-        }
-
-        // Ensure the file is a tar.gz
-        $mimeType = $bundle->getMimeType();
-        if ($mimeType !== 'application/gzip' && $mimeType !== 'application/x-gzip') {
-            return response()->json(['error' => 'Invalid bundle file type.'], 400);
-        }
-
-        // Get the extension assosciated to bundle by extension name
-        try {
-            $bundleData = RegistryExtensionBundle::extractUploadedBundleFile($bundle, ['extension.json', 'package.json', 'composer.json']);
-        } catch (\Throwable $e) {
-            return response()->json(['error' => $e->getMessage()], 400);
-        }
-
-        // Validate the extension.json manifest against the schema before anything is stored
-        $extensionJson = Utils::getObjectKeyValue($bundleData, 'extension.json');
-        if (!$extensionJson || !is_object($extensionJson)) {
-            return response()->json(['error' => 'Unable to find `extension.json` file required in bundle.'], 400);
-        }
-
-        $manifestErrors = ExtensionManifest::validate($extensionJson);
-        if (!empty($manifestErrors)) {
-            return response()->json([
-                'error'  => 'Invalid `extension.json` in bundle: ' . implode('; ', ExtensionManifest::flatten($manifestErrors)),
-                'errors' => $manifestErrors,
-            ], 422);
-        }
-
-        $bundlePackageData = Utils::getObjectKeyValue($bundleData, 'package.json') ?? Utils::getObjectKeyValue($bundleData, 'composer.json');
-        if ($bundlePackageData && data_get($bundlePackageData, 'name')) {
-            $extension = RegistryExtension::findByPackageName(data_get($bundlePackageData, 'name'));
-            if (!$extension) {
-                return response()->json(['error' => 'Unable to find extension for the uploaded bundle.'], 400);
-            }
-
-            if ($extension->company_uuid !== $registryUser->company_uuid) {
-                return response()->json(['error' => 'User is not authorized to upload bundles for this extension.'], 401);
-            }
-        } else {
-            return response()->json(['error' => 'Unable to parse uploaded bundle.'], 400);
-        }
-
-        // Prepare to upload the bundle
-        $size        = $bundle->getSize();
-        $fileName    = File::randomFileNameFromRequest($request, 'bundle');
-        $disk        = config('filesystems.default');
-        $bucket      = config('filesystems.disks.' . $disk . '.bucket', config('filesystems.disks.s3.bucket'));
-        $path        = 'uploads/extensions/' . $extension->uuid . '/bundles';
-        $type        = 'extension_bundle';
-
-        // Upload the bundle
-        try {
-            $path = $bundle->storeAs($path, $fileName, ['disk' => $disk]);
-        } catch (\Throwable $e) {
-            return response()->error($e->getMessage());
-        }
-
-        // If file upload failed
-        if ($path === false) {
-            return response()->error('File upload failed.');
-        }
-
-        // Create a file record
-        try {
-            $file = File::createFromUpload($request->file('bundle'), $path, $type, $size, $disk, $bucket);
-        } catch (\Throwable $e) {
-            return response()->error($e->getMessage());
-        }
-
-        // Set company and uploader
-        $file->update([
-            'company_uuid'  => $registryUser->company_uuid,
-            'uploader_uuid' => $registryUser->user_uuid,
-        ]);
-
-        // Set file subject to extension
-        $file = $file->setSubject($extension);
-
-        // Set version in file meta (`version`, `engine`/`api` presence already enforced by the schema)
-        $file->updateMeta('version', data_get($extensionJson, 'version'));
-
-        // Set bundle number to parsed JSON
-        $extensionJson->bundle_number = RegistryExtensionBundle::getNextBundleNumber($extension);
-
-        // Create the bundle
-        $extensionBundle = RegistryExtensionBundle::create([
-            'company_uuid'    => $registryUser->company_uuid,
-            'created_by_uuid' => $registryUser->user_uuid,
-            'extension_uuid'  => $extension->uuid,
-            'bundle_uuid'     => $file->uuid,
-            'status'          => 'pending',
-        ]);
-
-        $extensionBundle->update(['bundle_number' => $extensionJson->bundle_number, 'version' => $extensionJson->version]);
-        $extensionBundle->updateMetaProperties((array) $bundleData);
-
-        return response()->json(['message' => 'Bundle uploaded successfully', 'filename' => $fileName, 'bundle' => $extensionBundle, 'extension' => $extension], 200);
+        return ['installed' => RegistryServiceInstall::where(['company_uuid' => session('company'), 'npm_package' => $engine])->exists()];
     }
 }
diff --git a/server/src/Http/Controllers/Internal/v1/RegistryDeveloperAccountController.php b/server/src/Http/Controllers/Internal/v1/RegistryDeveloperAccountController.php
deleted file mode 100644
index 0db7f8b..0000000
--- a/server/src/Http/Controllers/Internal/v1/RegistryDeveloperAccountController.php
+++ /dev/null
@@ -1,359 +0,0 @@
-<?php
-
-namespace Fleetbase\RegistryBridge\Http\Controllers\Internal\v1;
-
-use Fleetbase\Http\Controllers\Controller;
-use Fleetbase\Models\VerificationCode;
-use Fleetbase\RegistryBridge\Models\RegistryDeveloperAccount;
-use Fleetbase\RegistryBridge\Models\RegistryUser;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Hash;
-use Illuminate\Support\Facades\Validator;
-use Illuminate\Support\Str;
-
-class RegistryDeveloperAccountController extends Controller
-{
-    /**
-     * Register a new Registry Developer Account.
-     *
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function register(Request $request)
-    {
-        $validator = Validator::make($request->all(), [
-            'username' => 'required|string|min:3|max:255|unique:registry_developer_accounts,username|regex:/^[a-zA-Z0-9_-]+$/',
-            'email'    => 'required|email|unique:registry_developer_accounts,email',
-            'password' => 'required|string|min:8',
-            'name'     => 'nullable|string|max:255',
-        ]);
-
-        if ($validator->fails()) {
-            return response()->json([
-                'errors' => $validator->errors(),
-            ], 422);
-        }
-
-        $validated = $validator->validated();
-
-        $account = RegistryDeveloperAccount::create([
-            'uuid'               => (string) Str::uuid(),
-            'username'           => $validated['username'],
-            'email'              => $validated['email'],
-            'password'           => Hash::make($validated['password']),
-            'name'               => $validated['name'] ?? $validated['username'],
-            'status'             => 'pending_verification',
-            'verification_token' => Str::random(64),
-        ]);
-
-        // Send verification email
-        $this->sendVerificationEmail($account);
-
-        return response()->json([
-            'status'  => 'success',
-            'message' => 'Account created successfully. Please check your email to verify your account.',
-            'account' => [
-                'uuid'     => $account->uuid,
-                'username' => $account->username,
-                'email'    => $account->email,
-            ],
-        ], 201);
-    }
-
-    /**
-     * Verify email address using verification code.
-     *
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function verifyEmail(Request $request)
-    {
-        $code  = $request->input('code');
-        $email = $request->input('email');
-
-        if (!$code || !$email) {
-            return response()->error('Verification code and email are required.', 400);
-        }
-
-        // Find the account
-        $account = RegistryDeveloperAccount::where('email', $email)->first();
-
-        if (!$account) {
-            return response()->error('Account not found.', 404);
-        }
-
-        if ($account->isActive()) {
-            return response()->json([
-                'status'  => 'success',
-                'message' => 'Email already verified.',
-            ]);
-        }
-
-        // Find the verification code
-        $verificationCode = VerificationCode::where('subject_uuid', $account->uuid)
-            ->where('subject_type', RegistryDeveloperAccount::class)
-            ->where('for', 'registry_developer_account_verification')
-            ->where('code', $code)
-            // generateEmailVerificationFor() stores codes as 'active'; also accept legacy 'pending' and NULL status
-            ->where(function ($query) {
-                $query->whereIn('status', ['active', 'pending'])->orWhereNull('status');
-            })
-            ->latest()
-            ->first();
-
-        if (!$verificationCode) {
-            return response()->error('Invalid or expired verification code.', 400);
-        }
-
-        // Check if code is expired
-        if ($verificationCode->hasExpired()) {
-            return response()->error('Verification code has expired.', 400);
-        }
-
-        // Mark as verified
-        $account->markEmailAsVerified();
-        $verificationCode->update(['status' => 'used']);
-
-        // Generate registry token for the developer account
-        $token = RegistryUser::generateToken();
-
-        $registryUser = RegistryUser::firstOrCreate(
-            [
-                'developer_account_uuid' => $account->uuid,
-                'account_type'           => 'developer',
-            ],
-            [
-                'token' => $token,
-                'name'  => $account->name,
-            ]
-        );
-
-        // If registry user already exists, update the token
-        if (!$registryUser->wasRecentlyCreated) {
-            $registryUser->update(['token' => $token]);
-        }
-
-        return response()->json([
-            'status'  => 'success',
-            'message' => 'Email verified successfully. You can now log in.',
-            'token'   => $token,
-        ]);
-    }
-
-    /**
-     * Resend verification email.
-     *
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function resendVerification(Request $request)
-    {
-        $email = $request->input('email');
-
-        if (!$email) {
-            return response()->error('Email is required.', 400);
-        }
-
-        $account = RegistryDeveloperAccount::where('email', $email)->first();
-
-        if (!$account) {
-            return response()->error('Account not found.', 404);
-        }
-
-        if ($account->isActive()) {
-            return response()->json([
-                'status'  => 'success',
-                'message' => 'Email already verified.',
-            ]);
-        }
-
-        // Generate new token
-        $account->generateVerificationToken();
-
-        // Resend verification email
-        $this->sendVerificationEmail($account);
-
-        return response()->json([
-            'status'  => 'success',
-            'message' => 'Verification email sent.',
-        ]);
-    }
-
-    /**
-     * Get account profile.
-     *
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function profile(Request $request)
-    {
-        // This would require middleware to authenticate the user
-        // For now, we'll accept a token parameter
-        $token = $request->bearerToken() ?? $request->input('token');
-
-        if (!$token) {
-            return response()->error('Authentication required.', 401);
-        }
-
-        $registryUser = RegistryUser::findFromToken($token);
-
-        if (!$registryUser || $registryUser->account_type !== 'developer') {
-            return response()->error('Invalid token or not a developer account.', 403);
-        }
-
-        $account = $registryUser->developerAccount;
-
-        if (!$account) {
-            return response()->error('Developer account not found.', 404);
-        }
-
-        return response()->json([
-            'uuid'              => $account->uuid,
-            'username'          => $account->username,
-            'email'             => $account->email,
-            'name'              => $account->name,
-            'avatar_url'        => $account->avatar_url,
-            'github_username'   => $account->github_username,
-            'website'           => $account->website,
-            'bio'               => $account->bio,
-            'status'            => $account->status,
-            'email_verified_at' => $account->email_verified_at,
-            'created_at'        => $account->created_at,
-        ]);
-    }
-
-    /**
-     * Update account profile.
-     *
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function updateProfile(Request $request)
-    {
-        $token = $request->bearerToken() ?? $request->input('token');
-
-        if (!$token) {
-            return response()->error('Authentication required.', 401);
-        }
-
-        $registryUser = RegistryUser::findFromToken($token);
-
-        if (!$registryUser || $registryUser->account_type !== 'developer') {
-            return response()->error('Invalid token or not a developer account.', 403);
-        }
-
-        $account = $registryUser->developerAccount;
-
-        if (!$account) {
-            return response()->error('Developer account not found.', 404);
-        }
-
-        $validator = Validator::make($request->all(), [
-            'name'            => 'nullable|string|max:255',
-            'avatar_url'      => 'nullable|url|max:500',
-            'github_username' => 'nullable|string|max:255',
-            'website'         => 'nullable|url|max:500',
-            'bio'             => 'nullable|string|max:1000',
-        ]);
-
-        if ($validator->fails()) {
-            return response()->json([
-                'errors' => $validator->errors(),
-            ], 422);
-        }
-
-        $account->update($validator->validated());
-
-        return response()->json([
-            'status'  => 'success',
-            'message' => 'Profile updated successfully.',
-            'account' => $account,
-        ]);
-    }
-
-    /**
-     * Generate or regenerate registry token for authenticated developer account.
-     *
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function generateToken(Request $request)
-    {
-        $email    = $request->input('email');
-        $password = $request->input('password');
-
-        if (!$email || !$password) {
-            return response()->error('Email and password are required.', 400);
-        }
-
-        // Find the account
-        $account = RegistryDeveloperAccount::where('email', $email)->first();
-
-        if (!$account) {
-            return response()->error('Account not found.', 404);
-        }
-
-        // Verify password
-        if (!Hash::check($password, $account->password)) {
-            return response()->error('Invalid credentials.', 401);
-        }
-
-        // Check if account is active
-        if (!$account->isActive()) {
-            return response()->error('Account is not active. Please verify your email first.', 403);
-        }
-
-        // Generate new token
-        $token = RegistryUser::generateToken();
-
-        // Find or create registry user
-        $registryUser = RegistryUser::firstOrCreate(
-            [
-                'developer_account_uuid' => $account->uuid,
-                'account_type'           => 'developer',
-            ],
-            [
-                'token' => $token,
-                'name'  => $account->name,
-            ]
-        );
-
-        // If registry user already exists, regenerate the token
-        if (!$registryUser->wasRecentlyCreated) {
-            $registryUser->update(['token' => $token]);
-        }
-
-        return response()->json([
-            'status'  => 'success',
-            'message' => $registryUser->wasRecentlyCreated ? 'Token generated successfully.' : 'Token regenerated successfully.',
-            'token'   => $token,
-        ]);
-    }
-
-    /**
-     * Send verification email to the account.
-     *
-     * @return void
-     */
-    private function sendVerificationEmail(RegistryDeveloperAccount $account)
-    {
-        try {
-            VerificationCode::generateEmailVerificationFor(
-                $account,
-                'registry_developer_account_verification',
-                [
-                    'subject' => 'Verify your Registry Developer Account',
-                    'content' => function ($verificationCode) use ($account) {
-                        return "Hello {$account->name},\n\n" .
-                               "Thank you for registering a Registry Developer Account!\n\n" .
-                               "Your verification code is: {$verificationCode->code}\n\n" .
-                               "To verify your account, copy and paste this command into your terminal:\n\n" .
-                               "flb verify -e {$account->email} -c {$verificationCode->code}\n\n" .
-                               "This code will expire in 1 hour.\n\n" .
-                               'If you did not create this account, please ignore this email.';
-                    },
-                ]
-            );
-        } catch (\Exception $e) {
-            // Log the error but don't fail registration
-            logger()->error('Failed to send verification email', [
-                'email' => $account->email,
-                'error' => $e->getMessage(),
-            ]);
-        }
-    }
-}
diff --git a/server/src/Http/Controllers/Internal/v1/RegistryExtensionBundleController.php b/server/src/Http/Controllers/Internal/v1/RegistryExtensionBundleController.php
deleted file mode 100644
index 6413df3..0000000
--- a/server/src/Http/Controllers/Internal/v1/RegistryExtensionBundleController.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-
-namespace Fleetbase\RegistryBridge\Http\Controllers\Internal\v1;
-
-use Fleetbase\Exceptions\FleetbaseRequestValidationException;
-use Fleetbase\Models\File;
-use Fleetbase\RegistryBridge\Http\Controllers\RegistryBridgeController;
-use Fleetbase\RegistryBridge\Http\Requests\CreateRegistryExtensionBundleRequest;
-use Fleetbase\RegistryBridge\Http\Requests\RegistryExtensionActionRequest;
-use Fleetbase\RegistryBridge\Models\RegistryExtensionBundle;
-use Fleetbase\RegistryBridge\Support\Utils;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Storage;
-use Illuminate\Support\Facades\Validator;
-
-class RegistryExtensionBundleController extends RegistryBridgeController
-{
-    /**
-     * The resource to query.
-     *
-     * @var string
-     */
-    public $resource = 'registry_extension_bundle';
-
-    /**
-     * Creates a record with request payload.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function createRecord(Request $request)
-    {
-        $extensionId = $request->input('subject_uuid');
-
-        // Create validation request
-        $createRegistryExtensionBundleRequest  = CreateRegistryExtensionBundleRequest::createFrom($request);
-        $rules                                 = $createRegistryExtensionBundleRequest->rules();
-
-        // Manually validate request
-        $validator = Validator::make($request->input('registryExtensionBundle'), $rules);
-        if ($validator->fails()) {
-            return $createRegistryExtensionBundleRequest->responseWithErrors($validator);
-        }
-
-        // Extract bundle extension json for file validation
-        $bundleFile = File::where('uuid', $request->input('registryExtensionBundle.bundle_uuid'))->first();
-        if (!$bundleFile) {
-            return response()->error('Unable to find bundle file for validation.');
-        }
-
-        // Get extension.json contents
-        $bundleData    = RegistryExtensionBundle::extractBundleData($bundleFile);
-        $extensionJson = Utils::getObjectKeyValue($bundleData, 'extension.json');
-        if (!$extensionJson) {
-            return response()->error('Unable to find `extension.json` file required in bundle.');
-        }
-
-        // Check if version is set
-        if (!isset($extensionJson->version)) {
-            return response()->error('No `version` set in the `extension.json`');
-        }
-
-        // Check if either api or engine property is set
-        if (!isset($extensionJson->engine) && !isset($extensionJson->api)) {
-            return response()->error('No `api` or `engine` property set in the `extension.json`');
-        }
-
-        // Set bundle number
-        $numberOfBundles = RegistryExtensionBundle::whereHas('extension', function ($query) use ($extensionId) {
-            $query->where('public_id', $extensionId);
-        })->count();
-        $extensionJson->bundle_number = ($numberOfBundles ?? 0) + 1;
-
-        try {
-            $record = $this->model->createRecordFromRequest($request);
-
-            // Update the record version from extension json
-            $record->update(['bundle_number' => $extensionJson->bundle_number, 'version' => $extensionJson->version]);
-            $record->updateMetaProperties((array) $bundleData);
-
-            return ['registryExtensionBundle' => new $this->resource($record)];
-        } catch (\Throwable $e) {
-            return response()->error($e->getMessage());
-        } catch (\Illuminate\Database\QueryException $e) {
-            return response()->error($e->getMessage());
-        } catch (FleetbaseRequestValidationException $e) {
-            return response()->error($e->getErrors());
-        }
-    }
-
-    /**
-     * Handles the download request for an extension bundle.
-     *
-     * This function retrieves a specific `RegistryExtension` by its ID and attempts to download
-     * its latest bundle. If the extension exists and has an associated bundle, it returns a download response
-     * with the appropriate file. If the extension doesn't exist or doesn't have a bundle, it returns an error response.
-     *
-     * @param RegistryExtensionActionRequest $request the validated request object
-     *
-     * @return \Symfony\Component\HttpFoundation\BinaryFileResponse|\Illuminate\Http\Response
-     *                                                                                        Returns a download response for the bundle if successful, or an error response if not
-     */
-    public function download(RegistryExtensionActionRequest $request)
-    {
-        $id              = $request->input('id');
-        $extensionBundle = RegistryExtensionBundle::find($id);
-        if ($extensionBundle && $extensionBundle->bundle) {
-            return Storage::disk($extensionBundle->bundle->disk)->download($extensionBundle->bundle->path, $extensionBundle->bundle->name);
-        }
-
-        return response()->error('Failed to download extension bundle');
-    }
-}
diff --git a/server/src/Http/Controllers/Internal/v1/RegistryExtensionController.php b/server/src/Http/Controllers/Internal/v1/RegistryExtensionController.php
index 5b1328c..d355d4f 100644
--- a/server/src/Http/Controllers/Internal/v1/RegistryExtensionController.php
+++ b/server/src/Http/Controllers/Internal/v1/RegistryExtensionController.php
@@ -2,398 +2,163 @@
 
 namespace Fleetbase\RegistryBridge\Http\Controllers\Internal\v1;
 
-use Fleetbase\Exceptions\FleetbaseRequestValidationException;
+use Fleetbase\Http\Controllers\Controller;
 use Fleetbase\Http\Requests\AdminRequest;
 use Fleetbase\Models\Setting;
 use Fleetbase\RegistryBridge\Exceptions\RegistryException;
 use Fleetbase\RegistryBridge\Exceptions\RegistryServiceException;
-use Fleetbase\RegistryBridge\Http\Controllers\RegistryBridgeController;
-use Fleetbase\RegistryBridge\Http\Requests\CreateRegistryExtensionRequest;
-use Fleetbase\RegistryBridge\Http\Requests\RegistryExtensionActionRequest;
-use Fleetbase\RegistryBridge\Http\Resources\PublicRegistryExtension;
-use Fleetbase\RegistryBridge\Http\Resources\RemoteRegistryExtension;
-use Fleetbase\RegistryBridge\Models\RegistryExtension;
 use Fleetbase\RegistryBridge\Models\RegistryServiceInstall;
-use Fleetbase\RegistryBridge\Support\CentralCatalog;
 use Fleetbase\RegistryBridge\Support\InstanceRegistration;
 use Fleetbase\RegistryBridge\Support\RegistryClient;
 use Fleetbase\RegistryBridge\Support\RegistryConfig;
 use Fleetbase\RegistryBridge\Support\ServiceCatalog;
-use Fleetbase\RegistryBridge\Support\Utils;
+use Fleetbase\RegistryBridge\Support\ServiceCheckout;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Storage;
-use Illuminate\Support\Facades\Validator;
+use Illuminate\Pagination\LengthAwarePaginator;
 
-class RegistryExtensionController extends RegistryBridgeController
+/**
+ * The Registry Service catalog and this instance's place in it, for the console's Extensions module.
+ */
+class RegistryExtensionController extends Controller
 {
     /**
-     * The resource to query.
+     * One page of Explore: `query`, `category`, `pricing`, `hosting`, `hide_installed`, `sort`, `page`, `limit`.
      *
-     * @var string
+     * @return \Illuminate\Http\JsonResponse `{registryExtensions, meta}`
      */
-    public $resource = 'registry_extension';
-
-    /**
-     * Display a public list of all published extensions.
-     *
-     * This endpoint is publicly accessible and returns all extensions with a status of 'published'.
-     * The results are cached for 15 minutes to improve performance and reduce database load.
-     * This endpoint is designed to be called by self-hosted instances to discover available extensions.
-     *
-     * @param Request $request the incoming HTTP request
-     *
-     * @return \Illuminate\Http\JsonResponse the collection of published extensions
-     */
-    public function listPublicExtensions(Request $request)
-    {
-        $cacheKey = 'public-extensions-list';
-        $cacheTtl = now()->addMinutes(15);
-
-        $extensions = \Illuminate\Support\Facades\Cache::remember($cacheKey, $cacheTtl, function () {
-            return RegistryExtension::where('status', 'published')
-                ->with(['company', 'category', 'currentBundle'])
-                ->withCount('installs')
-                ->orderBy('installs_count', 'desc')
-                ->get();
-        });
-
-        PublicRegistryExtension::withoutWrapping();
-
-        return PublicRegistryExtension::collection($extensions);
-    }
-
-    /**
-     * Query registry extensions.
-     *
-     * The Explore listing (`?explore=1`) is served from the Registry Service when one is configured,
-     * else from the cloud registry catalog unless this instance is configured as a self-hosted registry
-     * (`registry-bridge.registry.self_hosted`), in which case it falls back to the local
-     * `registry_extensions` table.
-     *
-     * @return \Illuminate\Http\Resources\Json\AnonymousResourceCollection|\Illuminate\Http\JsonResponse|\Illuminate\Http\Resources\Json\JsonResource
-     */
-    public function queryRecord(Request $request)
-    {
-        if ($request->boolean('explore') && CentralCatalog::enabled()) {
-            try {
-                $extensions = CentralCatalog::query($request);
-            } catch (RegistryException $e) {
-                return response()->error($e->getMessage(), 503);
-            }
-
-            RemoteRegistryExtension::wrap($this->resourcePluralName);
-
-            return RemoteRegistryExtension::collection($extensions);
-        }
-
-        return parent::queryRecord($request);
-    }
-
-    /**
-     * Creates a record with request payload.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function createRecord(Request $request)
-    {
-        // Create validation request
-        $createRegistryExtensionRequest  = CreateRegistryExtensionRequest::createFrom($request);
-        $rules                           = $createRegistryExtensionRequest->rules();
-
-        // Manually validate request
-        $validator = Validator::make($request->input('registryExtension'), $rules);
-        if ($validator->fails()) {
-            return $createRegistryExtensionRequest->responseWithErrors($validator);
-        }
-
-        try {
-            $record = $this->model->createRecordFromRequest($request);
-
-            return ['registryExtension' => new $this->resource($record)];
-        } catch (\Throwable $e) {
-            return response()->error($e->getMessage());
-        } catch (\Illuminate\Database\QueryException $e) {
-            return response()->error($e->getMessage());
-        } catch (FleetbaseRequestValidationException $e) {
-            return response()->error($e->getErrors());
-        }
-    }
-
-    /**
-     * Display a list of installed extensions for the current company.
-     *
-     * This function retrieves all extensions that are installed for the company
-     * identified by the `company_uuid` stored in the session. It disables the cache
-     * for the `RegistryExtension` model to ensure fresh data is fetched from the database.
-     *
-     * The extensions are filtered based on their association with any installation
-     * record that matches the `company_uuid` from the session. The resulting collection
-     * of installed extensions is then wrapped and returned as a resource collection.
-     *
-     * With a Registry Service configured, extensions installed from the service are added, mapped from
-     * the instance API (`installed_version`, `latest_version`, `update_available`) and the catalog.
-     *
-     * @return \Illuminate\Http\Resources\Json\AnonymousResourceCollection|\Illuminate\Http\JsonResponse the collection of installed extensions wrapped as a resource
-     */
-    public function installed(?Request $request = null)
+    public function query(Request $request)
     {
-        $request ??= request();
-
-        $installedExtensions = RegistryExtension::whereHas('installs', function ($query) {
-            $query->where('company_uuid', session('company'));
-        })->get();
-
-        $this->resource::wrap('registryExtensions');
-
         $config = RegistryConfig::current();
-        if (!$config->usesService()) {
-            return $this->resource::collection($installedExtensions);
-        }
-
-        $localInstalls = RegistryServiceInstall::where('company_uuid', session('company'))->get()->map(fn ($install) => $install->toLocalInstall())->all();
 
         try {
-            $serviceExtensions = ServiceCatalog::installed(RegistryClient::fromConfig($config), $config, $localInstalls, CentralCatalog::installedPackageNames(session('company')));
+            $page = ServiceCatalog::query($request, RegistryClient::fromConfig($config), $config, RegistryServiceInstall::packageNames(session('company')));
         } catch (RegistryException $e) {
             return response()->error($e->getMessage(), 503);
         }
 
-        return response()->json([
-            'registryExtensions' => array_merge($serviceExtensions, $this->resource::collection($installedExtensions)->resolve($request)),
-        ]);
+        return response()->json(['registryExtensions' => $page->items(), 'meta' => static::paginationMeta($page)]);
     }
 
     /**
-     * Display a list of purchased extensions for the current company.
-     *
-     * This function retrieves all extensions that are purchased for the company
-     * identified by the `company_uuid` stored in the session. It disables the cache
-     * for the `RegistryExtension` model to ensure fresh data is fetched from the database.
+     * One listing by `ext_` id or slug, decorated with this instance's install and licence state.
      *
-     * The extensions are filtered based on their association with any purchase
-     * record that matches the `company_uuid` from the session. The resulting collection
-     * of purchased extensions is then wrapped and returned as a resource collection.
-     *
-     * With a Registry Service configured, extensions the instance's organization holds an active paid
-     * licence for are added.
-     *
-     * @return \Illuminate\Http\Resources\Json\AnonymousResourceCollection|\Illuminate\Http\JsonResponse the collection of purchased extensions wrapped as a resource
+     * @return \Illuminate\Http\JsonResponse
      */
-    public function purchased(?Request $request = null)
+    public function find(string $id)
     {
-        $request ??= request();
-
-        $purchasedExtensions = RegistryExtension::whereHas('purchases', function ($query) {
-            $query->where('company_uuid', session('company'));
-        })->get();
-
-        $this->resource::wrap('registryExtensions');
-
         $config = RegistryConfig::current();
-        if (!$config->usesService()) {
-            return $this->resource::collection($purchasedExtensions);
-        }
 
         try {
-            $serviceExtensions = ServiceCatalog::purchased(RegistryClient::fromConfig($config), $config, CentralCatalog::installedPackageNames(session('company')));
+            $extension = ServiceCatalog::find($id, RegistryClient::fromConfig($config), $config, RegistryServiceInstall::packageNames(session('company')));
         } catch (RegistryException $e) {
             return response()->error($e->getMessage(), 503);
         }
 
-        return response()->json([
-            'registryExtensions' => array_merge($serviceExtensions, $this->resource::collection($purchasedExtensions)->resolve($request)),
-        ]);
-    }
-
-    /**
-     * Retrieve analytics for a specific registry extension.
-     *
-     * This method fetches analytics for a registry extension identified by
-     * the provided ID. It gathers various metrics, including the number of
-     * installs, uninstalls, purchases, and the total purchase amount. If the
-     * extension cannot be found, it returns an error response. Otherwise, it
-     * returns the collected metrics as a JSON response.
-     *
-     * @param Request $request
-     *                         The incoming request instance containing the extension ID
-     *
-     * @return \Illuminate\Http\JsonResponse
-     *                                       A JSON response containing the collected analytics metrics or an error message
-     */
-    public function analytics(Request $request)
-    {
-        $id        = $request->input('id');
-        $extension = RegistryExtension::find($id);
-        if (!$extension) {
-            return response()->error('Unable to find extension to fetch analytics.');
+        if ($extension === null) {
+            return response()->error('Extension not found.', 404);
         }
 
-        $metrics = [];
-
-        // Get number of installs
-        $metrics['install_count'] = $extension->installs()->count();
-
-        // Get number of uninstalls
-        $metrics['uninstall_count'] = $extension->installs()->withoutGlobalScopes()->whereNotNull('deleted_at')->count();
-
-        // Get number of purchases
-        $metrics['purchase_count'] = $extension->purchases()->count();
-
-        // Get total amount in purchases
-        $totalPurchaseAmount        = $extension->purchases()->get()->sum('locked_price');
-        $metrics['purchase_amount'] = Utils::moneyFormat($totalPurchaseAmount, $extension->currency);
-
-        // Respond with metrics
-        return response()->json($metrics);
+        return response()->json(['registryExtension' => $extension]);
     }
 
     /**
-     * Approves a specific extension by its ID.
-     *
-     * This function locates a `RegistryExtension` using the provided ID and sets its status to 'approved'.
-     * If the extension is successfully found and updated, it returns the extension resource. If the extension
-     * cannot be found, it returns an error response indicating the inability to locate the extension.
+     * Published and yanked releases of a listing for the Versions tab.
      *
-     * @param RegistryExtensionActionRequest $request the validated request object
-     *
-     * @return \Illuminate\Http\Response|array returns an array containing the extension resource if successful,
-     *                                         or an error response if the extension cannot be found
+     * @return \Illuminate\Http\JsonResponse `{latest, channels, releases}`
      */
-    public function approve(RegistryExtensionActionRequest $request)
+    public function releases(Request $request, string $id)
     {
-        $id        = $request->input('id');
-        $extension = RegistryExtension::find($id);
-        if ($extension) {
-            $extension->update(['status' => 'approved', 'current_bundle_uuid' => $extension->next_bundle_uuid]);
-            $extension->nextBundle()->update(['status' => 'approved']);
-        } else {
-            return response()->error('Unable to find extension for approval.');
+        $installed = $request->input('installed_version');
+
+        try {
+            $releases = ServiceCatalog::releases($id, RegistryClient::fromConfig(RegistryConfig::current()), is_string($installed) && $installed !== '' ? $installed : null);
+        } catch (RegistryException $e) {
+            return response()->error($e->getMessage(), 503);
+        }
+
+        if ($releases === null) {
+            return response()->error('Extension not found.', 404);
         }
 
-        return ['registryExtension' => new $this->resource($extension)];
+        return response()->json($releases);
     }
 
     /**
-     * Mannually publishes a specific extension by its ID.
-     *
-     * This function locates a `RegistryExtension` using the provided ID and sets its status to 'published'.
-     * If the extension is successfully found and updated, it returns the extension resource. If the extension
-     * cannot be found, it returns an error response indicating the inability to locate the extension.
-     *
-     * @param RegistryExtensionActionRequest $request the validated request object
+     * What every console user needs to know about the registry: the service URL, whether this instance is
+     * registered, its kind, the registry organization that owns its licences, the publisher portal and whether
+     * paid extensions can be bought here. No secrets.
      *
-     * @return \Illuminate\Http\Response|array returns an array containing the extension resource if successful,
-     *                                         or an error response if the extension cannot be found
+     * @return \Illuminate\Http\JsonResponse
      */
-    public function manualPublish(RegistryExtensionActionRequest $request)
+    public function context()
     {
-        $id        = $request->input('id');
-        $extension = RegistryExtension::find($id);
-        if ($extension) {
-            $extension->update(['status' => 'published', 'current_bundle_uuid' => $extension->next_bundle_uuid]);
-            $extension->nextBundle()->update(['status' => 'published']);
-        } else {
-            return response()->error('Unable to find extension to publish.');
-        }
+        $config = RegistryConfig::current();
 
-        return ['registryExtension' => new $this->resource($extension)];
+        return response()->json([
+            'service_url'        => $config->serviceUrl(),
+            'registered'         => $config->isRegistered(),
+            'instance_kind'      => $config->instanceKind(),
+            'organization'       => $config->organization(),
+            'publisher_url'      => $config->publisherUrl(),
+            'checkout_available' => ServiceCheckout::available($config),
+        ]);
     }
 
     /**
-     * Rejects a specific extension by its ID.
-     *
-     * Locates a `RegistryExtension` using the provided ID and updates its status to 'rejected'. It also
-     * intends to send a rejection reason via email to the extension's author (as indicated by commented code).
-     * If the extension is found and updated, it returns the extension resource. If not found, it returns an
-     * error response indicating the extension could not be located.
+     * Sidebar counts: installed extensions, updates available and purchased (active paid) licences.
      *
-     * Note: This method assumes the rejection reason is handled separately (possibly by another request).
-     *
-     * @param RegistryExtensionActionRequest $request the validated request object
-     *
-     * @return \Illuminate\Http\Response|array returns an array containing the extension resource if successful,
-     *                                         or an error response if the extension cannot be found
+     * @return \Illuminate\Http\JsonResponse `{installed, updates, purchased}`
      */
-    public function reject(RegistryExtensionActionRequest $request)
+    public function counts()
     {
-        $id        = $request->input('id');
-        $extension = RegistryExtension::find($id);
-        if ($extension) {
-            $extension->update(['status' => 'rejected']);
-            $extension->nextBundle()->update(['status' => 'rejected']);
-        } else {
-            return response()->error('Unable to find extension for rejection.');
-        }
+        $config   = RegistryConfig::current();
+        $localIds = RegistryServiceInstall::where('company_uuid', session('company'))->pluck('extension_id')->filter()->values()->all();
+        $state    = ServiceCatalog::state(RegistryClient::fromConfig($config), $config);
 
-        // send rejection reason via email to extension author
-        // $reason = $request->input('reason');
-
-        return ['registryExtension' => new $this->resource($extension)];
+        return response()->json(ServiceCatalog::counts($state, $localIds));
     }
 
     /**
-     * Submits an extension for review based on its ID.
-     *
-     * This method attempts to submit a `RegistryExtension` for review. It first checks
-     * if the extension is ready for submission by calling the static method
-     * `isExtensionReadyForSubmission`. If the extension is not ready, it returns an error response.
-     * If the extension is ready, it updates the extension's status to 'awaiting_review' and returns
-     * a JSON response indicating success.
+     * Extensions installed on this instance: what the service reports in `updates` plus local install records,
+     * with installed and latest versions.
      *
-     * @param string $id the unique identifier of the extension to be submitted
-     *
-     * @return \Illuminate\Http\JsonResponse returns a JSON response indicating the outcome of the operation
-     *
-     * @throws \Illuminate\Database\Eloquent\ModelNotFoundException if no extension with the given ID is found
+     * @return \Illuminate\Http\JsonResponse `{registryExtensions}`
      */
-    public function submit(string $id)
+    public function installed()
     {
-        $isReady = RegistryExtension::isExtensionReadyForSubmission($id);
-        if (!$isReady) {
-            return response()->error('Unable to submit extension for review.');
-        }
+        $config        = RegistryConfig::current();
+        $localInstalls = RegistryServiceInstall::where('company_uuid', session('company'))->get()->map(fn ($install) => $install->toLocalInstall())->all();
 
-        $extension = RegistryExtension::find($id);
-        if ($extension) {
-            $extension->update(['status' => 'awaiting_review']);
+        try {
+            $extensions = ServiceCatalog::installed(RegistryClient::fromConfig($config), $config, $localInstalls, RegistryServiceInstall::packageNames(session('company')));
+        } catch (RegistryException $e) {
+            return response()->error($e->getMessage(), 503);
         }
 
-        return ['registryExtension' => new $this->resource($extension)];
+        return response()->json(['registryExtensions' => $extensions]);
     }
 
     /**
-     * Handles the download request for an extension bundle.
-     *
-     * This function retrieves a specific `RegistryExtension` by its ID and attempts to download
-     * its latest bundle. If the extension exists and has an associated bundle, it returns a download response
-     * with the appropriate file. If the extension doesn't exist or doesn't have a bundle, it returns an error response.
+     * Extensions the instance's organization bought: active paid licences, and refunded or revoked ones with
+     * their state and receipt. Only active ones entitle installs.
      *
-     * @param RegistryExtensionActionRequest $request the validated request object
-     *
-     * @return \Symfony\Component\HttpFoundation\BinaryFileResponse|\Illuminate\Http\Response
-     *                                                                                        Returns a download response for the bundle if successful, or an error response if not
+     * @return \Illuminate\Http\JsonResponse `{registryExtensions}`
      */
-    public function downloadBundle(RegistryExtensionActionRequest $request)
+    public function purchased()
     {
-        $id        = $request->input('id');
-        $extension = RegistryExtension::find($id);
-        if ($extension && $extension->nextBundle) {
-            $bundleFile = data_get($extension, 'nextBundle.bundle');
-            if ($bundleFile) {
-                return Storage::disk($bundleFile->disk)->download($bundleFile->path, $bundleFile->name);
-            }
+        $config = RegistryConfig::current();
+
+        try {
+            $extensions = ServiceCatalog::purchased(RegistryClient::fromConfig($config), $config, RegistryServiceInstall::packageNames(session('company')));
+        } catch (RegistryException $e) {
+            return response()->error($e->getMessage(), 503);
         }
 
-        return response()->error('Failed to download extension bundle');
+        return response()->json(['registryExtensions' => $extensions]);
     }
 
     /**
-     * Retrieve the current registry configuration.
-     *
-     * Returns the legacy registry host and token, the Registry Service URL, the API version in use and
-     * this instance's registration (the instance token itself is never returned, only a masked hint).
-     *
-     * @param AdminRequest $request the incoming HTTP request
+     * The registry configuration for the admin page.
      *
      * @return \Illuminate\Http\JsonResponse
      */
@@ -403,33 +168,14 @@ public function getConfig(AdminRequest $request)
     }
 
     /**
-     * Save the registry configuration.
-     *
-     * Updates the legacy registry host and token and the Registry Service URL and API version. Values
-     * left out of the request keep their current setting; an empty `service_url` clears it. Pointing
-     * the instance at a different service forgets its registration, since the instance token belongs
-     * to the service that issued it.
-     *
-     * @param AdminRequest $request the incoming HTTP request containing `host`, `token`, `service_url`, `api_version`
+     * Save the Registry Service URL. Pointing the instance at a different service forgets its registration,
+     * since the instance token belongs to the service that issued it.
      *
      * @return \Illuminate\Http\JsonResponse the saved configuration (see `getConfig()`)
      */
     public function saveConfig(AdminRequest $request)
     {
-        $current       = RegistryConfig::current();
-        $registryHost  = $request->input('host', $current->host());
-        $registryToken = $request->input('token', $current->token());
-
-        // Save values in settings and config
-        if ($registryHost) {
-            Setting::configure('registry-bridge.registry.host', $registryHost);
-            config(['registry-bridge.registry.host' => $registryHost]);
-        }
-
-        if ($registryToken) {
-            Setting::configure('registry-bridge.registry.token', $registryToken);
-            config(['registry-bridge.registry.token' => $registryToken]);
-        }
+        $current = RegistryConfig::current();
 
         if ($request->exists('service_url')) {
             $serviceUrl = trim((string) $request->input('service_url'));
@@ -443,33 +189,15 @@ public function saveConfig(AdminRequest $request)
             config(['registry-bridge.registry.service_url' => $serviceUrl]);
         }
 
-        if ($request->exists('api_version')) {
-            $apiVersion = $request->input('api_version');
-            $apiVersion = in_array($apiVersion, [RegistryConfig::V1, RegistryConfig::V2], true) ? $apiVersion : null;
-
-            Setting::configure(InstanceRegistration::SETTING_API_VERSION, $apiVersion);
-            config(['registry-bridge.registry.api_version' => $apiVersion]);
-        }
-
-        // Reboot legacy registry auth; installs from the Registry Service never write credentials to disk
-        if (!RegistryConfig::current()->usesService()) {
-            Utils::bootRegistryAuth(true);
-        }
-
-        // Drop any catalog cached for the previous host/token
+        // Drop any catalog cached for the previous service
         RegistryClient::flush();
 
         return response()->json($this->configPayload(RegistryConfig::current()));
     }
 
     /**
-     * Test the connection to the configured registry.
-     *
-     * Calls the registry's catalog endpoint with the saved settings (or the values supplied in the
-     * request, so unsaved form values can be tried) and reports whether it answered. Against a Registry
-     * Service the saved instance token is also checked, as long as the URL tested is the saved one.
-     *
-     * @param AdminRequest $request optional `host`, `token`, `service_url` overrides
+     * Call the Registry Service once, uncached: the saved URL, or `service_url` from the request so an unsaved
+     * value can be tried. The saved instance token is checked too when the URL tested is the saved one.
      *
      * @return \Illuminate\Http\JsonResponse `{ok, latency_ms, status, extension_count, host, error, api_version, instance}`
      */
@@ -477,41 +205,20 @@ public function testConfig(AdminRequest $request)
     {
         $config     = RegistryConfig::current();
         $serviceUrl = trim((string) $request->input('service_url', ''));
+        $serviceUrl = $serviceUrl !== '' ? RegistryConfig::normalizeUrl($serviceUrl) : (string) ($config->serviceUrl() ?? RegistryConfig::DEFAULT_SERVICE_URL);
+        $token      = $serviceUrl === $config->serviceUrl() ? $config->instanceToken() : null;
 
-        if ($serviceUrl !== '' || ($config->usesService() && !$request->filled('host'))) {
-            $serviceUrl = $serviceUrl !== '' ? RegistryConfig::normalizeUrl($serviceUrl) : (string) $config->serviceUrl();
-            $token      = $serviceUrl === $config->serviceUrl() ? $config->instanceToken() : null;
-            $client     = new RegistryClient($serviceUrl, $token, RegistryConfig::V2, $config);
-
-            return response()->json($client->testConnection());
-        }
-
-        $host  = $request->input('host');
-        $token = $request->input('token');
-
-        $client = new RegistryClient(
-            is_string($host) && trim($host) !== '' ? trim($host) : null,
-            is_string($token) && trim($token) !== '' ? trim($token) : null,
-            RegistryConfig::V1,
-            $config
-        );
-
-        return response()->json($client->testConnection());
+        return response()->json((new RegistryClient($serviceUrl, $token, $config))->testConnection());
     }
 
     /**
-     * Register this instance with the Registry Service.
-     *
-     * Exchanges a one-time registration code (minted by an organization owner or admin on the service)
-     * for an instance token via `POST /v1/instances/register`, reporting this instance's name, host,
-     * kind and console and API versions. The token is stored encrypted in settings and never returned.
+     * Register this instance with the Registry Service: exchanges a one-time registration code (minted by an
+     * organization owner or admin on the service) for an instance token, stored encrypted and never returned.
      *
      * An instance that is already registered sends its current token, and the service matches it by that token or
      * by its host, so registering again rotates the same instance (same id, installs and licence seats) and
      * `instance.rotated` is true in the response.
      *
-     * @param AdminRequest $request `code` (required), optional `service_url`, `name`, `host`, `console_version`
-     *
      * @return \Illuminate\Http\JsonResponse the configuration (see `getConfig()`)
      */
     public function registerInstance(AdminRequest $request)
@@ -536,8 +243,6 @@ public function registerInstance(AdminRequest $request)
     /**
      * Forget this instance's registration (instance token and details) on this side.
      *
-     * The service has no self-revoke endpoint yet; an organization admin revokes the token there.
-     *
      * @return \Illuminate\Http\JsonResponse the configuration (see `getConfig()`)
      */
     public function unregisterInstance(AdminRequest $request)
@@ -547,6 +252,25 @@ public function unregisterInstance(AdminRequest $request)
         return response()->json($this->configPayload(RegistryConfig::current()));
     }
 
+    /**
+     * Pagination meta in the shape the console's `Pagination` component reads.
+     *
+     * @param LengthAwarePaginator<array<string, mixed>> $page
+     *
+     * @return array<string, int|null>
+     */
+    public static function paginationMeta(LengthAwarePaginator $page): array
+    {
+        return [
+            'total'        => $page->total(),
+            'per_page'     => $page->perPage(),
+            'current_page' => $page->currentPage(),
+            'last_page'    => $page->lastPage(),
+            'from'         => $page->firstItem(),
+            'to'           => $page->lastItem(),
+        ];
+    }
+
     /**
      * Configuration as returned to the admin page.
      *
@@ -557,10 +281,8 @@ protected function configPayload(RegistryConfig $config): array
         $instance = $config->instance();
 
         return [
-            'host'          => $config->host(),
-            'token'         => $config->token(),
             'service_url'   => $config->serviceUrl(),
-            'api_version'   => $config->apiVersion(),
+            'publisher_url' => $config->publisherUrl(),
             'instance_kind' => $config->instanceKind(),
             'instance'      => [
                 'registered'    => $config->isRegistered(),
diff --git a/server/src/Http/Controllers/Internal/v1/RegistryPaymentsController.php b/server/src/Http/Controllers/Internal/v1/RegistryPaymentsController.php
deleted file mode 100644
index 3cf938b..0000000
--- a/server/src/Http/Controllers/Internal/v1/RegistryPaymentsController.php
+++ /dev/null
@@ -1,304 +0,0 @@
-<?php
-
-namespace Fleetbase\RegistryBridge\Http\Controllers\Internal\v1;
-
-use Fleetbase\Http\Controllers\Controller;
-use Fleetbase\Http\Resources\FleetbaseResource;
-use Fleetbase\RegistryBridge\Models\RegistryExtension;
-use Fleetbase\RegistryBridge\Models\RegistryExtensionPurchase;
-use Fleetbase\RegistryBridge\Support\CentralCatalog;
-use Fleetbase\RegistryBridge\Support\Utils;
-use Fleetbase\Support\Auth;
-use Illuminate\Http\Request;
-use Illuminate\Support\Str;
-
-/**
- * Handles payment processing and Stripe account management for registry extensions.
- *
- * This controller provides functionalities such as checking if a company has a Stripe Connect account,
- * creating Stripe accounts, managing Stripe account sessions, and handling Stripe Checkout sessions.
- */
-class RegistryPaymentsController extends Controller
-{
-    /**
-     * Checks if the currently authenticated company has an associated Stripe Connect account.
-     *
-     * This method verifies if the authenticated company has a Stripe Connect ID that starts with 'acct_'.
-     *
-     * @return \Illuminate\Http\JsonResponse returns a JSON response indicating the presence of a Stripe Connect account
-     */
-    public function hasStripeConnectAccount()
-    {
-        $company = Auth::getCompany();
-        if ($company) {
-            return response()->json([
-                'hasStripeConnectAccount' => !empty($company->stripe_connect_id) && Str::startsWith($company->stripe_connect_id, 'acct_'),
-            ]);
-        }
-
-        return response()->json([
-            'hasStripeConnectAccount' => false,
-        ]);
-    }
-
-    /**
-     * Creates a new Stripe account for the currently authenticated company and stores the account ID.
-     *
-     * This method utilizes the Fleetbase utility class to create a Stripe Express account and saves the
-     * Stripe account ID to the current company's profile. In case of failure, it returns an error.
-     *
-     * @return \Illuminate\Http\JsonResponse returns the Stripe account ID or an error message in JSON format
-     */
-    public function getStripeAccount()
-    {
-        $stripe = Utils::getStripeClient();
-
-        try {
-            $account = $stripe->accounts->create([
-                'controller' => [
-                    'stripe_dashboard' => [
-                        'type' => 'express',
-                    ],
-                    'fees' => [
-                        'payer' => 'application',
-                    ],
-                    'losses' => [
-                        'payments' => 'application',
-                    ],
-                ],
-            ]);
-
-            // Save account ID to current company session
-            $company = Auth::getCompany();
-            if ($company) {
-                $company->update(['stripe_connect_id' => $account->id]);
-            }
-
-            return response()->json(['account' => $account->id]);
-        } catch (\Exception $e) {
-            return response()->error($e->getMessage());
-        }
-    }
-
-    /**
-     * Creates a Stripe account session for account onboarding or management.
-     *
-     * This method creates a session for the current company's Stripe account, allowing for onboarding or management activities.
-     * It accepts an 'account' parameter from the request, defaulting to the company's stored Stripe Connect ID if not provided.
-     *
-     * @param Request $request the incoming HTTP request containing optional 'account' parameter
-     *
-     * @return \Illuminate\Http\JsonResponse returns a JSON response with the session's client secret or an error message
-     */
-    public function getStripeAccountSession(Request $request)
-    {
-        $stripe  = Utils::getStripeClient();
-        $company = Auth::getCompany();
-
-        try {
-            $accountSession = $stripe->accountSessions->create([
-                'account'    => $request->input('account', $company->stripe_connect_id),
-                'components' => [
-                    'account_onboarding' => [
-                        'enabled' => true,
-                    ],
-                ],
-            ]);
-
-            return response()->json([
-                'clientSecret' => $accountSession->client_secret,
-            ]);
-        } catch (\Exception $e) {
-            return response()->error($e->getMessage());
-        }
-    }
-
-    /**
-     * Creates a Stripe Checkout session for a specified registry extension.
-     *
-     * This method initializes a checkout session for purchasing a registry extension identified by a UUID.
-     * It requires a 'uri' for redirection after the checkout and an 'extension' UUID to identify the product.
-     *
-     * @param Request $request the incoming HTTP request with 'uri' and 'extension' parameters
-     *
-     * @return \Illuminate\Http\JsonResponse returns the checkout session's client secret or an error message
-     */
-    public function createStripeCheckoutSession(Request $request)
-    {
-        $redirectUri       = $request->input('uri');
-        $extension         = RegistryExtension::where('uuid', $request->input('extension'))->first();
-        if (!$extension) {
-            $requested = $request->input('extension');
-            if (CentralCatalog::enabled() && CentralCatalog::find(is_string($requested) ? $requested : null)) {
-                return response()->error('This extension is listed from the central Fleetbase registry and cannot be purchased from this instance yet. Purchases will be available once the Registry Service launches.');
-            }
-
-            return response()->error('The extension you attempted to purchase does not exist.');
-        }
-
-        try {
-            $checkoutSession = $extension->createStripeCheckoutSession($redirectUri);
-        } catch (\Throwable $e) {
-            return response()->error($e->getMessage());
-        }
-
-        return response()->json(['clientSecret' => $checkoutSession->client_secret]);
-    }
-
-    /**
-     * Retrieves the status of an ongoing Stripe Checkout session.
-     *
-     * This method checks the status of a Stripe Checkout session associated with a registry extension purchase.
-     * It ensures the extension exists and checks if it has already been purchased. It then retrieves and returns
-     * the checkout session status or creates a purchase record if the session is complete.
-     *
-     * @param Request $request the incoming HTTP request containing 'extension' and 'checkout_session_id'
-     *
-     * @return \Illuminate\Http\JsonResponse returns the checkout session status or an error message
-     */
-    public function getStripeCheckoutSessionStatus(Request $request)
-    {
-        $extension = RegistryExtension::where('uuid', $request->input('extension'))->first();
-        if (!$extension) {
-            return response()->error('The extension you attempted to purchase does not exist.');
-        }
-
-        // Flush cache for extension
-        if (method_exists($extension, 'flushCache')) {
-            $extension->flushCache();
-        }
-
-        // Determine purchaser (Company or RegistryDeveloperAccount)
-        $purchaser     = null;
-        $purchaserType = null;
-        $purchaserUuid = null;
-
-        // Check if authenticated via session (cloud user)
-        if (session('company')) {
-            $purchaserUuid = session('company');
-            $purchaserType = 'Fleetbase\\Models\\Company';
-        }
-        // Check if authenticated via bearer token (developer account)
-        elseif ($request->bearerToken()) {
-            $registryUser = \Fleetbase\RegistryBridge\Models\RegistryUser::where('token', $request->bearerToken())->first();
-            if ($registryUser && $registryUser->developer_account_uuid) {
-                $purchaserUuid = $registryUser->developer_account_uuid;
-                $purchaserType = 'Fleetbase\\RegistryBridge\\Models\\RegistryDeveloperAccount';
-            }
-        }
-
-        if (!$purchaserUuid || !$purchaserType) {
-            return response()->error('Unable to identify purchaser. Please ensure you are logged in.');
-        }
-
-        // Check if already purchased
-        $purchaseRecordExists = RegistryExtensionPurchase::where([
-            'purchaser_uuid' => $purchaserUuid,
-            'purchaser_type' => $purchaserType,
-            'extension_uuid' => $extension->uuid,
-        ])->exists();
-
-        if ($purchaseRecordExists) {
-            return response()->json(['status' => 'purchase_complete', 'extension' => $extension]);
-        }
-
-        $stripe = Utils::getStripeClient();
-        try {
-            $session = $stripe->checkout->sessions->retrieve($request->input('checkout_session_id'));
-            if (isset($session->status) && $session->status === 'complete') {
-                RegistryExtensionPurchase::firstOrCreate(
-                    [
-                        'purchaser_uuid' => $purchaserUuid,
-                        'purchaser_type' => $purchaserType,
-                        'extension_uuid' => $extension->uuid,
-                    ],
-                    [
-                        'stripe_checkout_session_id' => $session->id,
-                        'stripe_payment_intent_id'   => $session->payment_intent,
-                        'locked_price'               => $session->amount_total,
-                        // Keep company_uuid for backward compatibility if it's a company
-                        'company_uuid'               => $purchaserType === 'Fleetbase\\Models\\Company' ? $purchaserUuid : null,
-                    ]
-                );
-            }
-
-            // Flush cache for extension
-            if (method_exists($extension, 'flushCache')) {
-                $extension->flushCache();
-            }
-
-            return response()->json(['status' => $session->status, 'extension' => $extension]);
-        } catch (\Error $e) {
-            return response()->error($e->getMessage());
-        }
-    }
-
-    public function getAuthorReceivedPayments(Request $request)
-    {
-        $limit     = $request->input('limit', 30);
-        $query     = RegistryExtensionPurchase::whereHas(
-            'extension',
-            function ($query) {
-                $query->where('company_uuid', session('company'));
-            }
-        )->with(
-            [
-                'extension' => function ($query) {
-                    $query->select(['uuid', 'public_id', 'name', 'category_uuid']);
-                    $query->with(['category']);
-                },
-                'company' => function ($query) {
-                    $query->select(['uuid', 'name'])->withoutGlobalScopes();
-                },
-            ]
-        );
-
-        // Handle sorting
-        app(RegistryExtensionPurchase::class)->applySorts($request, $query);
-
-        $payments                   = $query->fastPaginate($limit);
-        $totalPurchaseAmount        = $query->get()->sum('locked_price');
-
-        return FleetbaseResource::collection($payments)->additional(['total_amount' => $totalPurchaseAmount]);
-    }
-
-    /**
-     * Creates a Stripe account session for account management.
-     *
-     * This method creates a session that allows connected accounts to manage their account details,
-     * including updating bank account information, business details, and other settings.
-     *
-     * @param Request $request the incoming HTTP request
-     *
-     * @return \Illuminate\Http\JsonResponse returns a JSON response with the session's client secret or an error message
-     */
-    public function createAccountManagementSession(Request $request)
-    {
-        $stripe  = Utils::getStripeClient();
-        $company = Auth::getCompany();
-
-        if (!$company || !$company->stripe_connect_id) {
-            return response()->error('Stripe Connect account not found for this company.');
-        }
-
-        try {
-            $accountSession = $stripe->accountSessions->create([
-                'account'    => $company->stripe_connect_id,
-                'components' => [
-                    'account_management' => [
-                        'enabled'  => true,
-                        'features' => [
-                            'external_account_collection' => true,
-                        ],
-                    ],
-                ],
-            ]);
-
-            return response()->json([
-                'clientSecret' => $accountSession->client_secret,
-            ]);
-        } catch (\Exception $e) {
-            return response()->error($e->getMessage());
-        }
-    }
-}
diff --git a/server/src/Http/Controllers/Internal/v1/ServicePurchaseController.php b/server/src/Http/Controllers/Internal/v1/ServicePurchaseController.php
new file mode 100644
index 0000000..04f4c52
--- /dev/null
+++ b/server/src/Http/Controllers/Internal/v1/ServicePurchaseController.php
@@ -0,0 +1,84 @@
+<?php
+
+namespace Fleetbase\RegistryBridge\Http\Controllers\Internal\v1;
+
+use Fleetbase\Http\Controllers\Controller;
+use Fleetbase\RegistryBridge\Exceptions\RegistryException;
+use Fleetbase\RegistryBridge\Exceptions\RegistryServiceException;
+use Fleetbase\RegistryBridge\Support\RegistryClient;
+use Fleetbase\RegistryBridge\Support\RegistryConfig;
+use Fleetbase\RegistryBridge\Support\ServiceCheckout;
+use Fleetbase\RegistryBridge\Support\ServiceReceipts;
+use Illuminate\Http\Request;
+
+/**
+ * Purchases through the Registry Service checkout (Phase 4): start a hosted checkout, then poll its hand-off.
+ */
+class ServicePurchaseController extends Controller
+{
+    /**
+     * Start a hosted Stripe Checkout for an extension and return its URL and hand-off id.
+     *
+     * `return_url` is where Stripe sends the buyer back with `handoff=<id>` appended, `cancel_url` (default:
+     * the return URL) where it sends a buyer who cancels, with `cancelled=1` as well.
+     *
+     * @return \Illuminate\Http\JsonResponse `{url, handoff, status, amount, currency}`; the service's refusal
+     *                                       (409 already licensed, 422 not purchasable here, 503 no Stripe) passes
+     *                                       through with its message, 501 when the service has no checkout
+     */
+    public function checkout(Request $request)
+    {
+        $extension = trim((string) $request->input('extension', ''));
+        $returnUrl = trim((string) $request->input('return_url', ''));
+        $cancelUrl = trim((string) $request->input('cancel_url', ''));
+        if ($extension === '' || $returnUrl === '') {
+            return response()->error('An extension and a return URL are required.', 422);
+        }
+
+        $config = RegistryConfig::current();
+
+        try {
+            $checkout = ServiceCheckout::start(RegistryClient::fromConfig($config), $config, $extension, $returnUrl, $cancelUrl ?: null, $request->user()?->email);
+        } catch (RegistryServiceException $e) {
+            return response()->error($e->getMessage(), static::status($e));
+        } catch (RegistryException $e) {
+            return response()->error($e->getMessage(), 503);
+        }
+
+        return response()->json($checkout);
+    }
+
+    /**
+     * The status of a checkout hand-off: `pending` while it is `open`, `completed` once the service's webhook
+     * recorded the purchase (its receipt is kept for Purchased), or `failed` when it `expired`.
+     *
+     * @return \Illuminate\Http\JsonResponse see `ServiceCheckout::describe()`
+     */
+    public function handoff(string $handoff)
+    {
+        $config = RegistryConfig::current();
+
+        try {
+            $body = RegistryClient::fromConfig($config)->purchase($handoff);
+        } catch (RegistryServiceException $e) {
+            return response()->error($e->getMessage(), $e->status() === 404 ? 404 : ($e->status() >= 400 && $e->status() < 500 ? 422 : 502));
+        } catch (RegistryException $e) {
+            return response()->error($e->getMessage(), 503);
+        }
+
+        $handoff = ServiceCheckout::describe($body);
+        ServiceReceipts::remember($config, $handoff);
+
+        return response()->json($handoff);
+    }
+
+    /**
+     * HTTP status for a refused checkout: the service's own 4xx and 501/503 pass through, other failures are 502.
+     */
+    protected static function status(RegistryServiceException $e): int
+    {
+        $status = $e->status();
+
+        return ($status >= 400 && $status < 500) || in_array($status, [501, 503], true) ? $status : 502;
+    }
+}
diff --git a/server/src/Http/Controllers/RegistryBridgeController.php b/server/src/Http/Controllers/RegistryBridgeController.php
deleted file mode 100644
index 20a1758..0000000
--- a/server/src/Http/Controllers/RegistryBridgeController.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-namespace Fleetbase\RegistryBridge\Http\Controllers;
-
-use Fleetbase\Http\Controllers\FleetbaseController;
-
-class RegistryBridgeController extends FleetbaseController
-{
-    /**
-     * The package namespace used to resolve from.
-     */
-    public string $namespace = '\\Fleetbase\\RegistryBridge';
-}
diff --git a/server/src/Http/Filter/RegistryExtensionFilter.php b/server/src/Http/Filter/RegistryExtensionFilter.php
deleted file mode 100644
index 8be0ebb..0000000
--- a/server/src/Http/Filter/RegistryExtensionFilter.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-
-namespace Fleetbase\RegistryBridge\Http\Filter;
-
-use Fleetbase\Http\Filter\Filter;
-use Fleetbase\RegistryBridge\Support\Utils;
-use Illuminate\Support\Str;
-
-class RegistryExtensionFilter extends Filter
-{
-    public function queryForInternal()
-    {
-        if ($this->request->boolean('explore') || $this->request->boolean('admin')) {
-            return;
-        }
-        $this->builder->where('company_uuid', $this->session->get('company'));
-    }
-
-    public function queryForPublic()
-    {
-        $this->builder->where('company_uuid', $this->session->get('company'));
-    }
-
-    public function admin()
-    {
-        $user = $this->request->user();
-        if ($user && $user->isNotAdmin()) {
-            $this->builder->where('company_uuid', $this->session->get('company'));
-        }
-    }
-
-    public function query(?string $searchQuery)
-    {
-        $this->builder->search($searchQuery);
-    }
-
-    public function isAuthor()
-    {
-        $this->builder->where('company_uuid', session('company'));
-    }
-
-    public function explore()
-    {
-        $this->builder->where('status', 'published');
-        $this->builder->without(['current_bundle', 'next_bundle', 'category']);
-        $this->builder->with(['screenshots']);
-    }
-
-    public function category($category)
-    {
-        if (Str::isUuid($category)) {
-            return $this->builder->where('category_uuid', $category);
-        }
-
-        if (Utils::isPublicId($category)) {
-            return $this->builder->whereHas('category', function ($query) use ($category) {
-                $query->where('public_id', $category)->where('for', 'extension_category')->where('core_category', 1);
-            });
-        }
-
-        // assume slug
-        return $this->builder->whereHas('category', function ($query) use ($category) {
-            $query->where('slug', $category)->where('for', 'extension_category')->where('core_category', 1);
-        });
-    }
-
-    public function createdAt($createdAt)
-    {
-        $createdAt = Utils::dateRange($createdAt);
-
-        if (is_array($createdAt)) {
-            $this->builder->whereBetween('created_at', $createdAt);
-        } else {
-            $this->builder->whereDate('created_at', $createdAt);
-        }
-    }
-
-    public function updatedAt($updatedAt)
-    {
-        $updatedAt = Utils::dateRange($updatedAt);
-
-        if (is_array($updatedAt)) {
-            $this->builder->whereBetween('updated_at', $updatedAt);
-        } else {
-            $this->builder->whereDate('updated_at', $updatedAt);
-        }
-    }
-}
diff --git a/server/src/Http/Requests/AddRegistryUserRequest.php b/server/src/Http/Requests/AddRegistryUserRequest.php
deleted file mode 100644
index 538629b..0000000
--- a/server/src/Http/Requests/AddRegistryUserRequest.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-namespace Fleetbase\RegistryBridge\Http\Requests;
-
-use Fleetbase\Http\Requests\FleetbaseRequest;
-use Fleetbase\Models\User;
-use Illuminate\Support\Facades\Validator;
-
-/**
- * Request class to handle the addition of new registry users.
- *
- * Validates the request data for adding a new user to the registry.
- * Ensures that the company ID, user email, and password are provided and valid.
- * The company and user must exist and not be deleted.
- */
-class AddRegistryUserRequest extends FleetbaseRequest
-{
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
-    {
-        return true;
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
-    {
-        Validator::extend('valid_identity', function ($attribute, $value, $parameters, $validator) {
-            return User::where('email', $value)
-                       ->orWhere('username', $value)
-                       ->whereNull('deleted_at')
-                       ->exists();
-        });
-
-        return [
-            'identity' => ['required', 'valid_identity'],
-            'password' => ['required'],
-        ];
-    }
-}
diff --git a/server/src/Http/Requests/AuthenticateRegistryUserRequest.php b/server/src/Http/Requests/AuthenticateRegistryUserRequest.php
deleted file mode 100644
index 10a6379..0000000
--- a/server/src/Http/Requests/AuthenticateRegistryUserRequest.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-namespace Fleetbase\RegistryBridge\Http\Requests;
-
-use Fleetbase\Http\Requests\FleetbaseRequest;
-use Fleetbase\Models\User;
-use Illuminate\Support\Facades\Validator;
-
-/**
- * Request class to handle the addition of new registry users.
- *
- * Validates the request data for adding a new user to the registry.
- * Ensures that the company ID, user email, and password are provided and valid.
- * The company and user must exist and not be deleted.
- */
-class AuthenticateRegistryUserRequest extends FleetbaseRequest
-{
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
-    {
-        return true;
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
-    {
-        Validator::extend('valid_identity', function ($attribute, $value, $parameters, $validator) {
-            return User::where('email', $value)
-                       ->orWhere('username', $value)
-                       ->whereNull('deleted_at')
-                       ->exists();
-        });
-
-        return [
-            'identity' => ['required', 'valid_identity'],
-            'password' => ['required'],
-        ];
-    }
-}
diff --git a/server/src/Http/Requests/CreateRegistryExtensionBundleRequest.php b/server/src/Http/Requests/CreateRegistryExtensionBundleRequest.php
deleted file mode 100644
index 54220e2..0000000
--- a/server/src/Http/Requests/CreateRegistryExtensionBundleRequest.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-namespace Fleetbase\RegistryBridge\Http\Requests;
-
-use Fleetbase\Http\Requests\FleetbaseRequest;
-use Fleetbase\Models\File;
-use Fleetbase\RegistryBridge\Models\RegistryExtension;
-use Illuminate\Support\Facades\Validator;
-
-class CreateRegistryExtensionBundleRequest extends FleetbaseRequest
-{
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
-    {
-        return session('company');
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
-    {
-        Validator::extend('valid_extension', function ($attribute, $value, $parameters, $validator) {
-            return RegistryExtension::where(['uuid' => $value, 'company_uuid' => session('company')])->whereNull('deleted_at')->exists();
-        }, 'Invalid extension provided for bundle submission.');
-
-        Validator::extend('valid_bundle', function ($attribute, $value, $parameters, $validator) {
-            return File::where(['uuid' => $value, 'company_uuid' => session('company'), 'subject_uuid' => $this->input('registryExtensionBundle.extension_uuid'), 'type' => 'extension_bundle'])->whereNull('deleted_at')->exists();
-        }, 'Invalid bundle zip uploaded for submission.');
-
-        return [
-            'extension_uuid'        => ['required', 'valid_extension'],
-            'bundle_uuid'           => ['required', 'valid_bundle'],
-        ];
-    }
-}
diff --git a/server/src/Http/Requests/CreateRegistryExtensionRequest.php b/server/src/Http/Requests/CreateRegistryExtensionRequest.php
deleted file mode 100644
index 4c9fd89..0000000
--- a/server/src/Http/Requests/CreateRegistryExtensionRequest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-namespace Fleetbase\RegistryBridge\Http\Requests;
-
-use Fleetbase\Http\Requests\FleetbaseRequest;
-
-class CreateRegistryExtensionRequest extends FleetbaseRequest
-{
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
-    {
-        return session('company');
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
-    {
-        return [
-            'name'        => ['required', 'min:3', 'unique:registry_extensions,name'],
-            'description' => ['required', 'min:12'],
-        ];
-    }
-}
diff --git a/server/src/Http/Requests/InstallExtensionRequest.php b/server/src/Http/Requests/InstallExtensionRequest.php
index 98edb1c..1fc1c07 100644
--- a/server/src/Http/Requests/InstallExtensionRequest.php
+++ b/server/src/Http/Requests/InstallExtensionRequest.php
@@ -24,7 +24,9 @@ public function authorize()
     public function rules()
     {
         return [
-            'extension' => ['required', 'exists:registry_extensions,public_id'],
+            // A local public id or a Registry Service id, slug or package name; the installer resolves it
+            'extension' => ['required', 'string', 'max:255'],
+            'version'   => ['nullable', 'string', 'max:64'],
         ];
     }
 }
diff --git a/server/src/Http/Requests/RegistryAuthRequest.php b/server/src/Http/Requests/RegistryAuthRequest.php
deleted file mode 100644
index 1be547f..0000000
--- a/server/src/Http/Requests/RegistryAuthRequest.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-namespace Fleetbase\RegistryBridge\Http\Requests;
-
-use Fleetbase\Http\Requests\FleetbaseRequest;
-use Fleetbase\Models\User;
-use Illuminate\Support\Facades\Validator;
-use Illuminate\Validation\Rule;
-
-/**
- * Request class to handle the addition of new registry users.
- *
- * Validates the request data for adding a new user to the registry.
- * Ensures that the company ID, user email, and password are provided and valid.
- * The company and user must exist and not be deleted.
- */
-class RegistryAuthRequest extends FleetbaseRequest
-{
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
-    {
-        return true;
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
-    {
-        Validator::extend('valid_identity', function ($attribute, $value, $parameters, $validator) {
-            return User::where('email', $value)
-                       ->orWhere('username', $value)
-                       ->whereNull('deleted_at')
-                       ->exists();
-        });
-
-        return [
-            'identity' => [Rule::requiredIf($this->isNotFilled('package')), 'valid_identity'],
-            'package'  => ['nullable'],
-        ];
-    }
-}
diff --git a/server/src/Http/Requests/RegistryExtensionActionRequest.php b/server/src/Http/Requests/RegistryExtensionActionRequest.php
deleted file mode 100644
index 7c7f9b5..0000000
--- a/server/src/Http/Requests/RegistryExtensionActionRequest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-namespace Fleetbase\RegistryBridge\Http\Requests;
-
-use Fleetbase\Http\Requests\FleetbaseRequest;
-
-class RegistryExtensionActionRequest extends FleetbaseRequest
-{
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
-    {
-        return session('is_admin') === true;
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
-    {
-        return [
-            'id' => 'required|exists:registry_extensions,uuid',
-        ];
-    }
-}
diff --git a/server/src/Http/Resources/PublicRegistryExtension.php b/server/src/Http/Resources/PublicRegistryExtension.php
deleted file mode 100644
index 3765739..0000000
--- a/server/src/Http/Resources/PublicRegistryExtension.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-
-namespace Fleetbase\RegistryBridge\Http\Resources;
-
-use Fleetbase\Http\Resources\FleetbaseResource;
-
-class PublicRegistryExtension extends FleetbaseResource
-{
-    /**
-     * Transform the resource into an array.
-     *
-     * Only exposes fields that are safe for public consumption.
-     * No UUIDs, no Stripe data, no internal IDs, no bundle file relationships,
-     * no purchase/install relationships, no sensitive company data.
-     *
-     * @param \Illuminate\Http\Request $request
-     *
-     * @return array
-     */
-    public function toArray($request)
-    {
-        return [
-            // Core identity (public_id only, no uuid)
-            'id'                    => $this->public_id,
-            'slug'                  => $this->slug,
-            'name'                  => $this->name,
-            'subtitle'              => $this->subtitle,
-            'description'           => $this->description,
-            'promotional_text'      => $this->promotional_text,
-            'fa_icon'               => $this->fa_icon,
-            'icon_url'              => $this->icon_url,
-            'tags'                  => $this->tags ?? [],
-            'languages'             => $this->languages ?? [],
-            'primary_language'      => $this->primary_language,
-            'version'               => $this->version,
-            'status'                => $this->status,
-
-            // URLs
-            'website_url'           => $this->website_url,
-            'repo_url'              => $this->repo_url,
-            'support_url'           => $this->support_url,
-            'privacy_policy_url'    => $this->privacy_policy_url,
-            'tos_url'               => $this->tos_url,
-            'copyright'             => $this->copyright,
-
-            // Pricing (public-safe fields only, no Stripe IDs)
-            'payment_required'      => $this->payment_required,
-            'price'                 => $this->price,
-            'sale_price'            => $this->sale_price,
-            'on_sale'               => $this->on_sale,
-            'currency'              => $this->currency,
-            'subscription_required' => $this->subscription_required,
-
-            // Flags
-            'core_extension'        => $this->core_extension,
-            'self_managed'          => $this->self_managed,
-
-            // Stats
-            'installs_count'        => $this->installs_count ?? 0,
-
-            // Timestamps
-            'published_at'          => $this->published_at,
-            'created_at'            => $this->created_at,
-            'updated_at'            => $this->updated_at,
-
-            // Publisher (minimal safe fields only)
-            'publisher'             => $this->when($this->relationLoaded('company') && $this->company, [
-                'name'        => data_get($this, 'company.name'),
-                'slug'        => data_get($this, 'company.slug'),
-                'type'        => data_get($this, 'company.type'),
-                'website_url' => data_get($this, 'company.website_url'),
-                'description' => data_get($this, 'company.description'),
-            ]),
-
-            // Category (safe fields only, no UUIDs)
-            'category'              => $this->when($this->relationLoaded('category') && $this->category, [
-                'id'          => data_get($this, 'category.public_id'),
-                'name'        => data_get($this, 'category.name'),
-                'slug'        => data_get($this, 'category.slug'),
-                'description' => data_get($this, 'category.description'),
-                'icon'        => data_get($this, 'category.icon'),
-                'icon_color'  => data_get($this, 'category.icon_color'),
-                'tags'        => data_get($this, 'category.tags', []),
-            ]),
-
-            // Current bundle (status, version, meta, bundle_number only - no file relationships, no UUIDs)
-            'current_bundle'        => $this->when($this->relationLoaded('currentBundle') && $this->currentBundle, [
-                'bundle_number' => data_get($this, 'currentBundle.bundle_number'),
-                'version'       => data_get($this, 'currentBundle.version'),
-                'status'        => data_get($this, 'currentBundle.status'),
-                'meta'          => data_get($this, 'currentBundle.meta'),
-            ]),
-        ];
-    }
-}
diff --git a/server/src/Http/Resources/RegistryUser.php b/server/src/Http/Resources/RegistryUser.php
deleted file mode 100644
index 1aa9f0a..0000000
--- a/server/src/Http/Resources/RegistryUser.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-namespace Fleetbase\RegistryBridge\Http\Resources;
-
-use Fleetbase\Http\Resources\FleetbaseResource;
-
-class RegistryUser extends FleetbaseResource
-{
-    /**
-     * Transform the resource into an array.
-     *
-     * @param \Illuminate\Http\Request $request
-     *
-     * @return array
-     */
-    public function toArray($request)
-    {
-        return [
-            'id'            => $this->public_id,
-            'user_id'       => $this->user->public_id,
-            'company_id'    => $this->company->public_id,
-            'token'         => $this->token,
-            'groups'        => $this->groups(),
-            'updated_at'    => $this->updated_at,
-            'created_at'    => $this->created_at,
-        ];
-    }
-}
diff --git a/server/src/Http/Resources/RemoteRegistryExtension.php b/server/src/Http/Resources/RemoteRegistryExtension.php
deleted file mode 100644
index 7a9a4ea..0000000
--- a/server/src/Http/Resources/RemoteRegistryExtension.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-namespace Fleetbase\RegistryBridge\Http\Resources;
-
-use Fleetbase\Http\Resources\FleetbaseResource;
-
-/**
- * Resource for an extension read from the central registry.
- *
- * The underlying resource is already an array in the `RegistryExtension` shape
- * (see `CentralCatalog::transform()`), so it is passed through untouched.
- *
- * @see \Fleetbase\RegistryBridge\Support\CentralCatalog
- */
-class RemoteRegistryExtension extends FleetbaseResource
-{
-    /**
-     * Transform the resource into an array.
-     *
-     * @param \Illuminate\Http\Request $request
-     *
-     * @return array<string, mixed>
-     */
-    public function toArray($request)
-    {
-        return is_array($this->resource) ? $this->resource : (array) $this->resource;
-    }
-}
diff --git a/server/src/Models/RegistryDeveloperAccount.php b/server/src/Models/RegistryDeveloperAccount.php
deleted file mode 100644
index 0c3fe9e..0000000
--- a/server/src/Models/RegistryDeveloperAccount.php
+++ /dev/null
@@ -1,158 +0,0 @@
-<?php
-
-namespace Fleetbase\RegistryBridge\Models;
-
-use Fleetbase\Models\Model;
-use Fleetbase\Traits\HasUuid;
-use Illuminate\Support\Str;
-
-class RegistryDeveloperAccount extends Model
-{
-    use HasUuid;
-
-    /**
-     * The database table used by the model.
-     *
-     * @var string
-     */
-    protected $table = 'registry_developer_accounts';
-
-    /**
-     * The database connection to use.
-     *
-     * Registry data belongs to the account and only exists in the live database
-     * (sandbox migrations are disabled for this package), so it must never follow
-     * the sandbox connection switch made by `Auth::setSandboxSession()`.
-     *
-     * @var string
-     */
-    protected $connection = 'mysql';
-
-    /**
-     * The attributes that are mass assignable.
-     *
-     * @var array
-     */
-    protected $fillable = [
-        'username',
-        'email',
-        'password',
-        'name',
-        'avatar_url',
-        'github_username',
-        'website',
-        'bio',
-        'email_verified_at',
-        'verification_token',
-        'status',
-    ];
-
-    /**
-     * The attributes that should be cast to native types.
-     *
-     * @var array
-     */
-    protected $casts = [
-        'email_verified_at' => 'datetime',
-    ];
-
-    /**
-     * The attributes excluded from the model's JSON form.
-     *
-     * @var array
-     */
-    protected $hidden = [
-        'password',
-        'verification_token',
-    ];
-
-    /**
-     * The "booting" method of the model.
-     */
-    protected static function boot()
-    {
-        parent::boot();
-
-        static::creating(function ($model) {
-            if (empty($model->verification_token)) {
-                $model->verification_token = Str::random(64);
-            }
-        });
-    }
-
-    /**
-     * Get the registry users associated with this developer account.
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany
-     */
-    public function registryUsers()
-    {
-        return $this->hasMany(RegistryUser::class, 'developer_account_uuid', 'uuid');
-    }
-
-    /**
-     * Get the extensions published by this developer account.
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany
-     */
-    public function extensions()
-    {
-        return $this->hasMany(RegistryExtension::class, 'publisher_uuid', 'uuid')
-                    ->where('publisher_type', 'developer');
-    }
-
-    /**
-     * Check if the account is active.
-     */
-    public function isActive(): bool
-    {
-        return $this->status === 'active';
-    }
-
-    /**
-     * Check if the account is suspended.
-     */
-    public function isSuspended(): bool
-    {
-        return $this->status === 'suspended';
-    }
-
-    /**
-     * Check if the account is pending verification.
-     */
-    public function isPendingVerification(): bool
-    {
-        return $this->status === 'pending_verification';
-    }
-
-    /**
-     * Check if the email is verified.
-     */
-    public function isEmailVerified(): bool
-    {
-        return $this->email_verified_at !== null;
-    }
-
-    /**
-     * Mark the email as verified.
-     */
-    public function markEmailAsVerified(): bool
-    {
-        return $this->update([
-            'email_verified_at'  => now(),
-            'status'             => 'active',
-            'verification_token' => null,
-        ]);
-    }
-
-    /**
-     * Generate a new verification token.
-     */
-    public function generateVerificationToken(): string
-    {
-        $token = Str::random(64);
-        $this->update(['verification_token' => $token]);
-
-        return $token;
-    }
-}
diff --git a/server/src/Models/RegistryExtension.php b/server/src/Models/RegistryExtension.php
deleted file mode 100644
index f44111c..0000000
--- a/server/src/Models/RegistryExtension.php
+++ /dev/null
@@ -1,775 +0,0 @@
-<?php
-
-namespace Fleetbase\RegistryBridge\Models;
-
-use Fleetbase\Casts\Json;
-use Fleetbase\Casts\Money;
-use Fleetbase\Models\Category;
-use Fleetbase\Models\Company;
-use Fleetbase\Models\File;
-use Fleetbase\Models\Model;
-use Fleetbase\Models\User;
-use Fleetbase\RegistryBridge\Support\Utils;
-use Fleetbase\Traits\HasApiModelBehavior;
-use Fleetbase\Traits\HasMetaAttributes;
-use Fleetbase\Traits\HasPublicId;
-use Fleetbase\Traits\HasUuid;
-use Fleetbase\Traits\Searchable;
-use Illuminate\Support\Str;
-use Spatie\Sluggable\HasSlug;
-use Spatie\Sluggable\SlugOptions;
-
-class RegistryExtension extends Model
-{
-    use HasUuid;
-    use HasPublicId;
-    use HasMetaAttributes;
-    use HasApiModelBehavior;
-    use HasSlug;
-    use Searchable;
-
-    /**
-     * The database table used by the model.
-     *
-     * @var string
-     */
-    protected $table = 'registry_extensions';
-
-    /**
-     * The database connection to use.
-     *
-     * Registry data belongs to the account and only exists in the live database
-     * (sandbox migrations are disabled for this package), so it must never follow
-     * the sandbox connection switch made by `Auth::setSandboxSession()`.
-     *
-     * @var string
-     */
-    protected $connection = 'mysql';
-
-    /**
-     * The type of public Id to generate.
-     *
-     * @var string
-     */
-    protected $publicIdType = 'extension';
-
-    /**
-     * The attributes that are mass assignable.
-     */
-    protected $fillable = [
-        'uuid',
-        'company_uuid',
-        'created_by_uuid',
-        'category_uuid',
-        'registry_user_uuid',
-        'current_bundle_uuid',
-        'next_bundle_uuid',
-        'icon_uuid',
-        'public_id',
-        'stripe_product_id',
-        'name',
-        'subtitle',
-        'self_managed',
-        'payment_required',
-        'price',
-        'sale_price',
-        'on_sale',
-        'subscription_required',
-        'subscription_billing_period',
-        'subscription_model',
-        'subscription_amount',
-        'subscription_tiers',
-        'currency',
-        'slug',
-        'version',
-        'fa_icon',
-        'description',
-        'promotional_text',
-        'website_url',
-        'repo_url',
-        'support_url',
-        'privacy_policy_url',
-        'tos_url',
-        'copyright',
-        'primary_language',
-        'tags',
-        'languages',
-        'meta',
-        'core_extension',
-        'status',
-    ];
-
-    /**
-     * The attributes that should be cast to native types.
-     */
-    protected $casts = [
-        'self_managed'          => 'boolean',
-        'payment_required'      => 'boolean',
-        'on_sale'               => 'boolean',
-        'subscription_required' => 'boolean',
-        'subscription_tiers'    => Json::class,
-        'tags'                  => Json::class,
-        'languages'             => Json::class,
-        'meta'                  => Json::class,
-        'core_extension'        => 'boolean',
-        'price'                 => Money::class,
-        'sale_price'            => Money::class,
-        'subscription_amount'   => Money::class,
-    ];
-
-    /**
-     * Dynamic attributes that are appended to object.
-     *
-     * @var array
-     */
-    protected $appends = [
-        'icon_url',
-        'current_bundle_filename',
-        'current_bundle_id',
-        'current_bundle_public_id',
-        'current_bundle_version',
-        'next_bundle_filename',
-        'next_bundle_id',
-        'next_bundle_public_id',
-        'category_name',
-        'publisher_name',
-        'is_purchased',
-        'is_installed',
-        'is_author',
-    ];
-
-    /**
-     * Relations that should be loaded with model.
-     *
-     * @var array
-     */
-    protected $with = [
-        'category',
-    ];
-
-    /**
-     * Relations that should not be loaded.
-     *
-     * @var array
-     */
-    protected $without = [
-        'current_bundle',
-        'next_bundle',
-    ];
-
-    /**
-     * Searchable columns.
-     *
-     * @var array
-     */
-    protected $searchableColumns = ['name'];
-
-    /**
-     * The "booting" method of the model.
-     *
-     * This method is called on the model boot and sets up
-     * event listeners, such as creating a unique bundle ID
-     * when a new model instance is being created.
-     */
-    protected static function boot()
-    {
-        parent::boot();
-
-        static::saving(function ($model) {
-            if ($model->isDirty('price')) {
-                $model->updateOrCreateStripePrice();
-            }
-        });
-    }
-
-    /**
-     * Get the options for generating the slug.
-     */
-    public function getSlugOptions(): SlugOptions
-    {
-        return SlugOptions::create()
-            ->generateSlugsFrom('name')
-            ->saveSlugsTo('slug');
-    }
-
-    /**
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
-     */
-    public function company()
-    {
-        return $this->belongsTo(Company::class, 'company_uuid', 'uuid');
-    }
-
-    /**
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
-     */
-    public function createdBy()
-    {
-        return $this->belongsTo(User::class, 'created_by_uuid', 'uuid');
-    }
-
-    /**
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
-     */
-    public function registryUser()
-    {
-        return $this->belongsTo(RegistryUser::class, 'registry_user_uuid', 'uuid');
-    }
-
-    /**
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
-     */
-    public function currentBundle()
-    {
-        return $this->belongsTo(RegistryExtensionBundle::class, 'current_bundle_uuid', 'uuid');
-    }
-
-    /**
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
-     */
-    public function nextBundle()
-    {
-        return $this->belongsTo(RegistryExtensionBundle::class, 'next_bundle_uuid', 'uuid');
-    }
-
-    /**
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
-     */
-    public function icon()
-    {
-        return $this->belongsTo(File::class, 'icon_uuid', 'uuid');
-    }
-
-    /**
-     * Registry extension categories are core `Category` rows that live in the live
-     * database. `Category` itself follows `fleetbase.connection.db`, which is
-     * switched to `sandbox` in test mode, so pin the related instance to the
-     * extension's own (live) connection.
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
-     */
-    public function category()
-    {
-        $instance = (new Category())->setConnection($this->getConnectionName());
-
-        return $this->newBelongsTo($instance->newQuery(), $this, 'category_uuid', 'uuid', 'category');
-    }
-
-    /**
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany
-     */
-    public function screenshots()
-    {
-        return $this->hasMany(File::class, 'subject_uuid', 'uuid')->where('type', 'extension_screenshot');
-    }
-
-    /**
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany
-     */
-    public function bundles()
-    {
-        return $this->hasMany(RegistryExtensionBundle::class, 'extension_uuid', 'uuid');
-    }
-
-    /**
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany
-     */
-    public function bundleFiles()
-    {
-        return $this->hasMany(File::class, 'subject_uuid', 'uuid')->where('type', 'extension_bundle');
-    }
-
-    /**
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany
-     */
-    public function installs()
-    {
-        return $this->hasMany(RegistryExtensionInstall::class, 'extension_uuid', 'uuid');
-    }
-
-    /**
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany
-     */
-    public function purchases()
-    {
-        return $this->hasMany(RegistryExtensionPurchase::class, 'extension_uuid', 'uuid');
-    }
-
-    /**
-     * Check if current session has purchased extension.
-     */
-    public function getIsPurchasedAttribute(): bool
-    {
-        return $this->purchases->contains(function ($purchase) {
-            return $purchase->company_uuid === session('company');
-        });
-    }
-
-    /**
-     * Check if current session has installed extension.
-     */
-    public function getIsInstalledAttribute(): bool
-    {
-        return $this->installs->contains(function ($purchase) {
-            return $purchase->company_uuid === session('company');
-        });
-    }
-
-    /**
-     * Get avatar URL attribute.
-     */
-    public function getIconUrlAttribute(): ?string
-    {
-        if ($this->icon instanceof File) {
-            return $this->icon->url;
-        }
-
-        return data_get($this, 'icon.url', 'https://flb-assets.s3.ap-southeast-1.amazonaws.com/static/default-extension-icon.svg');
-    }
-
-    /**
-     * Get the current bundle public ID.
-     */
-    public function getCurrentBundlePublicIdAttribute(): ?string
-    {
-        if ($this->currentBundle instanceof RegistryExtensionBundle) {
-            return $this->currentBundle->public_id;
-        }
-
-        return data_get($this, 'currentBundle.public_id');
-    }
-
-    /**
-     * Get the current bundle ID.
-     */
-    public function getCurrentBundleIdAttribute(): ?string
-    {
-        if ($this->currentBundle instanceof RegistryExtensionBundle) {
-            return $this->currentBundle->bundle_id;
-        }
-
-        return data_get($this, 'currentBundle.bundle_id');
-    }
-
-    /**
-     * Get the current bundle original filename.
-     */
-    public function getCurrentBundleFilenameAttribute(): ?string
-    {
-        if ($this->currentBundle instanceof RegistryExtensionBundle) {
-            return $this->currentBundle->bundle_filename;
-        }
-
-        return data_get($this, 'currentBundle.bundle_filename');
-    }
-
-    /**
-     * Get the current bundle version.
-     */
-    public function getCurrentBundleVersionAttribute(): ?string
-    {
-        if ($this->currentBundle instanceof RegistryExtensionBundle) {
-            return $this->currentBundle->version;
-        }
-
-        return data_get($this, 'currentBundle.version');
-    }
-
-    /**
-     * Get the next bundle public ID.
-     */
-    public function getNextBundlePublicIdAttribute(): ?string
-    {
-        if ($this->nextBundle instanceof RegistryExtensionBundle) {
-            return $this->nextBundle->public_id;
-        }
-
-        return data_get($this, 'nextBundle.public_id');
-    }
-
-    /**
-     * Get the next bundle ID.
-     */
-    public function getNextBundleIdAttribute(): ?string
-    {
-        if ($this->nextBundle instanceof RegistryExtensionBundle) {
-            return $this->nextBundle->bundle_id;
-        }
-
-        return data_get($this, 'nextBundle.bundle_id');
-    }
-
-    /**
-     * Get the current bundle original filename.
-     */
-    public function getNextBundleFilenameAttribute(): ?string
-    {
-        if ($this->nextBundle instanceof RegistryExtensionBundle) {
-            return $this->nextBundle->bundle_filename;
-        }
-
-        return data_get($this, 'nextBundle.bundle_filename');
-    }
-
-    /**
-     * Get the extension's category.
-     */
-    public function getCategoryNameAttribute(): ?string
-    {
-        if ($this->category instanceof Category) {
-            return $this->category->name;
-        }
-
-        return data_get($this, 'category.name');
-    }
-
-    /**
-     * Get the extension's category.
-     */
-    public function getPublisherNameAttribute(): ?string
-    {
-        if ($this->company instanceof Company) {
-            return $this->company->name;
-        }
-
-        return data_get($this, 'company.name');
-    }
-
-    /**
-     * Determines if the current company session is the author of the extension.
-     */
-    public function getIsAuthorAttribute(): bool
-    {
-        return $this->company_uuid === session('company');
-    }
-
-    /**
-     * Finds a RegistryExtension by package name in the associated currentBundle.
-     *
-     * This method searches for a RegistryExtension where the associated currentBundle's
-     * 'meta' JSON column contains the specified package name either in the 'api' field
-     * or the 'engine' field. It returns the first matching RegistryExtension or null
-     * if no matches are found. The method leverages Eloquent's relationship querying
-     * capabilities to efficiently filter the results.
-     *
-     * @param string $packageName the name of the package to search for in the 'api' or 'engine' fields
-     *
-     * @return RegistryExtension|null the first RegistryExtension that matches the search criteria, or null if no match is found
-     */
-    public static function findByPackageName(string $packageName): ?RegistryExtension
-    {
-        return static::whereHas('currentBundle', function ($query) use ($packageName) {
-            $query->where('meta->package.json->name', $packageName)->orWhere('meta->composer.json->name', $packageName);
-        })->first();
-    }
-
-    /**
-     * Lookup a registry extension based on the given package name.
-     *
-     * This method attempts to find a `RegistryExtension` that matches the provided package name. It checks multiple fields including
-     * `uuid`, `public_id`, and `slug`. If the package name starts with 'fleetbase/', it also attempts to match the slug extracted from the package name.
-     *
-     * Additionally, the method checks for the existence of a related `currentBundle` where the `package.json` or `composer.json` metadata
-     * matches the provided package name.
-     *
-     * @param string $packageName the name, UUID, public ID, or slug of the package to lookup
-     *
-     * @return RegistryExtension|null returns the found `RegistryExtension` instance or `null` if no match is found
-     */
-    public static function lookup(string $packageName): ?RegistryExtension
-    {
-        return static::where('status', 'published')->where(function ($query) use ($packageName) {
-            $query->where('uuid', $packageName)
-                  ->orWhere('public_id', $packageName)
-                  ->orWhere('slug', $packageName);
-
-            // Check for fleetbase/ prefix and match slug
-            if (Str::startsWith($packageName, 'fleetbase/')) {
-                $packageSlug = explode('/', $packageName)[1] ?? null;
-                if ($packageSlug) {
-                    $query->orWhere('slug', $packageSlug);
-                }
-            }
-        })->orWhereHas('currentBundle', function ($query) use ($packageName) {
-            $query->where('meta->package.json->name', $packageName)
-                  ->orWhere('meta->composer.json->name', $packageName);
-        })->with(['currentBundle'])->first();
-    }
-
-    /**
-     * Determines if the current extension instance is ready for submission.
-     *
-     * This method is an instance method that internally calls the static method
-     * `isExtensionReadyForSubmission` to perform the validation on the current instance.
-     * It checks various fields of the extension for certain criteria such as minimum
-     * string lengths, presence of necessary fields, and URL validation.
-     *
-     * @return bool returns true if the extension instance passes all validations, false otherwise
-     */
-    public function isReadyForSubmission(): bool
-    {
-        return static::isExtensionReadyForSubmission($this);
-    }
-
-    /**
-     * Validates if an extension, identified by its ID or instance, is ready for submission.
-     *
-     * This method accepts either an extension ID or an instance of `RegistryExtension`. It then
-     * performs various validations on fields like 'name', 'description', 'tags', etc., to
-     * determine if the extension meets the criteria for submission. URL fields are validated
-     * to ensure they contain proper URLs. The method is designed to be flexible, handling
-     * validation for both an extension ID and an extension object.
-     *
-     * @param int|RegistryExtension $extensionId the ID of the extension or an instance of `RegistryExtension`
-     *
-     * @return bool returns true if the extension passes all validations, false otherwise
-     *
-     * @throws \Illuminate\Database\Eloquent\ModelNotFoundException if the extension with the given ID is not found
-     */
-    public static function isExtensionReadyForSubmission($extensionId): bool
-    {
-        if ($extensionId instanceof RegistryExtension) {
-            $extension = $extensionId;
-        } else {
-            $extension = self::find($extensionId);
-        }
-        if (!$extension) {
-            return false;
-        }
-
-        $validations = [
-            'name' => function ($value) {
-                return is_string($value) && strlen($value) > 3;
-            },
-            'description' => function ($value) {
-                return is_string($value) && strlen($value) > 12;
-            },
-            'tags' => function ($value) {
-                return !empty($value);
-            },
-            'promotional_text' => function ($value) {
-                return !empty($value);
-            },
-            'subtitle' => function ($value) {
-                return !empty($value);
-            },
-            'copyright' => function ($value) {
-                return !empty($value);
-            },
-            'website_url' => function ($value) {
-                return filter_var($value, FILTER_VALIDATE_URL) !== false;
-            },
-            'support_url' => function ($value) {
-                return filter_var($value, FILTER_VALIDATE_URL) !== false;
-            },
-            'privacy_policy_url' => function ($value) {
-                return filter_var($value, FILTER_VALIDATE_URL) !== false;
-            },
-            'icon_uuid' => function ($value) {
-                return !empty($value);
-            },
-            'category_uuid' => function ($value) {
-                return !empty($value);
-            },
-            'next_bundle_uuid' => function ($value) {
-                return !empty($value);
-            },
-        ];
-
-        // Should have a new bundle for submission
-        $isNewBundle = $extension->next_bundle_uuid !== $extension->current_bundle_uuid;
-        if (!$isNewBundle) {
-            return false;
-        }
-
-        // Check validations
-        foreach ($validations as $field => $validationFunction) {
-            if (isset($extension->$field)) {
-                $value = $extension->$field;
-                if (!$validationFunction($value)) {
-                    return false;
-                }
-            } else {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Retrieves or creates a Stripe product associated with this model instance.
-     *
-     * This method attempts to fetch a Stripe product based on an existing 'stripe_product_id'.
-     * If no product is found or if 'stripe_product_id' is not set, it creates a new Stripe product
-     * with the current model's name and description and updates the model's 'stripe_product_id'.
-     *
-     * @return \Stripe\Product|null returns the Stripe Product object if successful, or null if the Stripe client is not available
-     */
-    public function getStripeProduct(): ?\Stripe\Product
-    {
-        $stripe = Utils::getStripeClient();
-        if ($stripe) {
-            $product = $this->stripe_product_id ? $stripe->products->retrieve($this->stripe_product_id, []) : null;
-            if (!$product) {
-                $product = $stripe->products->create(['name' => $this->name, 'description' => $this->description, 'metadata' => ['fleetbase_id' => $this->public_id]]);
-            }
-
-            // Update stripe product id
-            if ($this->exists) {
-                $this->update(['stripe_product_id' => $product->id]);
-            } else {
-                $this->setAttribute('stripe_product_id', $product->id);
-            }
-
-            return $product;
-        }
-
-        return null;
-    }
-
-    /**
-     * Retrieves the active Stripe price for the associated product.
-     *
-     * This method first ensures the product exists in Stripe by calling getStripeProduct().
-     * It then fetches the current active price for the product. If no active prices are found,
-     * it returns null.
-     *
-     * @return \Stripe\Price|null returns the Stripe Price object if available, or null otherwise
-     */
-    public function getStripePrice(): ?\Stripe\Price
-    {
-        if (!$this->stripe_product_id) {
-            $this->getStripeProduct();
-        }
-
-        $stripe  = Utils::getStripeClient();
-        $price   = null;
-        if ($stripe) {
-            $prices = $stripe->prices->all(['product' => $this->stripe_product_id, 'limit' => 1, 'active' => true]);
-            $price  = is_array($prices->data) && count($prices->data) ? $prices->data[0] : null;
-        }
-
-        return $price;
-    }
-
-    /**
-     * Updates the existing active Stripe price to inactive and creates a new Stripe price.
-     *
-     * This method first retrieves the current active price and deactivates it if it exists.
-     * It then creates a new price with the current model's price and currency, associated with
-     * the Stripe product.
-     *
-     * @return \Stripe\Price|null returns the newly created Stripe Price object
-     */
-    public function updateOrCreateStripePrice(): ?\Stripe\Price
-    {
-        $stripe = Utils::getStripeClient();
-        $price  = $this->getStripePrice();
-        if ($price instanceof \Stripe\Price) {
-            // update stripe price
-            $stripe->prices->update($price->id, ['active' => false]);
-        }
-
-        // create new stripe price
-        $price = $stripe->prices->create(['unit_amount' => $this->price, 'currency' => $this->currency, 'product' => $this->stripe_product_id]);
-
-        return $price;
-    }
-
-    /**
-     * Creates a Stripe Checkout session for purchasing this model's associated product.
-     *
-     * This method ensures that the model has a valid company (extension author) and an active price.
-     * It calculates the facilitator fee based on the total amount and creates a checkout session with
-     * the necessary Stripe configurations, including the return URI with query parameters.
-     *
-     * @param string $returnUri the URI to which the user should be returned after the checkout process
-     *
-     * @return \Stripe\Checkout\Session returns the Stripe Checkout Session object
-     *
-     * @throws \Exception throws an exception if the model does not have an associated company or price
-     */
-    public function createStripeCheckoutSession(string $returnUri): \Stripe\Checkout\Session
-    {
-        // Get extension author
-        $extensionAuthor = $this->company;
-        if (!$extensionAuthor) {
-            throw new \Exception('The extension you attempted to purchase is not available for purchase at this time.');
-        }
-
-        // Get the extension price from stripe
-        $price = $this->getStripePrice();
-        if (!$price) {
-            throw new \Exception('The extension you attempted to purchase is not available for purchase at this time.');
-        }
-
-        // Calculate the fee fleetbase takes for faciliation of extension
-        $totalAmount    = $price->unit_amount;
-        $facilitatorFee = Utils::calculatePercentage(config('registry-bridge.facilitator_fee', 10), $totalAmount);
-
-        // Get the stripe client to create the checkout session
-        $stripe          = Utils::getStripeClient();
-
-        // Create the stripe checkout session
-        $checkoutSession = $stripe->checkout->sessions->create([
-            'ui_mode'    => 'embedded',
-            'line_items' => [
-                [
-                    'price'    => $price->id,
-                    'quantity' => 1,
-                ],
-            ],
-            'mode'                => 'payment',
-            'return_url'          => Utils::consoleUrl($returnUri) . '?extension_id=' . $this->uuid . '&checkout_session_id={CHECKOUT_SESSION_ID}',
-            'payment_intent_data' => [
-                'application_fee_amount' => $facilitatorFee,
-                'transfer_data'          => [
-                    'destination' => $extensionAuthor->stripe_connect_id,
-                ],
-            ],
-        ]);
-
-        return $checkoutSession;
-    }
-
-    /**
-     * Determine if the registry user has access to the registry extension.
-     *
-     * This method checks if the extension requires payment. If it does not,
-     * access is granted. If payment is required, it checks if the user's company
-     * has made a purchase of the extension.
-     *
-     * @param RegistryUser $registryUser the registry user to check access for
-     *
-     * @return bool true if the user has access, false otherwise
-     */
-    public function hasAccess(RegistryUser $registryUser): bool
-    {
-        if (!$this->payment_required) {
-            return true;
-        }
-
-        return $this->purchases()->where('company_uuid', $registryUser->company_uuid)->exists();
-    }
-
-    /**
-     * Determine if the registry user does not have access to the registry extension.
-     *
-     * This method checks if the extension requires payment. If it does not,
-     * access is always denied. If payment is required, it checks if the user's
-     * company has not made a purchase of the extension.
-     *
-     * @param RegistryUser $registryUser the registry user to check access for
-     *
-     * @return bool true if the user does not have access, false otherwise
-     */
-    public function doesntHaveAccess(RegistryUser $registryUser): bool
-    {
-        if (!$this->payment_required) {
-            return false;
-        }
-
-        return $this->purchases()->where('company_uuid', $registryUser->company_uuid)->doesntExist();
-    }
-}
diff --git a/server/src/Models/RegistryExtensionBundle.php b/server/src/Models/RegistryExtensionBundle.php
deleted file mode 100644
index 30ce4ac..0000000
--- a/server/src/Models/RegistryExtensionBundle.php
+++ /dev/null
@@ -1,977 +0,0 @@
-<?php
-
-namespace Fleetbase\RegistryBridge\Models;
-
-use Fleetbase\Casts\Json;
-use Fleetbase\Models\Company;
-use Fleetbase\Models\File;
-use Fleetbase\Models\Model;
-use Fleetbase\Models\User;
-use Fleetbase\RegistryBridge\Exceptions\InstallFailedException;
-use Fleetbase\RegistryBridge\Support\Installer\OutputProgress;
-use Fleetbase\RegistryBridge\Support\Utils;
-use Fleetbase\Support\SocketCluster\SocketClusterService;
-use Fleetbase\Traits\HasApiModelBehavior;
-use Fleetbase\Traits\HasMetaAttributes;
-use Fleetbase\Traits\HasPublicId;
-use Fleetbase\Traits\HasUuid;
-use Fleetbase\Traits\Searchable;
-use Illuminate\Database\Eloquent\Relations\BelongsTo;
-use Illuminate\Http\UploadedFile;
-use Illuminate\Support\Facades\Storage;
-use Illuminate\Support\Str;
-use stdClass;
-use Symfony\Component\Process\Process;
-
-class RegistryExtensionBundle extends Model
-{
-    use HasUuid;
-    use HasPublicId;
-    use HasMetaAttributes;
-    use HasApiModelBehavior;
-    use Searchable;
-
-    /**
-     * The database table used by the model.
-     *
-     * @var string
-     */
-    protected $table = 'registry_extension_bundles';
-
-    /**
-     * The database connection to use.
-     *
-     * Registry data belongs to the account and only exists in the live database
-     * (sandbox migrations are disabled for this package), so it must never follow
-     * the sandbox connection switch made by `Auth::setSandboxSession()`.
-     *
-     * @var string
-     */
-    protected $connection = 'mysql';
-
-    /**
-     * The type of public Id to generate.
-     *
-     * @var string
-     */
-    protected $publicIdType = 'bundle';
-
-    /**
-     * The attributes that are mass assignable.
-     */
-    protected $fillable = [
-        'uuid',
-        'company_uuid',
-        'created_by_uuid',
-        'extension_uuid',
-        'bundle_uuid',
-        'bundle_id',
-        'bundle_number',
-        'version',
-        'meta',
-        'status',
-    ];
-
-    /**
-     * The attributes that should be cast to native types.
-     */
-    protected $casts = [
-        'meta'                  => Json::class,
-    ];
-
-    /**
-     * Dynamic attributes that are appended to object.
-     *
-     * @var array
-     */
-    protected $appends = [
-        'bundle_filename',
-    ];
-
-    /**
-     * Relations that should be loaded with model.
-     *
-     * @var array
-     */
-    protected $with = [];
-
-    /**
-     * Relations that should not be loaded.
-     *
-     * @var array
-     */
-    protected $without = ['company', 'createdBy', 'extension'];
-
-    /**
-     * Searchable columns.
-     *
-     * @var array
-     */
-    protected $searchableColumns = ['name'];
-
-    /**
-     * The "booting" method of the model.
-     *
-     * This method is called on the model boot and sets up
-     * event listeners, such as creating a unique bundle ID
-     * when a new model instance is being created.
-     */
-    protected static function boot()
-    {
-        parent::boot();
-
-        static::creating(function ($model) {
-            $model->bundle_id = self::generateUniqueBundleId();
-        });
-    }
-
-    public function company(): BelongsTo
-    {
-        return $this->belongsTo(Company::class, 'company_uuid', 'uuid');
-    }
-
-    public function createdBy(): BelongsTo
-    {
-        return $this->belongsTo(User::class, 'created_by_uuid', 'uuid');
-    }
-
-    public function extension(): BelongsTo
-    {
-        return $this->belongsTo(RegistryExtension::class, 'extension_uuid', 'uuid');
-    }
-
-    public function bundle(): BelongsTo
-    {
-        return $this->belongsTo(File::class, 'bundle_uuid', 'uuid');
-    }
-
-    /**
-     * Get the bundle original filename.
-     */
-    public function getBundleFilenameAttribute(): ?string
-    {
-        if ($this->bundle instanceof File) {
-            return $this->bundle->original_filename;
-        }
-
-        return data_get($this, 'bundle.original_filename');
-    }
-
-    /**
-     * Generates a unique bundle ID.
-     *
-     * This static method constructs a unique bundle identifier (ID) by appending a random string to a fixed prefix.
-     * The prefix used is 'EXTBNDL', and the total length of the generated ID is 14 characters, including the prefix.
-     * The function ensures uniqueness by checking the generated ID against existing IDs in the database and
-     * regenerating if a duplicate is found. The characters used for the random string are upper and lower case
-     * alphabets and numerals. The final bundle ID is returned in upper case.
-     *
-     * @return string a unique, uppercase bundle ID
-     */
-    public static function generateUniqueBundleId(): string
-    {
-        do {
-            $prefix          = 'EXTBNDL';
-            $remainingLength = 14 - strlen($prefix);
-            $characters      = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
-            $result          = '';
-
-            for ($i = 0; $i < $remainingLength; $i++) {
-                $result .= $characters[rand(0, strlen($characters) - 1)];
-            }
-
-            $bundleId = strtoupper($prefix . $result);
-        } while (self::where('bundle_id', $bundleId)->exists());
-
-        return $bundleId;
-    }
-
-    /**
-     * Extracts specified file(s) from a zipped bundle and returns their contents.
-     *
-     * This method downloads a file indicated by the File model, unzips it, and looks for
-     * specified filename(s) within the unzipped contents. The contents of each found file
-     * are returned as a stdClass object, with each property corresponding to a filename.
-     * If 'parse_json' option is true (default), file contents are decoded as JSON.
-     * Temporary files are cleaned up after extraction.
-     *
-     * @param File         $bundle    the File model instance representing the zipped bundle
-     * @param string|array $filenames a single filename or an array of filenames to extract from the bundle
-     * @param array        $options   Additional options, e.g., ['parse_json' => false] to get raw file contents.
-     *
-     * @return \stdClass|null an object containing the contents of each extracted file, or null if files are not found
-     */
-    protected static function extractBundleFile(File $bundle, $filenames = 'extension.json', $options = []): ?\stdClass
-    {
-        $shouldParseJson = data_get($options, 'parse_json', true);
-        $tempDir         = sys_get_temp_dir() . '/' . str_replace(['.', ','], '_', uniqid('fleetbase_archive_', true));
-        mkdir($tempDir);
-
-        // Download the file to a local temporary directory
-        $tempFilePath = $tempDir . '/' . basename($bundle->path);
-        $contents     = Storage::disk($bundle->disk)->get($bundle->path);
-        file_put_contents($tempFilePath, $contents);
-
-        // Extract file paths
-        $extractedFilePaths = static::_extractAndFindFile($tempFilePath, $tempDir, $filenames, $bundle->getExtension());
-        $result             = new \stdClass();
-        foreach ($extractedFilePaths as $filename => $path) {
-            if (file_exists($path)) {
-                $fileContents = file_get_contents($path);
-                if ($shouldParseJson) {
-                    $result->$filename = json_decode($fileContents);
-                } else {
-                    $result->$filename = $fileContents;
-                }
-            }
-        }
-
-        // Cleanup: Delete the temporary directory
-        try {
-            array_map('unlink', glob("$tempDir/*.*"));
-        } catch (\Throwable $e) {
-            // Probably a directory ...
-        }
-        Utils::deleteDirectory($tempDir);
-
-        return $result;
-    }
-
-    /**
-     * Extracts specified files from an uploaded bundle file and optionally parses their contents.
-     *
-     * This method handles the extraction of files from an uploaded archive (ZIP or TAR.GZ) and returns their contents.
-     *
-     * @param UploadedFile $bundle    the uploaded bundle file to extract
-     * @param string|array $filenames The filename or array of filenames to extract from the bundle (default: 'extension.json').
-     * @param array        $options   additional options:
-     *                                - 'parse_json' (bool): Whether to parse the file contents as JSON (default: true)
-     *
-     * @return \stdClass|null an object containing the extracted file contents, or null if extraction fails
-     *
-     * @throws \Exception if extraction of the bundle fails
-     */
-    public static function extractUploadedBundleFile(UploadedFile $bundle, $filenames = 'extension.json', $options = []): ?\stdClass
-    {
-        $shouldParseJson = data_get($options, 'parse_json', true);
-        $tempDir         = sys_get_temp_dir() . '/' . str_replace(['.', ','], '_', uniqid('fleetbase_archive_', true));
-        mkdir($tempDir);
-
-        // Download the file to a local temporary directory
-        $tempFilePath = $bundle->getPathname();
-
-        // Get the archive extension
-        $extension = $bundle->guessExtension();
-        if ($extension === 'gz') {
-            $extension = 'tar.gz';
-        }
-
-        // Extract file paths
-        $extractedFilePaths = static::_extractAndFindFile($tempFilePath, $tempDir, $filenames, $extension);
-        $result             = new \stdClass();
-        foreach ($extractedFilePaths as $filename => $path) {
-            if (file_exists($path)) {
-                $fileContents = file_get_contents($path);
-                if ($shouldParseJson) {
-                    $result->$filename = json_decode($fileContents);
-                } else {
-                    $result->$filename = $fileContents;
-                }
-            }
-        }
-
-        // Cleanup: Delete the temporary directory
-        try {
-            array_map('unlink', glob("$tempDir/*.*"));
-        } catch (\Throwable $e) {
-            // Probably a directory ...
-        }
-        Utils::deleteDirectory($tempDir);
-
-        return $result;
-    }
-
-    /**
-     * Extracts target files from an archive and finds their paths.
-     *
-     * This method handles both ZIP and TAR.GZ archives. It extracts the archive to a temporary directory
-     * and searches for the specified target files within the extracted contents.
-     *
-     * @param string       $archiveFilePath the full path to the archive file to extract
-     * @param string       $tempDir         the temporary directory where the archive will be extracted
-     * @param string|array $targetFiles     the filename or array of filenames to search for within the extracted contents
-     * @param string       $extension       the expected extension of the archive file (default: 'zip')
-     *
-     * @return array an associative array where keys are target filenames and values are their full paths within the extracted contents
-     *
-     * @throws \Exception if the archive format is unsupported or extraction fails
-     */
-    private static function _extractAndFindFile($archiveFilePath, $tempDir, $targetFiles, $extension = 'zip'): array
-    {
-        $paths = [];
-
-        // Ensure $tempDir exists
-        if (!is_dir($tempDir)) {
-            mkdir($tempDir, 0777, true);
-        }
-
-        // Get the base name of the archive file with extension
-        $archiveFileName = basename($archiveFilePath);
-
-        // Determine the extension of the archive file
-        $archiveExtension = pathinfo($archiveFileName, PATHINFO_EXTENSION);
-        if (empty($archiveExtension)) {
-            // Try to determine the extension from the MIME type
-            $finfo    = new \finfo(FILEINFO_MIME_TYPE);
-            $mimeType = $finfo->file($archiveFilePath);
-
-            if ($mimeType === 'application/zip') {
-                $archiveExtension = 'zip';
-            } elseif ($mimeType === 'application/gzip' || $mimeType === 'application/x-gzip') {
-                $archiveExtension = 'gz';
-            } else {
-                $archiveExtension = $extension; // Default to 'zip' if not detected
-            }
-        }
-
-        // Create a temporary file in $tempDir with the correct extension
-        $tempArchivePath = $tempDir . '/' . uniqid('archive_', false) . '.' . $archiveExtension;
-
-        // Copy the archive file to the temporary file
-        copy($archiveFilePath, $tempArchivePath);
-
-        $zip = new \ZipArchive();
-
-        if ($zip->open($tempArchivePath) === true) {
-            // If it's a ZIP file, extract it
-            $zip->extractTo($tempDir);
-            $zip->close();
-            // Remove the temp archive file
-            unlink($tempArchivePath);
-        } else {
-            // Attempt to handle as tar.gz or tar using system 'tar' command
-            try {
-                // Determine the appropriate flags for tar extraction
-                $flags = '';
-                if (in_array($archiveExtension, ['gz', 'tgz', 'tar.gz'])) {
-                    // For .tar.gz or .tgz files
-                    $flags = '-xzf';
-                } elseif ($archiveExtension === 'tar') {
-                    // For .tar files
-                    $flags = '-xf';
-                } else {
-                    // Unsupported archive format
-                    unlink($tempArchivePath);
-                    throw new \Exception('Unsupported archive format.');
-                }
-
-                // Build the command safely using escapeshellarg
-                $command = sprintf('tar %s %s -C %s', $flags, escapeshellarg($tempArchivePath), escapeshellarg($tempDir));
-
-                // Execute the command
-                $output    = [];
-                $returnVar = 0;
-                exec($command, $output, $returnVar);
-
-                // Check if the command was successful
-                if ($returnVar !== 0) {
-                    throw new \Exception('Extraction failed with code ' . $returnVar . ': ' . implode("\n", $output));
-                }
-
-                // Clean up temporary archive file
-                unlink($tempArchivePath);
-            } catch (\Exception $e) {
-                // Handle extraction errors
-                // Clean up temporary files
-                if (file_exists($tempArchivePath)) {
-                    unlink($tempArchivePath);
-                }
-                // Throw the exception
-                throw new \Exception('Failed to extract archive: ' . $e->getMessage());
-            }
-        }
-
-        // Now search for the target files in the extracted contents
-        foreach ((array) $targetFiles as $targetFile) {
-            // Direct check in the tempDir
-            $directPath = $tempDir . '/' . $targetFile;
-            if (file_exists($directPath)) {
-                $paths[$targetFile] = $directPath;
-                continue;
-            }
-
-            // Check in the first subdirectory
-            $files = scandir($tempDir);
-            foreach ($files as $file) {
-                $invalidDirectories = ['__MACOSX', '.', '..', 'DS_Store', '.DS_Store', '.idea', '.vscode'];
-                if (!in_array($file, $invalidDirectories) && is_dir($tempDir . '/' . $file)) {
-                    $nestedPath = $tempDir . '/' . $file . '/' . $targetFile;
-                    if (file_exists($nestedPath)) {
-                        $paths[$targetFile] = $nestedPath;
-                        break;
-                    }
-                }
-            }
-        }
-
-        return $paths;
-    }
-
-    /**
-     * Extracts multiple configuration files from the bundle.
-     *
-     * This method leverages the extractBundleFile function to extract an array
-     * of specified configuration files ('extension.json', 'composer.json', 'package.json')
-     * from the bundle. It returns an object containing the contents of each file,
-     * where each property name corresponds to a filename. If a specified file is not found
-     * in the bundle, its corresponding property will be absent in the returned object.
-     * The method is useful for retrieving multiple configuration files in a single operation.
-     *
-     * @return \stdClass|null An object containing the contents of each extracted file.
-     *                        Properties of the object correspond to the filenames.
-     *                        Returns null if the bundle property is not an instance of File.
-     */
-    public static function extractBundleData(File $bundleFile): ?\stdClass
-    {
-        return static::extractBundleFile($bundleFile, ['extension.json', 'composer.json', 'package.json']);
-    }
-
-    /**
-     * Extracts multiple configuration files from the bundle.
-     *
-     * This method leverages the extractBundleFile function to extract an array
-     * of specified configuration files ('extension.json', 'composer.json', 'package.json')
-     * from the bundle. It returns an object containing the contents of each file,
-     * where each property name corresponds to a filename. If a specified file is not found
-     * in the bundle, its corresponding property will be absent in the returned object.
-     * The method is useful for retrieving multiple configuration files in a single operation.
-     *
-     * @return \stdClass|null An object containing the contents of each extracted file.
-     *                        Properties of the object correspond to the filenames.
-     *                        Returns null if the bundle property is not an instance of File.
-     */
-    public function extractExtensionData()
-    {
-        if ($this->bundle instanceof File) {
-            return static::extractBundleData($this->bundle);
-        }
-    }
-
-    /**
-     * Extracts 'extension.json' from the bundle file.
-     *
-     * This method is a specific implementation of extractBundleFile for extracting
-     * 'extension.json'. It checks if the 'bundle' property is an instance of File
-     * and invokes the extraction process.
-     *
-     * @return \stdClass|null The decoded JSON object from 'extension.json', or null if not found.
-     */
-    public function extractExtensionJson(): ?\stdClass
-    {
-        $filename = 'extension.json';
-        if ($this->bundle instanceof File) {
-            $data = static::extractBundleFile($this->bundle);
-
-            return $data[$filename];
-        }
-    }
-
-    /**
-     * Extracts 'composer.json' from the bundle file.
-     *
-     * This method is a specific implementation of extractBundleFile for extracting
-     * 'composer.json'. It checks if the 'bundle' property is an instance of File
-     * and invokes the extraction process.
-     *
-     * @return \stdClass|null The decoded JSON object from 'composer.json', or null if not found.
-     */
-    public function extractComposerJson(): ?\stdClass
-    {
-        $filename = 'composer.json';
-        if ($this->bundle instanceof File) {
-            $data = static::extractBundleFile($this->bundle, $filename);
-
-            return $data[$filename];
-        }
-    }
-
-    /**
-     * Extracts 'package.json' from the bundle file.
-     *
-     * This method is a specific implementation of extractBundleFile for extracting
-     * 'package.json'. It checks if the 'bundle' property is an instance of File
-     * and invokes the extraction process.
-     *
-     * @return \stdClass|null The decoded JSON object from 'package.json', or null if not found.
-     */
-    public function extractPackageJson(): ?\stdClass
-    {
-        $filename = 'package.json';
-        if ($this->bundle instanceof File) {
-            $data = static::extractBundleFile($this->bundle, $filename);
-
-            return $data[$filename];
-        }
-    }
-
-    /**
-     * Installs a specific server package using Composer based on provided metadata.
-     *
-     * This method manages the installation of a server-side package specified in the composer.json metadata.
-     * It executes a Composer command to install the package, monitors the output for progress, and broadcasts
-     * these updates in real-time to a WebSocket channel.
-     *
-     * @throws InstallFailedException if the Composer package installation fails, with a user-friendly message
-     */
-    public function installComposerPackage(): void
-    {
-        if (!is_array($this->meta) || !isset($this->meta['composer.json'])) {
-            return;
-        }
-
-        $composerJson = $this->meta['composer.json'];
-        if (!$composerJson) {
-            return;
-        }
-
-        // Prepare for install
-        $output          = '';
-        $installChannel  = implode('.', ['install', $this->company_uuid, $this->extension_uuid]);
-        $packageName     = data_get($composerJson, 'name');
-        $version         = data_get($composerJson, 'version');
-        $composerCommand = [
-            'composer',
-            'require',
-            $packageName . ($version === 'latest' ? '' : ':' . $version),
-        ];
-
-        // Create process
-        $process = new Process($composerCommand);
-        $process->setWorkingDirectory('/fleetbase/api');
-        $process->setTimeout(3600 * 2);
-
-        // Run process
-        $process->run(function ($type, $buffer) use (&$output, $installChannel) {
-            $output .= $buffer;
-            $lines = explode("\n", $buffer);
-            foreach ($lines as $line) {
-                if (trim($line) === '') {
-                    continue;
-                }
-                $progress = static::composerInstallOutputProgress($line);
-                if ($progress > 0) {
-                    SocketClusterService::publish($installChannel, [
-                        'process'  => 'install',
-                        'step'     => 'server.install',
-                        'progress' => $progress,
-                    ]);
-                }
-            }
-        });
-
-        if (!$process->isSuccessful()) {
-            $friendlyMessage = static::composerOutputFriendly($output);
-            throw new InstallFailedException($friendlyMessage);
-        }
-    }
-
-    /**
-     * Uninstalls a specific server package using Composer based on provided metadata.
-     *
-     * This function handles the uninstallation of a server-side package as defined in the composer.json metadata.
-     * It runs a Composer remove command, processes the output to track uninstallation progress, and publishes
-     * these updates through a WebSocket channel.
-     *
-     * @throws InstallFailedException if the Composer package uninstallation fails, providing a user-friendly message
-     */
-    public function uninstallComposerPackage(): void
-    {
-        if (!is_array($this->meta) || !isset($this->meta['composer.json'])) {
-            return;
-        }
-
-        $composerJson = $this->meta['composer.json'];
-        if (!$composerJson) {
-            return;
-        }
-
-        // Prepare for uninstall
-        $output           = '';
-        $uninstallChannel = implode('.', ['uninstall', $this->company_uuid, $this->extension_uuid]);
-        $packageName      = data_get($composerJson, 'name');
-        $composerCommand  = [
-            'composer',
-            'remove',
-            $packageName,
-        ];
-
-        // Create process
-        $process = new Process($composerCommand);
-        $process->setWorkingDirectory('/fleetbase/api');
-        $process->setTimeout(3600 * 2);
-
-        // Run process
-        $process->run(function ($type, $buffer) use (&$output, $uninstallChannel) {
-            $output .= $buffer;
-            $lines = explode("\n", $buffer);
-            foreach ($lines as $line) {
-                if (trim($line) === '') {
-                    continue;
-                }
-                $progress = static::composerUninstallOutputProgress($line);
-                if ($progress > 0) {
-                    SocketClusterService::publish($uninstallChannel, [
-                        'process'  => 'uninstall',
-                        'step'     => 'server.uninstall',
-                        'progress' => $progress,
-                    ]);
-                }
-            }
-        });
-
-        if (!$process->isSuccessful()) {
-            $friendlyMessage = static::composerOutputFriendly($output);
-            throw new InstallFailedException($friendlyMessage);
-        }
-    }
-
-    /**
-     * Installs a specific engine package defined in the metadata using PNPM.
-     *
-     * This method is responsible for installing an engine package based on the package metadata provided.
-     * It creates and runs a PNPM installation process, monitors its output for progress, and sends real-time
-     * updates via a WebSocket channel.
-     *
-     * @throws \Exception if the engine installation process fails
-     */
-    public function installEnginePackage(): void
-    {
-        if (!is_array($this->meta) || !isset($this->meta['package.json'])) {
-            return;
-        }
-
-        $packageJson = $this->meta['package.json'];
-        if (!$packageJson) {
-            return;
-        }
-
-        // Prepare for install
-        $output          = '';
-        $installChannel  = implode('.', ['install', $this->company_uuid, $this->extension_uuid]);
-        $packageName     = data_get($packageJson, 'name');
-        $version         = data_get($packageJson, 'version');
-        $installCommand  = [
-            'pnpm',
-            'add',
-            $packageName . ($version === 'latest' ? '' : '@' . $version),
-        ];
-
-        // Create process
-        $process = new Process($installCommand);
-        $process->setWorkingDirectory(config('fleetbase.console.path'));
-        $process->setTimeout(3600 * 2);
-
-        // Run process
-        $process->run(function ($type, $buffer) use (&$output, $installChannel) {
-            $output .= $buffer;
-            $lines = explode("\n", $buffer);
-            foreach ($lines as $line) {
-                if (trim($line) === '') {
-                    continue;
-                }
-                $progress = static::pnpmInstallOutputProgress($line);
-                if ($progress > 0) {
-                    SocketClusterService::publish($installChannel, [
-                        'process'  => 'install',
-                        'step'     => 'engine.install',
-                        'progress' => $progress,
-                    ]);
-                }
-            }
-        });
-
-        if (!$process->isSuccessful()) {
-            throw new \Exception('Engine install failed!');
-        }
-    }
-
-    /**
-     * Uninstalls a specific engine package defined in the metadata using PNPM.
-     *
-     * This function initiates the uninstallation of an engine package using PNPM, based on the metadata provided.
-     * It captures and interprets the output of the uninstall command to provide real-time progress updates through
-     * a WebSocket channel.
-     *
-     * @throws \Exception if the engine uninstallation process fails
-     */
-    public function uninstallEnginePackage(): void
-    {
-        if (!is_array($this->meta) || !isset($this->meta['package.json'])) {
-            return;
-        }
-
-        $packageJson = $this->meta['package.json'];
-        if (!$packageJson) {
-            return;
-        }
-
-        // Prepare for uninstall
-        $output           = '';
-        $uninstallChannel = implode('.', ['uninstall', $this->company_uuid, $this->extension_uuid]);
-        $packageName      = data_get($packageJson, 'name');
-        $installCommand   = [
-            'pnpm',
-            'remove',
-            $packageName,
-        ];
-
-        // Create process
-        $process = new Process($installCommand);
-        $process->setWorkingDirectory(config('fleetbase.console.path'));
-        $process->setTimeout(3600 * 2);
-
-        // Run process
-        $process->run(function ($type, $buffer) use (&$output, $uninstallChannel) {
-            $output .= $buffer;
-            $lines = explode("\n", $buffer);
-            foreach ($lines as $line) {
-                if (trim($line) === '') {
-                    continue;
-                }
-                $progress = static::pnpmUninstallOutputProgress($line);
-                if ($progress > 0) {
-                    SocketClusterService::publish($uninstallChannel, [
-                        'process'  => 'uninstall',
-                        'step'     => 'engine.uninstall',
-                        'progress' => $progress,
-                    ]);
-                }
-            }
-        });
-
-        if (!$process->isSuccessful()) {
-            throw new \Exception('Engine uninstall failed!');
-        }
-    }
-
-    /**
-     * Initiates and manages the build process of the Fleetbase console using PNPM.
-     *
-     * This method prepares and executes the build process for the Fleetbase console. It monitors the build
-     * output to provide real-time updates via a WebSocket channel. It captures and interprets the output to
-     * estimate the progress, which is then published to a designated channel for frontend display.
-     *
-     * @throws \Exception if the build process fails
-     */
-    public function buildConsole()
-    {
-        // Prepare to build/rebuild console
-        $output         = '';
-        $buildChannel   = implode('.', ['install', $this->company_uuid, $this->extension_uuid]);
-        $buildCommand   = [
-            'pnpm',
-            'build',
-            '--environment',
-            config('app.env'),
-        ];
-
-        // Create process
-        $process = new Process($buildCommand);
-        $process->setWorkingDirectory(config('fleetbase.console.path'));
-        $process->setTimeout(3600 * 2);
-
-        // Run process
-        $process->run(function ($type, $buffer) use (&$output, $buildChannel) {
-            $output .= $buffer;
-            $lines = explode("\n", $buffer);
-            foreach ($lines as $line) {
-                if (trim($line) === '') {
-                    continue;
-                }
-                $progress = static::pnpmBuildOutputProgress($line);
-                if ($progress > 0) {
-                    SocketClusterService::publish($buildChannel, [
-                        'process'  => 'build',
-                        'step'     => 'console.build',
-                        'progress' => $progress,
-                    ]);
-                }
-            }
-        });
-
-        if (!$process->isSuccessful()) {
-            throw new \Exception('Console build failed!');
-        }
-    }
-
-    /**
-     * Simulates the installation progress of an extension by publishing progress updates.
-     *
-     * This method publishes progress updates to a SocketCluster channel for each step in the installation process.
-     * It can be used to provide real-time feedback to clients about the installation status.
-     */
-    public function runInstallerProgress(): void
-    {
-        $channel   = implode('.', ['install', $this->company_uuid, $this->extension_uuid]);
-        $steps     = ['api.install', 'engine.install', 'console.build'];
-
-        foreach ($steps as $step) {
-            $run = range(1, 100);
-            foreach ($run as $progress) {
-                SocketClusterService::publish($channel, [
-                    'process'  => 'install',
-                    'step'     => $step,
-                    'progress' => $progress,
-                ]);
-
-                // minimal latency
-                usleep(50 * rand(1, 3));
-            }
-        }
-    }
-
-    /**
-     * Simulates the uninstallation progress of an extension by publishing progress updates.
-     *
-     * This method publishes progress updates to a SocketCluster channel for each step in the uninstallation process.
-     * It can be used to provide real-time feedback to clients about the uninstallation status.
-     */
-    public function runUninstallerProgress(): void
-    {
-        $channel   = implode('.', ['uninstall', $this->company_uuid, $this->extension_uuid]);
-        $steps     = ['api.uninstall', 'engine.uninstall', 'console.build'];
-
-        foreach ($steps as $step) {
-            $run = range(1, 100);
-            foreach ($run as $progress) {
-                SocketClusterService::publish($channel, [
-                    'process'  => 'uninstall',
-                    'step'     => $step,
-                    'progress' => $progress,
-                ]);
-
-                // minimal latency
-                usleep(50 * rand(1, 3));
-            }
-        }
-    }
-
-    /**
-     * Parses Composer output to provide a user-friendly message.
-     *
-     * This method checks the Composer output for specific keywords or phrases
-     * and returns a simplified, more understandable message suitable for end-users.
-     *
-     * @param string $output the raw output from Composer
-     *
-     * @return string a user-friendly interpretation of the output
-     */
-    public static function composerOutputFriendly($output): string
-    {
-        return OutputProgress::composerOutputFriendly((string) $output);
-    }
-
-    /**
-     * Estimates the progress of a Composer installation process.
-     *
-     * This method interprets the Composer output to estimate the progress of the installation.
-     * It assigns a progress percentage based on identified keywords or phrases in the output.
-     *
-     * @param string $output the raw output from Composer
-     *
-     * @return int an estimated progress percentage
-     */
-    public static function composerInstallOutputProgress($output): int
-    {
-        return OutputProgress::composerInstallOutputProgress((string) $output);
-    }
-
-    /**
-     * Parses the output of the composer uninstall process to determine progress.
-     *
-     * This function analyzes the output of the `composer remove` command and returns a progress percentage
-     * based on the stage of the process. It helps in providing real-time progress updates during the
-     * uninstallation of a Composer package.
-     *
-     * @param string $output the output from the composer uninstall process
-     *
-     * @return int the progress percentage
-     */
-    public static function composerUninstallOutputProgress($output): int
-    {
-        return OutputProgress::composerUninstallOutputProgress((string) $output);
-    }
-
-    /**
-     * Estimates the progress of a PNPM installation process.
-     *
-     * This method interprets the PNPM output to estimate the progress of the installation based on specific keywords and phrases found in the output. It assigns a progress percentage based on identified phases of the install process, such as resolving dependencies and writing lock files.
-     *
-     * @param string $output the raw output from the PNPM install command
-     *
-     * @return int An estimated progress percentage. This is an integer between 0 and 100 where 0 means just started, and 100 means complete.
-     */
-    public static function pnpmInstallOutputProgress($output): int
-    {
-        return OutputProgress::pnpmInstallOutputProgress((string) $output);
-    }
-
-    /**
-     * Estimates the progress of a PNPM uninstallation process.
-     *
-     * This method analyzes the output from the PNPM uninstall command to estimate the progress of the package removal. It uses specific indicators within the output to assign a progress percentage, such as the stages of resolving dependencies, removing packages, and cleaning up.
-     *
-     * @param string $output the raw output from the PNPM uninstall command
-     *
-     * @return int An estimated progress percentage. This value is an integer between 0 and 100, where 0 indicates the beginning of the uninstall process, and 100 indicates completion.
-     */
-    public static function pnpmUninstallOutputProgress($output): int
-    {
-        return OutputProgress::pnpmUninstallOutputProgress((string) $output);
-    }
-
-    /**
-     * Estimates the progress of a PNPM Ember build process.
-     *
-     * This function interprets the output from the 'pnpm build' command, specifically tailored for an Ember project build,
-     * to estimate the build's progress. The function identifies specific phases of the build process and assigns a
-     * progress percentage based on these phases.
-     *
-     * @param string $output the raw output from the PNPM build command
-     *
-     * @return int An estimated progress percentage. This is an integer between 0 and 100, where 0 means just started,
-     *             and 100 indicates the build is complete.
-     */
-    public static function pnpmBuildOutputProgress($output): int
-    {
-        return OutputProgress::pnpmBuildOutputProgress((string) $output);
-    }
-
-    /**
-     * Calculates the next bundle number for a given extension.
-     *
-     * This method counts the existing bundles associated with the extension and returns the next sequential number.
-     *
-     * @param string|RegistryExtension $extension the UUID of the extension or a RegistryExtension instance
-     *
-     * @return int the next bundle number for the extension
-     */
-    public static function getNextBundleNumber(string|RegistryExtension $extension): int
-    {
-        $numberOfBundles = RegistryExtensionBundle::whereHas('extension', function ($query) use ($extension) {
-            $query->where('uuid', Str::isUuid($extension) ? $extension : $extension->uuid);
-        })->count();
-
-        return ($numberOfBundles ?? 0) + 1;
-    }
-
-    /**
-     * Retrieves the next bundle number for the current extension instance.
-     *
-     * @return int the next bundle number
-     */
-    public function nextBundleNumber()
-    {
-        return static::getNextBundleNumber($this->extension_uuid);
-    }
-}
diff --git a/server/src/Models/RegistryExtensionInstall.php b/server/src/Models/RegistryExtensionInstall.php
deleted file mode 100644
index 3a18996..0000000
--- a/server/src/Models/RegistryExtensionInstall.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-
-namespace Fleetbase\RegistryBridge\Models;
-
-use Fleetbase\Casts\Json;
-use Fleetbase\Models\Company;
-use Fleetbase\Models\Model;
-use Fleetbase\Traits\HasMetaAttributes;
-use Fleetbase\Traits\HasUuid;
-
-class RegistryExtensionInstall extends Model
-{
-    use HasUuid;
-    use HasMetaAttributes;
-
-    /**
-     * The database table used by the model.
-     *
-     * @var string
-     */
-    protected $table = 'registry_extension_installs';
-
-    /**
-     * The database connection to use.
-     *
-     * Registry data belongs to the account and only exists in the live database
-     * (sandbox migrations are disabled for this package), so it must never follow
-     * the sandbox connection switch made by `Auth::setSandboxSession()`.
-     *
-     * @var string
-     */
-    protected $connection = 'mysql';
-
-    /**
-     * The attributes that are mass assignable.
-     */
-    protected $fillable = [
-        'uuid',
-        'company_uuid',
-        'extension_uuid',
-        'meta',
-    ];
-
-    /**
-     * The attributes that should be cast to native types.
-     */
-    protected $casts = [
-        'meta'                  => Json::class,
-    ];
-
-    /**
-     * Dynamic attributes that are appended to object.
-     *
-     * @var array
-     */
-    protected $appends = [];
-
-    /**
-     * Relations that should be loaded with model.
-     *
-     * @var array
-     */
-    protected $with = [];
-
-    /**
-     * Relations that should not be loaded.
-     *
-     * @var array
-     */
-    protected $without = ['company', 'extension'];
-
-    /**
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
-     */
-    public function company()
-    {
-        return $this->belongsTo(Company::class, 'company_uuid', 'uuid');
-    }
-
-    /**
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
-     */
-    public function extension()
-    {
-        return $this->belongsTo(RegistryExtension::class, 'extension_uuid', 'uuid');
-    }
-}
diff --git a/server/src/Models/RegistryExtensionPurchase.php b/server/src/Models/RegistryExtensionPurchase.php
deleted file mode 100644
index 2462f47..0000000
--- a/server/src/Models/RegistryExtensionPurchase.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-
-namespace Fleetbase\RegistryBridge\Models;
-
-use Fleetbase\Casts\Json;
-use Fleetbase\Casts\Money;
-use Fleetbase\Models\Company;
-use Fleetbase\Models\Model;
-use Fleetbase\Traits\HasApiModelBehavior;
-use Fleetbase\Traits\HasMetaAttributes;
-use Fleetbase\Traits\HasUuid;
-
-class RegistryExtensionPurchase extends Model
-{
-    use HasUuid;
-    use HasMetaAttributes;
-    use HasApiModelBehavior;
-
-    /**
-     * The database table used by the model.
-     *
-     * @var string
-     */
-    protected $table = 'registry_extension_purchases';
-
-    /**
-     * The database connection to use.
-     *
-     * Registry data belongs to the account and only exists in the live database
-     * (sandbox migrations are disabled for this package), so it must never follow
-     * the sandbox connection switch made by `Auth::setSandboxSession()`.
-     *
-     * @var string
-     */
-    protected $connection = 'mysql';
-
-    /**
-     * The attributes that are mass assignable.
-     */
-    protected $fillable = [
-        'uuid',
-        'company_uuid',
-        'purchaser_uuid',
-        'purchaser_type',
-        'extension_uuid',
-        'stripe_checkout_session_id',
-        'stripe_payment_intent_id',
-        'is_subcription',
-        'locked_price',
-        'subscription_billing_period',
-        'subscription_model',
-        'meta',
-    ];
-
-    /**
-     * The attributes that should be cast to native types.
-     */
-    protected $casts = [
-        'meta'                  => Json::class,
-        'locked_price'          => Money::class,
-        'is_subcription'        => 'boolean',
-    ];
-
-    /**
-     * Dynamic attributes that are appended to object.
-     *
-     * @var array
-     */
-    protected $appends = [];
-
-    /**
-     * Relations that should be loaded with model.
-     *
-     * @var array
-     */
-    protected $with = [];
-
-    /**
-     * Relations that should not be loaded.
-     *
-     * @var array
-     */
-    protected $without = ['company', 'extension'];
-
-    /**
-     * Get the purchaser (polymorphic relationship).
-     * Can be either a Company or RegistryDeveloperAccount.
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\MorphTo
-     */
-    public function purchaser()
-    {
-        return $this->morphTo('purchaser', 'purchaser_type', 'purchaser_uuid', 'uuid');
-    }
-
-    /**
-     * Legacy relationship for backward compatibility.
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
-     *
-     * @deprecated Use purchaser() instead
-     */
-    public function company()
-    {
-        return $this->belongsTo(Company::class, 'company_uuid', 'uuid');
-    }
-
-    /**
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
-     */
-    public function extension()
-    {
-        return $this->belongsTo(RegistryExtension::class, 'extension_uuid', 'uuid');
-    }
-}
diff --git a/server/src/Models/RegistryServiceInstall.php b/server/src/Models/RegistryServiceInstall.php
index 8b75cd9..569d8a6 100644
--- a/server/src/Models/RegistryServiceInstall.php
+++ b/server/src/Models/RegistryServiceInstall.php
@@ -128,4 +128,26 @@ public function toLocalInstall(): array
             'release_id'       => $this->release_id,
         ];
     }
+
+    /**
+     * Package names and extension ids installed for a company, matched against listings to mark them
+     * installed when the service has not heard about an install.
+     *
+     * @return array<int, string>
+     */
+    public static function packageNames(?string $companyUuid): array
+    {
+        if (!$companyUuid) {
+            return [];
+        }
+
+        $names = [];
+        foreach (static::where('company_uuid', $companyUuid)->get() as $install) {
+            $names[] = $install->npm_package;
+            $names[] = $install->composer_package;
+            $names[] = $install->extension_id;
+        }
+
+        return array_values(array_unique(array_filter($names, fn ($name) => is_string($name) && $name !== '')));
+    }
 }
diff --git a/server/src/Models/RegistryUser.php b/server/src/Models/RegistryUser.php
deleted file mode 100644
index ccd4794..0000000
--- a/server/src/Models/RegistryUser.php
+++ /dev/null
@@ -1,337 +0,0 @@
-<?php
-
-namespace Fleetbase\RegistryBridge\Models;
-
-use Fleetbase\Casts\Json;
-use Fleetbase\Models\Company;
-use Fleetbase\Models\Model;
-use Fleetbase\Models\User;
-use Fleetbase\Traits\Expirable;
-use Fleetbase\Traits\HasMetaAttributes;
-use Fleetbase\Traits\HasPublicId;
-use Fleetbase\Traits\HasUuid;
-
-class RegistryUser extends Model
-{
-    use HasUuid;
-    use HasMetaAttributes;
-    use HasPublicId;
-    use Expirable;
-
-    /**
-     * The database table used by the model.
-     *
-     * @var string
-     */
-    protected $table = 'registry_users';
-
-    /**
-     * The database connection to use.
-     *
-     * Registry data belongs to the account and only exists in the live database
-     * (sandbox migrations are disabled for this package), so it must never follow
-     * the sandbox connection switch made by `Auth::setSandboxSession()`.
-     *
-     * @var string
-     */
-    protected $connection = 'mysql';
-
-    /**
-     * The type of public Id to generate.
-     *
-     * @var string
-     */
-    protected $publicIdType = 'registry_user';
-
-    /**
-     * The attributes that are mass assignable.
-     *
-     * @var array
-     */
-    protected $fillable = [
-        'company_uuid',
-        'user_uuid',
-        'account_type',
-        'developer_account_uuid',
-        'token',
-        'registry_token',
-        'scope',
-        'expires_at',
-        'last_used_at',
-        'name',
-        'metadata',
-        'revoked',
-    ];
-
-    /**
-     * The attributes that should be cast to native types.
-     *
-     * @var array
-     */
-    protected $casts = [
-        'meta'         => Json::class,
-        'last_used_at' => 'datetime',
-        'expires_at'   => 'datetime',
-    ];
-
-    /**
-     * Dynamic attributes that are appended to object.
-     *
-     * @var array
-     */
-    protected $appends = ['is_admin'];
-
-    /**
-     * The attributes excluded from the model's JSON form.
-     *
-     * @var array
-     */
-    protected $hidden = [];
-
-    /**
-     * The "booting" method of the model.
-     *
-     * This method is called when the model is being booted and is used to define
-     * model event hooks. In this model, it is used to automatically generate and
-     * assign a unique token to the `token` field when creating a new RegistryUser
-     * instance. The token is generated only if it hasn't been set already, ensuring
-     * that manually specified tokens are respected.
-     *
-     * @return void
-     */
-    protected static function boot()
-    {
-        parent::boot();
-
-        // Hook into the 'creating' event to set the token for new models
-        static::creating(function ($model) {
-            // Set the token only if it's not already set
-            if (empty($model->token)) {
-                $model->token = self::generateToken();
-            }
-        });
-    }
-
-    /**
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
-     */
-    public function company()
-    {
-        return $this->belongsTo(Company::class);
-    }
-
-    /**
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
-     */
-    public function user()
-    {
-        return $this->belongsTo(User::class);
-    }
-
-    /**
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
-     */
-    public function developerAccount()
-    {
-        return $this->belongsTo(RegistryDeveloperAccount::class, 'developer_account_uuid', 'uuid');
-    }
-
-    /**
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany
-     */
-    public function extensions()
-    {
-        return $this->hasMany(RegistryExtension::class, 'company_uuid', 'company_uuid');
-    }
-
-    /**
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany
-     */
-    public function purchases()
-    {
-        return $this->hasMany(RegistryExtensionPurchase::class, 'company_uuid', 'company_uuid');
-    }
-
-    /**
-     * Get the is_admin attribute.
-     */
-    public function getIsAdminAttribute(): bool
-    {
-        if ($this->account_type === 'developer') {
-            return false;
-        }
-
-        return $this->user && $this->user->is_admin === true;
-    }
-
-    /**
-     * Determine if the user is an admin.
-     *
-     * This method checks if the `is_admin` attribute of the user is set to true.
-     *
-     * @return bool true if the user is an admin, false otherwise
-     */
-    public function isAdmin(): bool
-    {
-        return $this->is_admin === true;
-    }
-
-    /**
-     * Determine if the user is not an admin.
-     *
-     * This method checks if the `is_admin` attribute of the user is set to false.
-     *
-     * @return bool true if the user is not an admin, false otherwise
-     */
-    public function isNotAdmin(): bool
-    {
-        return $this->is_admin === false;
-    }
-
-    /**
-     * Generates a unique token for authenticating with the registry.
-     *
-     * This method creates a token prefixed with 'flb_' and ensures its uniqueness
-     * within the `registry_users` table. The token is generated using secure random
-     * bytes, converted to a hexadecimal string.
-     *
-     * @param int the length of the unique token string
-     *
-     * @return string the unique, generated token
-     */
-    public static function generateToken(int $length = 18): string
-    {
-        do {
-            // Generate a random string and prepend with 'flb_'
-            $token = 'flb_' . bin2hex(random_bytes($length));
-
-            // Check if the token is unique in the database
-            $tokenExists = self::where('token', $token)->exists();
-        } while ($tokenExists);
-
-        return $token;
-    }
-
-    /**
-     * Find a registry user by their username.
-     *
-     * This method searches for a registry user by email or username,
-     * supporting both cloud and developer account types.
-     *
-     * @param string $username the username to search for
-     *
-     * @return RegistryUser|null the found registry user, or null if no user is found
-     */
-    public static function findFromUsername(string $username): ?RegistryUser
-    {
-        // First try to find a cloud user
-        $cloudUser = static::select('registry_users.*')
-            ->join('users', function ($join) use ($username) {
-                $join->on('users.uuid', '=', 'registry_users.user_uuid')
-                     ->on('users.company_uuid', '=', 'registry_users.company_uuid')
-                     ->where(function ($query) use ($username) {
-                         $query->where('users.email', $username)
-                               ->orWhere('users.username', $username);
-                     });
-            })
-            ->where('registry_users.account_type', 'cloud')
-            ->first();
-
-        if ($cloudUser) {
-            return $cloudUser;
-        }
-
-        // If not found, try to find a developer account
-        return static::select('registry_users.*')
-            ->join('registry_developer_accounts', 'registry_developer_accounts.uuid', '=', 'registry_users.developer_account_uuid')
-            ->where('registry_users.account_type', 'developer')
-            ->where(function ($query) use ($username) {
-                $query->where('registry_developer_accounts.email', $username)
-                      ->orWhere('registry_developer_accounts.username', $username);
-            })
-            ->first();
-    }
-
-    public static function findFromToken(string $token): ?RegistryUser
-    {
-        return static::where('registry_token', $token)->orWhere('token', $token)->first();
-    }
-
-    /**
-     * Determine if the registry user can access a specific package.
-     *
-     * This method checks if the package name exists in the list of purchased
-     * extensions for the user. It verifies if the package name matches either
-     * the `package.json` or `composer.json` name in the metadata of the current bundle
-     * of any purchased extension.
-     *
-     * @param string $packageName the name of the package to check access for
-     *
-     * @return bool true if the user can access the package, false otherwise
-     */
-    public function canAccessPackage(string $packageName): bool
-    {
-        return $this->purchases()->whereHas('extension', function ($query) use ($packageName) {
-            $query->whereHas('currentBundle', function ($query) use ($packageName) {
-                $query->where('meta->package.json->name', $packageName)->orWhere('meta->composer.json->name', $packageName);
-            });
-        })->exists();
-    }
-
-    /**
-     * Retrieves the user's access groups.
-     *
-     * This method returns an array of groups that the user belongs to, including
-     * the default groups (`$all` and `$authenticated`) and the names of the purchased
-     * extension groups. The purchased extension groups are obtained by calling the
-     * `getPurchasedExtensionGroups` method.
-     *
-     * @return array an array of the user's access groups, including default and purchased extension groups
-     */
-    public function groups(): array
-    {
-        return [$this->public_id];
-    }
-
-    /**
-     * Check if this is a developer account.
-     */
-    public function isDeveloperAccount(): bool
-    {
-        return $this->account_type === 'developer';
-    }
-
-    /**
-     * Check if this is a cloud account.
-     */
-    public function isCloudAccount(): bool
-    {
-        return $this->account_type === 'cloud';
-    }
-
-    /**
-     * Get permissions for this registry user.
-     */
-    public function getPermissions(): array
-    {
-        if ($this->isDeveloperAccount()) {
-            return [
-                'can_install_free_extensions' => true,
-                'can_install_paid_extensions' => false,
-                'can_publish_extensions'      => true,
-                'can_purchase_extensions'     => false,
-                'can_access_console'          => false,
-                'can_manage_company'          => false,
-            ];
-        }
-
-        return [
-            'can_install_free_extensions' => true,
-            'can_install_paid_extensions' => true,
-            'can_publish_extensions'      => true,
-            'can_purchase_extensions'     => true,
-            'can_access_console'          => true,
-            'can_manage_company'          => true,
-        ];
-    }
-}
diff --git a/server/src/Providers/RegistryBridgeServiceProvider.php b/server/src/Providers/RegistryBridgeServiceProvider.php
index d91c014..7241620 100644
--- a/server/src/Providers/RegistryBridgeServiceProvider.php
+++ b/server/src/Providers/RegistryBridgeServiceProvider.php
@@ -13,13 +13,10 @@
 use Fleetbase\RegistryBridge\Support\Installer\Contracts\ProcessRunner;
 use Fleetbase\RegistryBridge\Support\Installer\Contracts\ProgressPublisher;
 use Fleetbase\RegistryBridge\Support\Installer\Contracts\ReleaseSource;
-use Fleetbase\RegistryBridge\Support\Installer\EloquentInstallRecorder;
-use Fleetbase\RegistryBridge\Support\Installer\ExtensionRef;
 use Fleetbase\RegistryBridge\Support\Installer\InstallerConfig;
 use Fleetbase\RegistryBridge\Support\Installer\InstallerJobStore;
 use Fleetbase\RegistryBridge\Support\Installer\InstallerQueue;
 use Fleetbase\RegistryBridge\Support\Installer\InstallerService;
-use Fleetbase\RegistryBridge\Support\Installer\LocalBundleReleaseSource;
 use Fleetbase\RegistryBridge\Support\Installer\NodeEngineCompat;
 use Fleetbase\RegistryBridge\Support\Installer\PhpEngineCompat;
 use Fleetbase\RegistryBridge\Support\Installer\RuntimeEngineManifest;
@@ -28,8 +25,6 @@
 use Fleetbase\RegistryBridge\Support\Installer\ServicePackageCredentials;
 use Fleetbase\RegistryBridge\Support\Installer\ServiceReleaseSource;
 use Fleetbase\RegistryBridge\Support\Installer\SocketClusterPublisher;
-use Fleetbase\RegistryBridge\Support\Installer\SourceRoutingInstallRecorder;
-use Fleetbase\RegistryBridge\Support\Installer\SourceRoutingReleaseSource;
 use Fleetbase\RegistryBridge\Support\Installer\SymfonyProcessRunner;
 use Fleetbase\RegistryBridge\Support\PackageAuth;
 use Fleetbase\RegistryBridge\Support\RegistryClient;
@@ -82,7 +77,6 @@ class RegistryBridgeServiceProvider extends CoreServiceProvider
     public $middleware = [
         'fleetbase.registry' => [
             \Illuminate\Session\Middleware\StartSession::class,
-            \Fleetbase\Http\Middleware\AuthenticateOnceWithBasicAuth::class,
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
         ],
     ];
@@ -128,27 +122,19 @@ protected function registerInstaller(): void
         $this->app->bind(ProcessRunner::class, SymfonyProcessRunner::class);
         $this->app->bind(ProgressPublisher::class, SocketClusterPublisher::class);
 
-        // Extensions come from the Registry Service when one is configured, else (and for ids it does not know) from the local registry tables
+        // Extensions come from the Registry Service
         $this->app->bind(ReleaseSource::class, function () {
             $config = RegistryConfig::current();
 
-            return new SourceRoutingReleaseSource([
-                ExtensionRef::REGISTRY_SERVICE => new ServiceReleaseSource(
-                    RegistryClient::fromConfig($config),
-                    $config,
-                    fn (string $extension) => RegistryServiceInstall::where('extension_id', $extension)->first()?->toListing(),
-                ),
-                ExtensionRef::LOCAL => new LocalBundleReleaseSource(),
-            ]);
+            return new ServiceReleaseSource(
+                RegistryClient::fromConfig($config),
+                $config,
+                fn (string $extension) => RegistryServiceInstall::where('extension_id', $extension)->first()?->toListing(),
+            );
         });
-        $this->app->bind(InstallRecorder::class, function () {
-            $local = new EloquentInstallRecorder();
 
-            return new SourceRoutingInstallRecorder([
-                ExtensionRef::LOCAL            => $local,
-                ExtensionRef::REGISTRY_SERVICE => new ServiceInstallRecorder($local, RegistryConfig::current()->serviceUrl()),
-            ]);
-        });
+        $this->app->bind(InstallRecorder::class, fn () => new ServiceInstallRecorder(RegistryConfig::current()->serviceUrl()));
+
         $this->app->bind(InstallReporter::class, function () {
             $config = RegistryConfig::current();
 
@@ -245,7 +231,6 @@ public function boot()
     {
         $this->registerCommands();
         $this->registerMiddleware();
-        $this->registerExpansionsFrom(__DIR__ . '/../Expansions');
         $this->loadRoutesFrom(__DIR__ . '/../routes.php');
         $this->loadMigrationsFrom(__DIR__ . '/../../migrations');
         $this->mergeConfigFrom(__DIR__ . '/../../config/registry-bridge.php', 'registry-bridge');
@@ -256,8 +241,8 @@ public function boot()
     /**
      * Merge configuration settings from the database into the application configuration.
      *
-     * The registry settings (legacy host and token, Registry Service URL, API version, the encrypted instance
-     * token and the registered instance) override the config file and environment; see `RegistrySettings`.
+     * The registry settings (Registry Service URL, the encrypted instance token and the registered instance)
+     * override the config file and environment; see `RegistrySettings`.
      * Without a database connection (installs, migrations) the config is left as it is.
      *
      * Long-lived workers read the settings again for each Octane request and each queued job, on first use
diff --git a/server/src/Support/Bridge.php b/server/src/Support/Bridge.php
deleted file mode 100644
index e906b85..0000000
--- a/server/src/Support/Bridge.php
+++ /dev/null
@@ -1,176 +0,0 @@
-<?php
-
-namespace Fleetbase\RegistryBridge\Support;
-
-use Fleetbase\Models\User;
-use Fleetbase\RegistryBridge\Models\RegistryUser;
-use Fleetbase\Support\Auth;
-use Illuminate\Support\Facades\Http;
-use Illuminate\Support\Facades\Storage;
-use Illuminate\Support\Str;
-use Symfony\Component\Process\Exception\ProcessFailedException;
-use Symfony\Component\Process\Process;
-
-class Bridge
-{
-    /**
-     * Creates a complete URL by concatenating the base URL from the configuration with the provided URI.
-     *
-     * This method ensures that the base URL from the configuration has a trailing slash before
-     * concatenating it with the provided URI. It handles URL formation for making HTTP requests.
-     *
-     * @param string $uri the specific URI to append to the base URL
-     *
-     * @return string the complete URL formed by concatenating the base URL and the provided URI
-     */
-    private static function createUrl(string $uri = ''): string
-    {
-        $url = config('registry-bridge.registry.host');
-
-        return rtrim($url, '/') . '/' . $uri;
-    }
-
-    /**
-     * Sends a GET request to the specified URI.
-     *
-     * @param string $uri        URI to send the GET request to
-     * @param array  $parameters parameters to include in the request
-     * @param array  $options    additional options for the HTTP client
-     *
-     * @return \Illuminate\Http\Client\Response
-     */
-    public static function get($uri, $parameters = [], $options = [])
-    {
-        return Http::withOptions($options)->get(static::createUrl($uri), $parameters);
-    }
-
-    /**
-     * Sends a POST request to the specified URI.
-     *
-     * @param string $uri        URI to send the GET request to
-     * @param array  $parameters parameters to include in the request
-     * @param array  $options    additional options for the HTTP client
-     *
-     * @return \Illuminate\Http\Client\Response
-     */
-    public static function post($uri, $parameters = [], $options = [])
-    {
-        return Http::withOptions($options)->post(static::createUrl($uri), $parameters);
-    }
-
-    /**
-     * Logs in to the npm registry using the provided user and retrieves the authentication token.
-     *
-     * This method uses the npm-cli-login tool to authenticate with the npm registry using the
-     * provided user's credentials, retrieves the authentication token from the .npmrc file,
-     * and associates it with the currently authenticated user in the application. The registry
-     * token is stored in the database for the user's current session.
-     *
-     * @param User   $user     the fleetbase user model containing the username and email
-     * @param string $password the npm password for the user
-     *
-     * @return RegistryUser the RegistryUser model containing the registry token and associated data
-     *
-     * @throws \Exception If there is no active session, the .npmrc file is not found, the auth token is not found, or the npm login fails.
-     */
-    public static function loginWithUser(User $user, string $password): RegistryUser
-    {
-        return static::login($user->username, $password, $user->email);
-    }
-
-    /**
-     * Logs in to the fleetbase registry and retrieves the authentication token.
-     *
-     * This method uses the npm-cli-login tool to authenticate with the fleetbase registry,
-     * retrieves the authentication token from the .npmrc file, and associates it with
-     * the currently authenticated user in the application. The registry token is stored
-     * in the database for the user's current session.
-     *
-     * @param string $username the npm username
-     * @param string $password the npm password
-     * @param string $email    the npm email
-     *
-     * @return RegistryUser the RegistryUser model containing the registry token and associated data
-     *
-     * @throws \Exception If there is no active session, the .npmrc file is not found, the auth token is not found, or the npm login fails.
-     */
-    public static function login(string $username, string $password, string $email): RegistryUser
-    {
-        // Session is required
-        if (session()->missing(['company', 'user'])) {
-            throw new \Exception('No active session to create registry token for.');
-        }
-
-        // Get registry
-        $registry = static::createUrl();
-
-        // Set .npmrc path
-        $npmrcPath     = 'tmp/.npmrc-' . session('user');
-
-        // Create .npmrc file
-        Storage::disk('local')->put($npmrcPath, '');
-
-        // Prepare command
-        $process  = new Process([
-            'npm-cli-login',
-            '-u', $username,
-            '-p', $password,
-            '-e', $email,
-            '-r', $registry,
-            '-s', 'false',
-            '--config-path', storage_path('app/' . $npmrcPath),
-        ]);
-
-        // Set timeout
-        $process->setTimeout(60);
-
-        try {
-            // Run the process
-            $process->mustRun();
-
-            // Check if .npmrc file exists
-            if (!Storage::drive('local')->exists($npmrcPath)) {
-                throw new \Exception('.npmrc file not found');
-            }
-
-            // Remove protocol from registry URL for matching
-            $registryHost = preg_replace('/^https?:\/\//', '', $registry);
-
-            // Read the .npmrc file to get the auth token
-            $npmrcContent = Storage::drive('local')->get($npmrcPath);
-            $lines        = explode("\n", $npmrcContent);
-            $authToken    = null;
-
-            foreach ($lines as $line) {
-                $line = trim($line);
-                if (Str::contains($line, $registryHost) && Str::contains($line, '_authToken=')) {
-                    $parts = explode('_authToken=', $line);
-                    if (count($parts) === 2) {
-                        $authToken = trim($parts[1], ' "');
-                        break;
-                    }
-                }
-            }
-
-            // Delete .npmrc file
-            Storage::drive('local')->delete($npmrcPath);
-
-            if ($authToken) {
-                // Get current authenticated user
-                $user = Auth::getUserFromSession();
-
-                // Create or update registry user for current session
-                $registryUser = RegistryUser::updateOrCreate(
-                    ['company_uuid' => session('company'), 'user_uuid' => $user->uuid],
-                    ['registry_token' => $authToken, 'scope' => '*', 'expires_at' => now()->addYear(), 'name' => $user->public_id . ' developer token']
-                );
-
-                return $registryUser;
-            }
-
-            throw new \Exception('Auth token not found in .npmrc');
-        } catch (ProcessFailedException $exception) {
-            throw new \Exception('npm login failed: ' . $exception->getMessage());
-        }
-    }
-}
diff --git a/server/src/Support/CentralCatalog.php b/server/src/Support/CentralCatalog.php
deleted file mode 100644
index f038c4d..0000000
--- a/server/src/Support/CentralCatalog.php
+++ /dev/null
@@ -1,401 +0,0 @@
-<?php
-
-namespace Fleetbase\RegistryBridge\Support;
-
-use Fleetbase\RegistryBridge\Exceptions\RegistryException;
-use Fleetbase\RegistryBridge\Exceptions\RegistryUnavailableException;
-use Fleetbase\RegistryBridge\Models\RegistryExtensionInstall;
-use Fleetbase\RegistryBridge\Models\RegistryServiceInstall;
-use Illuminate\Http\Request;
-use Illuminate\Pagination\LengthAwarePaginator;
-use Illuminate\Support\Arr;
-use Illuminate\Support\Str;
-
-/**
- * Explore data sourced from a central registry instead of the local `registry_extensions` tables.
- *
- * With a Registry Service configured (`RegistryConfig::usesService()`) every call is delegated to
- * `ServiceCatalog`, which reads the v2 catalog and instance API. Otherwise this reads the cloud
- * `~registry/v1/extensions` endpoint: entries are mapped into the same shape the `RegistryExtension`
- * resource produces, `is_installed` is derived from the local install rows by package name,
- * `is_purchased` is always false and the records are flagged as not installable, since the v1 cloud
- * endpoints cannot serve installs to other instances.
- */
-class CentralCatalog
-{
-    public const SOURCE = 'registry';
-
-    public const DEFAULT_LIMIT = 30;
-
-    public const MAX_LIMIT = 100;
-
-    /**
-     * Whether Explore should read from the central registry.
-     */
-    public static function enabled(): bool
-    {
-        return RegistryClient::usesCentralCatalog();
-    }
-
-    /**
-     * Query the remote catalog with the Explore request parameters (`query`, `category`, `page`, `limit`).
-     *
-     * @return LengthAwarePaginator<array<string, mixed>>
-     *
-     * @throws RegistryException
-     */
-    public static function query(Request $request, ?RegistryClient $client = null): LengthAwarePaginator
-    {
-        $companyUuid = static::str($request->hasSession() ? $request->session()->get('company') : session('company'));
-        $config      = RegistryConfig::current();
-        if ($config->usesService()) {
-            return ServiceCatalog::query($request, $client ?? RegistryClient::fromConfig($config), $config, static::installedPackageNames($companyUuid));
-        }
-
-        $client     = $client ?? new RegistryClient();
-        $extensions = static::all($client, $companyUuid);
-
-        $search   = trim(static::str($request->input('query', '')));
-        $category = trim(static::str($request->input('category', '')));
-
-        if ($search !== '') {
-            $extensions = array_values(array_filter($extensions, fn (array $extension) => static::matchesSearch($extension, $search)));
-        }
-
-        if ($category !== '') {
-            $extensions = array_values(array_filter($extensions, fn (array $extension) => static::matchesCategory($extension, $category)));
-        }
-
-        $limit = static::int($request->input('limit', static::DEFAULT_LIMIT), static::DEFAULT_LIMIT);
-        $limit = $limit === -1 ? max(1, count($extensions)) : max(1, min($limit, static::MAX_LIMIT));
-        $page  = max(1, static::int($request->input('page', 1), 1));
-        $items = array_slice($extensions, ($page - 1) * $limit, $limit);
-
-        return new LengthAwarePaginator($items, count($extensions), $limit, $page, [
-            'path'  => $request->url(),
-            'query' => $request->query(),
-        ]);
-    }
-
-    /**
-     * Every remote extension, mapped, for the given company.
-     *
-     * @return array<int, array<string, mixed>>
-     *
-     * @throws RegistryUnavailableException
-     */
-    public static function all(?RegistryClient $client = null, ?string $companyUuid = null): array
-    {
-        $client    = $client ?? new RegistryClient();
-        $installed = static::installedPackageNames($companyUuid);
-
-        return array_map(
-            fn (array $extension) => static::transform($extension, $installed, $client->host()),
-            $client->listPublicExtensions()
-        );
-    }
-
-    /**
-     * Find a single mapped remote extension by its public id or slug.
-     *
-     * @return array<string, mixed>|null
-     */
-    public static function find(?string $id, ?RegistryClient $client = null): ?array
-    {
-        if (!$id) {
-            return null;
-        }
-
-        try {
-            $config = RegistryConfig::current();
-            if ($config->usesService()) {
-                return ServiceCatalog::find($id, $client ?? RegistryClient::fromConfig($config), $config);
-            }
-
-            $client = $client ?? new RegistryClient();
-            foreach ($client->listPublicExtensions() as $extension) {
-                if (($extension['id'] ?? null) === $id || ($extension['slug'] ?? null) === $id) {
-                    return static::transform($extension, [], $client->host());
-                }
-            }
-        } catch (RegistryException $e) {
-            return null;
-        }
-
-        return null;
-    }
-
-    /**
-     * Categories of the remote catalog, shaped like the `Category` resource: the service's category list
-     * (v2), or the distinct categories referenced by the cloud catalog (v1).
-     *
-     * @return array<int, array<string, mixed>>
-     *
-     * @throws RegistryException
-     */
-    public static function categories(?RegistryClient $client = null): array
-    {
-        $config = RegistryConfig::current();
-        if ($config->usesService()) {
-            return ServiceCatalog::categories($client ?? RegistryClient::fromConfig($config));
-        }
-
-        $client     = $client ?? new RegistryClient();
-        $categories = [];
-
-        foreach ($client->listPublicExtensions() as $extension) {
-            $category = static::transformCategory(Arr::get($extension, 'category'));
-            if ($category === null) {
-                continue;
-            }
-
-            $key = $category['slug'] ?: $category['id'];
-            if (!isset($categories[$key])) {
-                $categories[$key] = $category;
-            }
-        }
-
-        $categories = array_values($categories);
-        usort($categories, fn (array $a, array $b) => strcasecmp(static::str($a['name']), static::str($b['name'])));
-
-        return $categories;
-    }
-
-    /**
-     * Map one public registry entry into the local `RegistryExtension` resource shape.
-     *
-     * @param array<string, mixed> $extension         entry from `GET /~registry/v1/extensions`
-     * @param array<int, string>   $installedPackages npm/composer package names installed locally
-     *
-     * @return array<string, mixed>
-     */
-    public static function transform(array $extension, array $installedPackages = [], ?string $registryHost = null): array
-    {
-        $id       = static::str(Arr::get($extension, 'id', Arr::get($extension, 'public_id', '')));
-        $category = static::transformCategory(Arr::get($extension, 'category'));
-        $packages = static::packageNames($extension);
-
-        $installed = count(array_intersect($packages, $installedPackages)) > 0;
-
-        return [
-            'id'                       => $id,
-            'uuid'                     => $id,
-            'public_id'                => $id,
-            'company_uuid'             => null,
-            'created_by_uuid'          => null,
-            'registry_user_uuid'       => null,
-            'category_uuid'            => $category['id'] ?? null,
-            'current_bundle_uuid'      => null,
-            'next_bundle_uuid'         => null,
-            'icon_uuid'                => null,
-            'name'                     => Arr::get($extension, 'name'),
-            'subtitle'                 => Arr::get($extension, 'subtitle'),
-            'description'              => Arr::get($extension, 'description'),
-            'promotional_text'         => Arr::get($extension, 'promotional_text'),
-            'fa_icon'                  => Arr::get($extension, 'fa_icon'),
-            'icon_url'                 => Arr::get($extension, 'icon_url'),
-            'slug'                     => Arr::get($extension, 'slug'),
-            'version'                  => Arr::get($extension, 'version'),
-            'status'                   => Arr::get($extension, 'status', 'published'),
-            'tags'                     => array_values((array) Arr::get($extension, 'tags', [])),
-            'languages'                => array_values((array) Arr::get($extension, 'languages', [])),
-            'primary_language'         => Arr::get($extension, 'primary_language'),
-            'website_url'              => Arr::get($extension, 'website_url'),
-            'repo_url'                 => Arr::get($extension, 'repo_url'),
-            'support_url'              => Arr::get($extension, 'support_url'),
-            'privacy_policy_url'       => Arr::get($extension, 'privacy_policy_url'),
-            'tos_url'                  => Arr::get($extension, 'tos_url'),
-            'copyright'                => Arr::get($extension, 'copyright'),
-            'payment_required'         => (bool) Arr::get($extension, 'payment_required', false),
-            'price'                    => Arr::get($extension, 'price'),
-            'sale_price'               => Arr::get($extension, 'sale_price'),
-            'on_sale'                  => (bool) Arr::get($extension, 'on_sale', false),
-            'currency'                 => Arr::get($extension, 'currency', 'USD'),
-            'subscription_required'    => (bool) Arr::get($extension, 'subscription_required', false),
-            'core_extension'           => (bool) Arr::get($extension, 'core_extension', false),
-            'self_managed'             => (bool) Arr::get($extension, 'self_managed', false),
-            'installs_count'           => static::int(Arr::get($extension, 'installs_count', 0)),
-            'category_name'            => $category['name'] ?? null,
-            'publisher_name'           => Arr::get($extension, 'publisher.name'),
-            'current_bundle_version'   => Arr::get($extension, 'current_bundle.version', Arr::get($extension, 'version')),
-            'current_bundle_id'        => null,
-            'current_bundle_public_id' => null,
-            'current_bundle_filename'  => null,
-            'next_bundle_id'           => null,
-            'next_bundle_public_id'    => null,
-            'next_bundle_filename'     => null,
-            'category'                 => $category,
-            'screenshots'              => [],
-            'is_installed'             => $installed,
-            'is_purchased'             => false,
-            'is_author'                => false,
-            'is_installable'           => false,
-            'source'                   => static::SOURCE,
-            'meta'                     => [
-                'source'        => static::SOURCE,
-                'registry_host' => $registryHost,
-                'packages'      => $packages,
-                'publisher'     => Arr::get($extension, 'publisher'),
-            ],
-            'published_at'             => Arr::get($extension, 'published_at'),
-            'created_at'               => Arr::get($extension, 'created_at'),
-            'updated_at'               => Arr::get($extension, 'updated_at'),
-        ];
-    }
-
-    /**
-     * Map a public registry category into the `Category` resource shape.
-     *
-     * @return array<string, mixed>|null
-     */
-    public static function transformCategory(mixed $category): ?array
-    {
-        if (!is_array($category)) {
-            return null;
-        }
-
-        $name = Arr::get($category, 'name');
-        $slug = static::str(Arr::get($category, 'slug')) ?: ($name ? Str::slug(static::str($name)) : null);
-        $id   = static::str(Arr::get($category, 'id')) ?: ($slug ? 'category_' . $slug : '');
-
-        if ($id === '' || !$name) {
-            return null;
-        }
-
-        return [
-            'id'            => $id,
-            'uuid'          => $id,
-            'public_id'     => $id,
-            'company_uuid'  => null,
-            'owner_uuid'    => null,
-            'owner_type'    => null,
-            'parent_uuid'   => null,
-            'name'          => $name,
-            'slug'          => $slug,
-            'description'   => Arr::get($category, 'description'),
-            'icon'          => Arr::get($category, 'icon'),
-            'icon_color'    => Arr::get($category, 'icon_color'),
-            'icon_url'      => Arr::get($category, 'icon_url'),
-            'tags'          => array_values((array) Arr::get($category, 'tags', [])),
-            'translations'  => [],
-            'meta'          => ['source' => static::SOURCE],
-            'for'           => 'extension_category',
-            'core_category' => 1,
-            'order'         => Arr::get($category, 'order', 0),
-        ];
-    }
-
-    /**
-     * npm and composer package names a registry entry's current bundle declares.
-     *
-     * @param array<string, mixed> $extension
-     *
-     * @return array<int, string>
-     */
-    public static function packageNames(array $extension): array
-    {
-        $names = [Arr::get($extension, 'package_name')];
-
-        // Keys contain dots (`package.json`), so index the meta array directly instead of using dot notation.
-        $meta = Arr::get($extension, 'current_bundle.meta');
-        if (is_array($meta)) {
-            $names[] = Arr::get($meta['package.json'] ?? [], 'name');
-            $names[] = Arr::get($meta['composer.json'] ?? [], 'name');
-        }
-
-        return array_values(array_unique(array_filter($names, fn ($name) => is_string($name) && $name !== '')));
-    }
-
-    /**
-     * Package names (and service extension ids) of every extension the company has installed locally,
-     * from the legacy install rows and from installs served by the Registry Service.
-     *
-     * @return array<int, string>
-     */
-    public static function installedPackageNames(?string $companyUuid): array
-    {
-        if (!$companyUuid) {
-            return [];
-        }
-
-        $names = [];
-        if (RegistryConfig::current()->usesService()) {
-            foreach (RegistryServiceInstall::where('company_uuid', $companyUuid)->get() as $install) {
-                $names[] = $install->npm_package;
-                $names[] = $install->composer_package;
-                $names[] = $install->extension_id;
-            }
-        }
-
-        $installs = RegistryExtensionInstall::where('company_uuid', $companyUuid)
-            ->with(['extension.currentBundle'])
-            ->get();
-
-        foreach ($installs as $install) {
-            $bundle = data_get($install, 'extension.currentBundle');
-            $meta   = is_object($bundle) ? data_get($bundle, 'meta') : null;
-            $meta   = is_array($meta) ? $meta : [];
-
-            $names[] = Arr::get($meta['package.json'] ?? [], 'name');
-            $names[] = Arr::get($meta['composer.json'] ?? [], 'name');
-            $names[] = data_get($install, 'extension.public_id');
-            $names[] = data_get($install, 'extension.slug');
-        }
-
-        return array_values(array_unique(array_filter($names, fn ($name) => is_string($name) && $name !== '')));
-    }
-
-    /**
-     * Coerce a scalar to string; anything else becomes an empty string.
-     */
-    protected static function str(mixed $value): string
-    {
-        return is_scalar($value) || $value instanceof \Stringable ? (string) $value : '';
-    }
-
-    /**
-     * Coerce a numeric value to int, falling back to a default.
-     */
-    protected static function int(mixed $value, int $default = 0): int
-    {
-        return is_numeric($value) ? (int) $value : $default;
-    }
-
-    /**
-     * @param array<string, mixed> $extension
-     */
-    protected static function matchesSearch(array $extension, string $search): bool
-    {
-        $haystack = implode(' ', array_filter([
-            Arr::get($extension, 'name'),
-            Arr::get($extension, 'subtitle'),
-            Arr::get($extension, 'description'),
-            Arr::get($extension, 'publisher_name'),
-            Arr::get($extension, 'category_name'),
-            implode(' ', (array) Arr::get($extension, 'tags', [])),
-        ], 'is_string'));
-
-        return Str::contains(Str::lower($haystack), Str::lower($search));
-    }
-
-    /**
-     * @param array<string, mixed> $extension
-     */
-    protected static function matchesCategory(array $extension, string $category): bool
-    {
-        $candidates = array_filter([
-            Arr::get($extension, 'category.id'),
-            Arr::get($extension, 'category.slug'),
-            Arr::get($extension, 'category.name'),
-            Arr::get($extension, 'category_uuid'),
-        ], 'is_string');
-
-        foreach ($candidates as $candidate) {
-            if (strcasecmp($candidate, $category) === 0) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-}
diff --git a/server/src/Support/ExtensionManifest.php b/server/src/Support/ExtensionManifest.php
deleted file mode 100644
index ad37960..0000000
--- a/server/src/Support/ExtensionManifest.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-
-namespace Fleetbase\RegistryBridge\Support;
-
-use Opis\JsonSchema\Errors\ErrorFormatter;
-use Opis\JsonSchema\Validator;
-
-/**
- * Validates an `extension.json` manifest against the bundled JSON Schema (draft 2020-12).
- */
-class ExtensionManifest
-{
-    /**
-     * Absolute path of the extension manifest schema.
-     */
-    public static function schemaPath(): string
-    {
-        return dirname(__DIR__, 2) . '/resources/schemas/extension.schema.json';
-    }
-
-    /**
-     * Validate a decoded manifest.
-     *
-     * @param object|array<string, mixed> $manifest the decoded `extension.json`
-     *
-     * @return array<string, array<int, string>> validation errors keyed by JSON pointer (`/version`), empty when valid
-     */
-    public static function validate(object|array $manifest): array
-    {
-        // Opis expects JSON objects as stdClass, so round-trip anything else through JSON.
-        $data = $manifest instanceof \stdClass ? $manifest : json_decode((string) json_encode($manifest));
-
-        $validator = new Validator();
-        $validator->setMaxErrors(25);
-
-        $schema = json_decode((string) file_get_contents(static::schemaPath()), false);
-        if (!is_object($schema)) {
-            throw new \RuntimeException('Unable to load extension manifest schema from ' . static::schemaPath());
-        }
-
-        $result = $validator->validate($data, $schema);
-        if ($result->isValid()) {
-            return [];
-        }
-
-        $error = $result->error();
-        if ($error === null) {
-            return ['/' => ['Manifest is invalid.']];
-        }
-
-        /** @var array<string, array<int, string>> $errors */
-        $errors = (new ErrorFormatter())->formatKeyed($error);
-
-        return $errors;
-    }
-
-    /**
-     * Flatten validation errors into `pointer: message` lines.
-     *
-     * @param array<string, array<int, string>> $errors
-     *
-     * @return array<int, string>
-     */
-    public static function flatten(array $errors): array
-    {
-        $lines = [];
-        foreach ($errors as $pointer => $messages) {
-            foreach ((array) $messages as $message) {
-                $lines[] = trim($pointer . ': ' . $message);
-            }
-        }
-
-        return $lines;
-    }
-}
diff --git a/server/src/Support/Installer/EloquentInstallRecorder.php b/server/src/Support/Installer/EloquentInstallRecorder.php
deleted file mode 100644
index 45171da..0000000
--- a/server/src/Support/Installer/EloquentInstallRecorder.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-namespace Fleetbase\RegistryBridge\Support\Installer;
-
-use Fleetbase\Models\Company;
-use Fleetbase\RegistryBridge\Models\RegistryExtensionInstall;
-use Fleetbase\RegistryBridge\Support\Installer\Contracts\InstallRecorder;
-
-class EloquentInstallRecorder implements InstallRecorder
-{
-    public function resolveCompany(?string $company): ?string
-    {
-        if ($company !== null && $company !== '') {
-            return Company::where('uuid', $company)->orWhere('public_id', $company)->value('uuid');
-        }
-
-        // Through query(): Fleetbase's Company model has an instance count(), so Company::count() is a fatal error.
-        return Company::query()->count() === 1 ? Company::query()->value('uuid') : null;
-    }
-
-    public function isInstalled(string $company, ExtensionRef $extension): bool
-    {
-        return RegistryExtensionInstall::where(['company_uuid' => $company, 'extension_uuid' => $extension->uuid])->exists();
-    }
-
-    public function installedElsewhere(string $company, ExtensionRef $extension): bool
-    {
-        return RegistryExtensionInstall::where('extension_uuid', $extension->uuid)->where('company_uuid', '!=', $company)->exists();
-    }
-
-    public function installedVersion(string $company, ExtensionRef $extension): ?string
-    {
-        $install = RegistryExtensionInstall::where(['company_uuid' => $company, 'extension_uuid' => $extension->uuid])->first();
-        $version = $install ? data_get($install->meta, 'version') : null;
-
-        return $version === null ? null : (string) $version;
-    }
-
-    public function record(string $company, ExtensionRef $extension, Release $release, array $meta = []): void
-    {
-        $install       = RegistryExtensionInstall::firstOrNew(['company_uuid' => $company, 'extension_uuid' => $extension->uuid]);
-        $install->meta = array_merge((array) ($install->meta ?? []), $meta);
-        $install->save();
-    }
-
-    public function remove(string $company, ExtensionRef $extension): void
-    {
-        RegistryExtensionInstall::where(['company_uuid' => $company, 'extension_uuid' => $extension->uuid])->delete();
-    }
-}
diff --git a/server/src/Support/Installer/ExtensionRef.php b/server/src/Support/Installer/ExtensionRef.php
index 9828826..6635e04 100644
--- a/server/src/Support/Installer/ExtensionRef.php
+++ b/server/src/Support/Installer/ExtensionRef.php
@@ -5,21 +5,18 @@
 /**
  * The extension an install job is about, as stored in the job record.
  *
- * `source` says which ReleaseSource found it: `local` for this instance's
- * registry tables, `registry-service` for the Registry Service (where `uuid`
- * and `id` are both the service's `ext_` id).
+ * Extensions come from the Registry Service, so `uuid` and `id` are both the
+ * service's `ext_` id; `source` is kept in job records for compatibility.
  */
 class ExtensionRef
 {
-    public const LOCAL = 'local';
-
     public const REGISTRY_SERVICE = 'registry-service';
 
     public function __construct(
         public readonly string $uuid,
         public readonly string $id,
         public readonly string $name,
-        public readonly string $source = self::LOCAL,
+        public readonly string $source = self::REGISTRY_SERVICE,
     ) {
     }
 
@@ -43,6 +40,6 @@ public static function fromArray(array $data): self
     {
         $source = (string) ($data['source'] ?? '');
 
-        return new self((string) ($data['uuid'] ?? ''), (string) ($data['id'] ?? ''), (string) ($data['name'] ?? ''), $source !== '' ? $source : self::LOCAL);
+        return new self((string) ($data['uuid'] ?? ''), (string) ($data['id'] ?? ''), (string) ($data['name'] ?? ''), $source !== '' ? $source : self::REGISTRY_SERVICE);
     }
 }
diff --git a/server/src/Support/Installer/LocalBundleReleaseSource.php b/server/src/Support/Installer/LocalBundleReleaseSource.php
deleted file mode 100644
index 2c709ff..0000000
--- a/server/src/Support/Installer/LocalBundleReleaseSource.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-
-namespace Fleetbase\RegistryBridge\Support\Installer;
-
-use Fleetbase\Models\File;
-use Fleetbase\RegistryBridge\Models\RegistryExtension;
-use Fleetbase\RegistryBridge\Models\RegistryExtensionBundle;
-use Fleetbase\RegistryBridge\Support\Installer\Contracts\ReleaseSource;
-
-/**
- * Releases from this instance's registry tables: the extension's current
- * bundle, or the bundle with the requested version. The packages come from
- * the bundle's composer.json and package.json meta. A prebuilt engine dist is
- * attached when the bundle meta carries `engine_dist` ({ file_uuid, checksum });
- * nothing writes that yet, the Registry Service source will supply it.
- */
-class LocalBundleReleaseSource implements ReleaseSource
-{
-    public function find(string $extension): ?ExtensionRef
-    {
-        $model = RegistryExtension::where(function ($query) use ($extension) {
-            $query->where('uuid', $extension)->orWhere('public_id', $extension)->orWhere('slug', $extension);
-        })->first() ?? RegistryExtension::findByPackageName($extension);
-
-        return $model ? new ExtensionRef($model->uuid, (string) $model->public_id, (string) $model->name) : null;
-    }
-
-    public function resolve(ExtensionRef $extension, ?string $version = null): Release
-    {
-        $model = RegistryExtension::where('uuid', $extension->uuid)->first();
-        if (!$model) {
-            throw new ReleaseNotFoundException(sprintf('Extension %s no longer exists.', $extension->name));
-        }
-
-        $bundle = $version === null
-            ? $model->currentBundle
-            : RegistryExtensionBundle::where('extension_uuid', $model->uuid)->where('version', $version)->first();
-        if (!$bundle) {
-            throw new ReleaseNotFoundException($version === null ? sprintf('%s has no published bundle.', $extension->name) : sprintf('%s has no bundle for version %s.', $extension->name, $version));
-        }
-
-        $meta     = (array) ($bundle->meta ?? []);
-        $composer = data_get($meta, 'composer.json');
-        $package  = data_get($meta, 'package.json');
-
-        return new Release(
-            extension: $extension,
-            version: static::stringOrNull($bundle->version ?? data_get($package, 'version') ?? data_get($composer, 'version')) ?? 'latest',
-            composerPackage: static::stringOrNull(data_get($composer, 'name')),
-            composerConstraint: static::stringOrNull(data_get($composer, 'version')),
-            enginePackage: static::stringOrNull(data_get($package, 'name')),
-            engineConstraint: static::stringOrNull(data_get($package, 'version')),
-            artifacts: $this->artifacts($meta),
-            source: 'local',
-        );
-    }
-
-    /**
-     * @param array<string, mixed> $meta
-     *
-     * @return array<int, Artifact>
-     */
-    private function artifacts(array $meta): array
-    {
-        $dist = data_get($meta, 'engine_dist');
-        $file = is_array($dist) && isset($dist['file_uuid']) ? File::where('uuid', $dist['file_uuid'])->first() : null;
-        if (!$file) {
-            return [];
-        }
-
-        return [new Artifact(Artifact::DIST, sprintf('disk://%s/%s', $file->getDisk(), ltrim((string) $file->path, '/')), static::stringOrNull($dist['checksum'] ?? null), static::stringOrNull($file->original_filename))];
-    }
-
-    /**
-     * Bundle meta is user-supplied JSON: versions may be numbers, names may be missing.
-     */
-    protected static function stringOrNull(mixed $value): ?string
-    {
-        return is_string($value) || is_int($value) || is_float($value) ? (string) $value : null;
-    }
-}
diff --git a/server/src/Support/Installer/OutputProgress.php b/server/src/Support/Installer/OutputProgress.php
index a062a8a..d0fc78d 100644
--- a/server/src/Support/Installer/OutputProgress.php
+++ b/server/src/Support/Installer/OutputProgress.php
@@ -4,8 +4,7 @@
 
 /**
  * Turns Composer and pnpm output lines into progress percentages and friendly
- * messages for the install socket events. Moved here from
- * RegistryExtensionBundle, which still exposes the same static methods.
+ * messages for the install socket events.
  */
 class OutputProgress
 {
diff --git a/server/src/Support/Installer/ServiceInstallRecorder.php b/server/src/Support/Installer/ServiceInstallRecorder.php
index 00d5617..48e8714 100644
--- a/server/src/Support/Installer/ServiceInstallRecorder.php
+++ b/server/src/Support/Installer/ServiceInstallRecorder.php
@@ -2,23 +2,32 @@
 
 namespace Fleetbase\RegistryBridge\Support\Installer;
 
+use Fleetbase\Models\Company;
 use Fleetbase\RegistryBridge\Models\RegistryServiceInstall;
 use Fleetbase\RegistryBridge\Support\Installer\Contracts\InstallRecorder;
 
 /**
  * Install records for Registry Service extensions (`registry_service_installs`),
  * which keep the engine loading and the Installed page working offline.
- * Company resolution is shared with the local recorder.
  */
 class ServiceInstallRecorder implements InstallRecorder
 {
-    public function __construct(private readonly InstallRecorder $companies, private readonly ?string $serviceUrl = null)
+    public function __construct(private readonly ?string $serviceUrl = null)
     {
     }
 
+    /**
+     * The company uuid for a uuid or public id, or the only company when none is given (single-tenant
+     * self-hosted instances run the CLI without one).
+     */
     public function resolveCompany(?string $company): ?string
     {
-        return $this->companies->resolveCompany($company);
+        if ($company !== null && $company !== '') {
+            return Company::where('uuid', $company)->orWhere('public_id', $company)->value('uuid');
+        }
+
+        // Through query(): Fleetbase's Company model has an instance count(), so Company::count() is a fatal error.
+        return Company::query()->count() === 1 ? Company::query()->value('uuid') : null;
     }
 
     public function isInstalled(string $company, ExtensionRef $extension): bool
diff --git a/server/src/Support/Installer/SourceRoutingInstallRecorder.php b/server/src/Support/Installer/SourceRoutingInstallRecorder.php
deleted file mode 100644
index 2499409..0000000
--- a/server/src/Support/Installer/SourceRoutingInstallRecorder.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-namespace Fleetbase\RegistryBridge\Support\Installer;
-
-use Fleetbase\RegistryBridge\Support\Installer\Contracts\InstallRecorder;
-
-/**
- * Keeps install records where the extension came from: the local install
- * table for this instance's registry, `registry_service_installs` for the
- * Registry Service.
- */
-class SourceRoutingInstallRecorder implements InstallRecorder
-{
-    /**
-     * @param array<string, InstallRecorder> $recorders keyed by ExtensionRef source; `local` is the fallback and resolves companies
-     */
-    public function __construct(private readonly array $recorders)
-    {
-    }
-
-    public function resolveCompany(?string $company): ?string
-    {
-        return $this->for(ExtensionRef::LOCAL)->resolveCompany($company);
-    }
-
-    public function isInstalled(string $company, ExtensionRef $extension): bool
-    {
-        return $this->for($extension->source)->isInstalled($company, $extension);
-    }
-
-    public function installedElsewhere(string $company, ExtensionRef $extension): bool
-    {
-        return $this->for($extension->source)->installedElsewhere($company, $extension);
-    }
-
-    public function installedVersion(string $company, ExtensionRef $extension): ?string
-    {
-        return $this->for($extension->source)->installedVersion($company, $extension);
-    }
-
-    public function record(string $company, ExtensionRef $extension, Release $release, array $meta = []): void
-    {
-        $this->for($extension->source)->record($company, $extension, $release, $meta);
-    }
-
-    public function remove(string $company, ExtensionRef $extension): void
-    {
-        $this->for($extension->source)->remove($company, $extension);
-    }
-
-    private function for(string $source): InstallRecorder
-    {
-        return $this->recorders[$source] ?? $this->recorders[ExtensionRef::LOCAL] ?? throw new \LogicException('No install recorder for ' . $source . ' extensions.');
-    }
-}
diff --git a/server/src/Support/Installer/SourceRoutingReleaseSource.php b/server/src/Support/Installer/SourceRoutingReleaseSource.php
deleted file mode 100644
index 20590bd..0000000
--- a/server/src/Support/Installer/SourceRoutingReleaseSource.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-namespace Fleetbase\RegistryBridge\Support\Installer;
-
-use Fleetbase\RegistryBridge\Support\Installer\Contracts\ReleaseSource;
-
-/**
- * Several release sources behind one: `find()` asks them in order and the
- * first match wins; `resolve()` goes back to the source that found the
- * extension (`ExtensionRef::$source`).
- *
- * When a source fails (the Registry Service is down) the others are still
- * asked; the failure is only reported when nobody found the extension.
- */
-class SourceRoutingReleaseSource implements ReleaseSource
-{
-    /**
-     * @param array<string, ReleaseSource> $sources keyed by ExtensionRef source, in lookup order
-     */
-    public function __construct(private readonly array $sources)
-    {
-    }
-
-    public function find(string $extension): ?ExtensionRef
-    {
-        $failure = null;
-        foreach ($this->sources as $source) {
-            try {
-                $ref = $source->find($extension);
-            } catch (InstallerException $e) {
-                $failure ??= $e;
-                continue;
-            }
-
-            if ($ref !== null) {
-                return $ref;
-            }
-        }
-
-        if ($failure !== null) {
-            throw $failure;
-        }
-
-        return null;
-    }
-
-    public function resolve(ExtensionRef $extension, ?string $version = null): Release
-    {
-        $source = $this->sources[$extension->source] ?? $this->sources[ExtensionRef::LOCAL] ?? null;
-        if ($source === null) {
-            throw new ReleaseNotFoundException(sprintf('No release source for %s extensions.', $extension->source));
-        }
-
-        return $source->resolve($extension, $version);
-    }
-}
diff --git a/server/src/Support/InstanceRegistration.php b/server/src/Support/InstanceRegistration.php
index d5ec35c..d725572 100644
--- a/server/src/Support/InstanceRegistration.php
+++ b/server/src/Support/InstanceRegistration.php
@@ -21,8 +21,6 @@ class InstanceRegistration
 {
     public const SETTING_SERVICE_URL = 'registry-bridge.registry.service_url';
 
-    public const SETTING_API_VERSION = 'registry-bridge.registry.api_version';
-
     public const SETTING_INSTANCE_TOKEN = 'registry-bridge.registry.instance_token';
 
     public const SETTING_INSTANCE = 'registry-bridge.registry.instance';
@@ -62,7 +60,7 @@ public static function register(string $code, ?string $serviceUrl = null, ?strin
             static::previousToken($config, $serviceUrl)
         );
 
-        $registration = (new RegistryClient($serviceUrl, null, RegistryConfig::V2, $config))->registerInstance($payload);
+        $registration = (new RegistryClient($serviceUrl, null, $config))->registerInstance($payload);
 
         return static::store($registration, $serviceUrl);
     }
diff --git a/server/src/Support/RegistryClient.php b/server/src/Support/RegistryClient.php
index d1849c0..cbf6d99 100644
--- a/server/src/Support/RegistryClient.php
+++ b/server/src/Support/RegistryClient.php
@@ -12,16 +12,11 @@
 use Illuminate\Support\Facades\Log;
 
 /**
- * HTTP client for the Fleetbase extensions registry.
+ * HTTP client for the Registry Service: the public catalog (`/v1/catalog/*`) and the instance API
+ * (`/v1/instances/*`), authenticated with the instance token issued at registration.
  *
  * @phpstan-consistent-constructor
  *
- * Talks to one of two registries (see `RegistryConfig`):
- *
- * - `v2`, the Registry Service: public catalog (`/v1/catalog/*`) and the instance API (`/v1/instances/*`),
- *   authenticated with the instance token issued at registration.
- * - `v1`, the cloud registry-bridge endpoint `~registry/v1/extensions`, the fallback when no service URL is set.
- *
  * Successful catalog responses are cached (15 minutes; instance state for one minute) and the last good
  * payload is kept indefinitely, so an outage degrades to stale data instead of an empty Explore page. After a
  * few consecutive failures the circuit opens and the registry is not contacted again until the cool-down has
@@ -50,10 +45,7 @@ class RegistryClient
     /** Upper bound on catalog pages walked, so a misbehaving service cannot loop forever. */
     public const CATALOG_MAX_PAGES = 50;
 
-    /** v1: public catalog endpoint, relative to the registry host. */
-    public const EXTENSIONS_PATH = '~registry/v1/extensions';
-
-    /** v2: Registry Service endpoints, relative to the service URL. */
+    /** Registry Service endpoints, relative to the service URL. */
     public const CATALOG_EXTENSIONS_PATH = 'v1/catalog/extensions';
 
     public const CATALOG_CATEGORIES_PATH = 'v1/catalog/categories';
@@ -66,31 +58,27 @@ class RegistryClient
 
     public const INSTANCE_INSTALLS_PATH = 'v1/instances/me/installs';
 
+    /** Phase 4: hosted Stripe Checkout for the instance's organization, and the hand-off polled after it. */
+    public const INSTANCE_CHECKOUT_PATH = 'v1/instances/me/purchases/checkout';
+
+    public const INSTANCE_PURCHASES_PATH = 'v1/instances/me/purchases';
+
     protected const CACHE_PREFIX = 'registry-bridge:registry-client';
 
     protected string $host;
 
     protected ?string $token;
 
-    protected string $apiVersion;
-
     /**
-     * @param string|null         $host       base URL; defaults to the service URL (v2) or the registry host (v1)
-     * @param string|null         $token      bearer token; defaults to the instance token (v2) or the registry token (v1)
-     * @param string|null         $apiVersion `v1` or `v2`; defaults to the configured version
-     * @param RegistryConfig|null $config     settings to resolve defaults from; defaults to the running config
+     * @param string|null         $host   service URL; defaults to the configured one
+     * @param string|null         $token  instance token; defaults to the configured one
+     * @param RegistryConfig|null $config settings to resolve defaults from; defaults to the running config
      */
-    public function __construct(?string $host = null, ?string $token = null, ?string $apiVersion = null, ?RegistryConfig $config = null)
+    public function __construct(?string $host = null, ?string $token = null, ?RegistryConfig $config = null)
     {
-        $config           = $config ?? RegistryConfig::current();
-        $this->apiVersion = in_array($apiVersion, [RegistryConfig::V1, RegistryConfig::V2], true) ? $apiVersion : $config->apiVersion();
-
-        $usesService = $this->apiVersion === RegistryConfig::V2;
-        $defaultHost = $usesService ? ($config->serviceUrl() ?? $config->host()) : $config->host();
-        $this->host  = static::normalizeHost($host ?: $defaultHost);
-
-        $defaultToken = $usesService ? $config->instanceToken() : $config->token();
-        $this->token  = $token !== null && $token !== '' ? $token : $defaultToken;
+        $config      = $config ?? RegistryConfig::current();
+        $this->host  = static::normalizeHost($host ?: ($config->serviceUrl() ?? RegistryConfig::DEFAULT_SERVICE_URL));
+        $this->token = $token !== null && $token !== '' ? $token : $config->instanceToken();
     }
 
     /**
@@ -98,33 +86,17 @@ public function __construct(?string $host = null, ?string $token = null, ?string
      */
     public static function fromConfig(RegistryConfig $config): static
     {
-        return new static(null, null, null, $config);
+        return new static(null, null, $config);
     }
 
     /**
-     * The registry host this client talks to.
+     * The service URL this client talks to.
      */
     public function host(): string
     {
         return $this->host;
     }
 
-    /**
-     * `v1` (cloud registry-bridge) or `v2` (Registry Service).
-     */
-    public function apiVersion(): string
-    {
-        return $this->apiVersion;
-    }
-
-    /**
-     * Whether this client talks to the Registry Service.
-     */
-    public function usesService(): bool
-    {
-        return $this->apiVersion === RegistryConfig::V2;
-    }
-
     /**
      * Whether a bearer token is attached to requests.
      */
@@ -134,61 +106,7 @@ public function hasToken(): bool
     }
 
     /**
-     * Registry host from config (settings override env).
-     */
-    public static function configuredHost(): string
-    {
-        return RegistryConfig::current()->host();
-    }
-
-    /**
-     * Registry bearer token from config (settings override env).
-     */
-    public static function configuredToken(): ?string
-    {
-        return RegistryConfig::current()->token();
-    }
-
-    /**
-     * Whether this instance runs its own registry and serves Explore from its local tables.
-     */
-    public static function isSelfHosted(): bool
-    {
-        return RegistryConfig::current()->isSelfHostedRegistry();
-    }
-
-    /**
-     * Whether Explore and categories should be read from a central registry: always with a Registry Service,
-     * otherwise unless this instance is itself the (v1) registry.
-     */
-    public static function usesCentralCatalog(): bool
-    {
-        $config = RegistryConfig::current();
-
-        return $config->usesService() || !$config->isSelfHostedRegistry();
-    }
-
-    /**
-     * v1: list the published extensions on the cloud registry (`GET /~registry/v1/extensions`).
-     *
-     * Cached for 15 minutes per query. On failure the last good payload is returned; when there is
-     * none a `RegistryUnavailableException` is thrown.
-     *
-     * @param array<string, mixed> $query
-     *
-     * @return array<int, array<string, mixed>>
-     *
-     * @throws RegistryUnavailableException
-     */
-    public function listPublicExtensions(array $query = []): array
-    {
-        $payload = $this->cachedGet(static::EXTENSIONS_PATH, $query);
-
-        return static::extractList($payload);
-    }
-
-    /**
-     * v2: one page of the service catalog (`GET /v1/catalog/extensions`).
+     * one page of the service catalog (`GET /v1/catalog/extensions`).
      *
      * Accepts the service filters (`q`, `category`, `pricing`, `hosting`, `publisher`, `tag`, `sort`, `page`, `limit`).
      *
@@ -209,7 +127,7 @@ public function catalogExtensions(array $query = []): array
     }
 
     /**
-     * v2: every published listing, walking the catalog pages.
+     * every published listing, walking the catalog pages.
      *
      * @param array<string, mixed> $query
      *
@@ -233,7 +151,7 @@ public function allCatalogExtensions(array $query = []): array
     }
 
     /**
-     * v2: one full listing by slug or `ext_` id (`GET /v1/catalog/extensions/{slug}`), or null when it does not exist.
+     * one full listing by slug or `ext_` id (`GET /v1/catalog/extensions/{slug}`), or null when it does not exist.
      *
      * @return array<string, mixed>|null
      *
@@ -255,7 +173,38 @@ public function catalogExtension(string $slug): ?array
     }
 
     /**
-     * v2: categories with published extension counts (`GET /v1/catalog/categories`).
+     * published and yanked releases of a listing (`GET /v1/catalog/extensions/{slug}/releases`), newest
+     * first, or null when the listing does not exist.
+     *
+     * @return array{extension: string|null, latest: string|null, channels: array<string, string>, releases: array<int, array<string, mixed>>}|null
+     *
+     * @throws RegistryUnavailableException|RegistryServiceException
+     */
+    public function catalogReleases(string $slug): ?array
+    {
+        try {
+            $payload = $this->cachedGet(static::CATALOG_EXTENSIONS_PATH . '/' . rawurlencode($slug) . '/releases');
+        } catch (RegistryServiceException $e) {
+            if ($e->status() === 404) {
+                return null;
+            }
+
+            throw $e;
+        }
+
+        $payload  = is_array($payload) ? static::unwrap($payload) : [];
+        $channels = is_array($payload['channels'] ?? null) ? array_filter($payload['channels'], 'is_string') : [];
+
+        return [
+            'extension' => is_string($payload['extension'] ?? null) ? $payload['extension'] : null,
+            'latest'    => is_string($payload['latest'] ?? null) ? $payload['latest'] : null,
+            'channels'  => $channels,
+            'releases'  => is_array($payload['releases'] ?? null) ? array_values(array_filter($payload['releases'], 'is_array')) : [],
+        ];
+    }
+
+    /**
+     * categories with published extension counts (`GET /v1/catalog/categories`).
      *
      * @return array<int, array<string, mixed>>
      *
@@ -267,7 +216,7 @@ public function catalogCategories(): array
     }
 
     /**
-     * v2: this instance, its organization and the organization's licences (`GET /v1/instances/me`).
+     * this instance, its organization and the organization's licences (`GET /v1/instances/me`).
      *
      * @return array{instance: array<string, mixed>, licences: array<int, array<string, mixed>>}
      *
@@ -286,7 +235,57 @@ public function instance(): array
     }
 
     /**
-     * v2: installed releases against the newest compatible release (`GET /v1/instances/me/updates`).
+     * Phase 4: start a hosted Stripe Checkout for the organization (`POST /v1/instances/me/purchases/checkout`).
+     *
+     * A service without the endpoint answers 404 or 405, which surfaces as a `RegistryServiceException`.
+     *
+     * @param array<string, mixed> $payload `extension` (slug, `ext_` id or package name), `return_url`, optional `cancel_url`, `email`
+     *
+     * @return array{url: string, handoff: string, status: string, amount: int|null, currency: string|null}
+     *
+     * @throws RegistryUnavailableException|RegistryServiceException
+     */
+    public function createCheckout(array $payload): array
+    {
+        $this->requireToken();
+        $body = static::unwrap($this->send('post', static::INSTANCE_CHECKOUT_PATH, array_filter($payload, fn ($value) => $value !== null && $value !== '')));
+
+        $url     = $body['url'] ?? null;
+        $handoff = $body['handoff'] ?? null;
+        if (!is_string($url) || $url === '' || !is_string($handoff) || $handoff === '') {
+            throw new RegistryServiceException('The registry service did not return a checkout URL and hand-off id.', 502);
+        }
+
+        return [
+            'url'      => $url,
+            'handoff'  => $handoff,
+            'status'   => is_string($body['status'] ?? null) ? $body['status'] : 'open',
+            'amount'   => is_numeric($body['amount'] ?? null) ? (int) $body['amount'] : null,
+            'currency' => is_string($body['currency'] ?? null) ? $body['currency'] : null,
+        ];
+    }
+
+    /**
+     * Phase 4: the status of a checkout hand-off (`GET /v1/instances/me/purchases/{handoff}`), never cached.
+     *
+     * @return array<string, mixed> at least `status`
+     *
+     * @throws RegistryUnavailableException|RegistryServiceException
+     */
+    public function purchase(string $handoff): array
+    {
+        $this->requireToken();
+        $body = static::unwrap($this->send('get', static::INSTANCE_PURCHASES_PATH . '/' . static::encodePathSegment($handoff)));
+        // A completed hand-off means a new licence in `me`
+        if (($body['status'] ?? null) === 'complete') {
+            $this->forgetInstanceState();
+        }
+
+        return $body;
+    }
+
+    /**
+     * installed releases against the newest compatible release (`GET /v1/instances/me/updates`).
      *
      * @return array{data: array<int, array<string, mixed>>, meta: array<string, mixed>}
      *
@@ -304,7 +303,7 @@ public function updates(?string $channel = null): array
     }
 
     /**
-     * v2: exchange a one-time registration code for an instance token (`POST /v1/instances/register`).
+     * exchange a one-time registration code for an instance token (`POST /v1/instances/register`).
      *
      * @param array<string, mixed> $payload `code`, `name`, `kind`, and optional `host`, `console_version`, `api_version`, `previous_token`
      *
@@ -330,7 +329,7 @@ public function registerInstance(array $payload): array
     }
 
     /**
-     * v2: report an install attempt (`POST /v1/instances/me/installs`).
+     * report an install attempt (`POST /v1/instances/me/installs`).
      *
      * @param array<string, mixed> $payload `extension`, `version` or `release`, `status` (installing, installed, failed), optional `error`, `installed_by`
      *
@@ -351,7 +350,7 @@ public function reportInstall(array $payload): array
     }
 
     /**
-     * v2: report an uninstall (`DELETE /v1/instances/me/installs/{extension}`). Scoped npm names work in the path.
+     * report an uninstall (`DELETE /v1/instances/me/installs/{extension}`). Scoped npm names work in the path.
      *
      * @return array{install: array<string, mixed>|null, deactivated: int}
      *
@@ -372,7 +371,7 @@ public function reportUninstall(string $extension): array
     /**
      * Call the registry once, uncached, and report whether it answered.
      *
-     * In v2 also checks the instance token against `/v1/instances/me` when one is set.
+     * Also checks the instance token against `/v1/instances/me` when one is set.
      *
      * @return array{ok: bool, latency_ms: int, status: int|null, extension_count: int|null, host: string, error: string|null, api_version: string, instance: array<string, mixed>|null}
      */
@@ -386,16 +385,14 @@ public function testConnection(): array
         $instance = null;
 
         try {
-            $response = $this->usesService()
-                ? $this->request()->get(static::CATALOG_EXTENSIONS_PATH, ['limit' => 1])
-                : $this->request()->get(static::EXTENSIONS_PATH);
+            $response = $this->request()->get(static::CATALOG_EXTENSIONS_PATH, ['limit' => 1]);
             $status   = $response->status();
             $ok       = $response->successful();
 
             if ($ok) {
                 $payload = $response->json();
                 $total   = is_array($payload) ? Arr::get($payload, 'meta.total') : null;
-                $count   = $this->usesService() && is_numeric($total) ? (int) $total : count(static::extractList($payload));
+                $count   = is_numeric($total) ? (int) $total : count(static::extractList($payload));
             } else {
                 $error = 'Registry responded with HTTP ' . $status . '.';
             }
@@ -403,7 +400,7 @@ public function testConnection(): array
             $error = $e->getMessage();
         }
 
-        if ($ok && $this->usesService() && $this->hasToken()) {
+        if ($ok && $this->hasToken()) {
             $instance = $this->testInstanceToken();
         }
 
@@ -414,7 +411,7 @@ public function testConnection(): array
             'extension_count' => $count,
             'host'            => $this->host,
             'error'           => $error,
-            'api_version'     => $this->apiVersion,
+            'api_version'     => RegistryConfig::V2,
             'instance'        => $instance,
         ];
     }
@@ -485,7 +482,11 @@ protected function send(string $method, string $path, array $payload = [], bool
     {
         try {
             $request  = $this->request($withToken)->asJson();
-            $response = $method === 'delete' ? $request->delete($path, $payload) : $request->post($path, $payload);
+            $response = match ($method) {
+                'delete' => $request->delete($path, $payload),
+                'get'    => $request->get($path, $payload),
+                default  => $request->post($path, $payload),
+            };
         } catch (\Throwable $e) {
             throw new RegistryUnavailableException('Unable to reach the extensions registry at ' . $this->host . ': ' . $e->getMessage(), 0, $e);
         }
@@ -645,7 +646,7 @@ protected function cacheKey(string $path, array $query): string
     {
         ksort($query);
 
-        return static::CACHE_PREFIX . ':' . md5($this->apiVersion . '|' . $this->host . '|' . ($this->token ?? '') . '|' . $path . '|' . json_encode($query));
+        return static::CACHE_PREFIX . ':' . md5($this->host . '|' . ($this->token ?? '') . '|' . $path . '|' . json_encode($query));
     }
 
     /**
diff --git a/server/src/Support/RegistryConfig.php b/server/src/Support/RegistryConfig.php
index 1636330..0aa3176 100644
--- a/server/src/Support/RegistryConfig.php
+++ b/server/src/Support/RegistryConfig.php
@@ -2,30 +2,23 @@
 
 namespace Fleetbase\RegistryBridge\Support;
 
+use Fleetbase\Support\Utils as SupportUtils;
+
 /**
- * Resolved registry settings for this instance.
- *
- * Two registries can back the module:
+ * Resolved Registry Service settings for this instance.
  *
- * - `v2`: the Registry Service (`registry.service_url`), which serves the catalog, the npm and Composer
- *   package endpoints and the instance API. Used whenever a service URL is configured, unless
- *   `registry.api_version` is pinned to `v1`.
- * - `v1`: the cloud registry-bridge endpoints (`registry.host` + `~registry/v1/extensions`), kept as the
- *   fallback when no service URL is configured.
- *
- * Built from the merged `registry-bridge.registry` config (settings override env), or from a plain array in tests.
- * The stored settings are read again once per Octane request or queued job (`RegistrySettings`), so a registration
- * made in another process or worker applies without restarting workers.
+ * The Registry Service (`registry.service_url`) serves the catalog, the npm and Composer package endpoints
+ * and the instance API. Built from the merged `registry-bridge.registry` config (settings override env), or
+ * from a plain array in tests. The stored settings are read again once per Octane request or queued job
+ * (`RegistrySettings`), so a registration made in another process or worker applies without restarting workers.
  *
  * @phpstan-consistent-constructor
  */
 class RegistryConfig
 {
-    public const V1 = 'v1';
-
     public const V2 = 'v2';
 
-    public const DEFAULT_HOST = 'https://registry.fleetbase.io';
+    public const DEFAULT_SERVICE_URL = 'https://registry.fleetbase.io';
 
     public const KIND_SELF_HOSTED = 'self_hosted';
 
@@ -50,24 +43,6 @@ public static function current(): static
         return new static(is_array($registry) ? $registry : []);
     }
 
-    /**
-     * Legacy (v1) registry host.
-     */
-    public function host(): string
-    {
-        $host = $this->string('host');
-
-        return $host !== '' ? $host : static::DEFAULT_HOST;
-    }
-
-    /**
-     * Legacy (v1) bearer token.
-     */
-    public function token(): ?string
-    {
-        return $this->string('token') ?: null;
-    }
-
     /**
      * Registry Service base URL without a trailing slash, or null when none is configured.
      */
@@ -78,25 +53,12 @@ public function serviceUrl(): ?string
         return $url !== '' ? static::normalizeUrl($url) : null;
     }
 
-    /**
-     * The API version in use: the configured one when valid, else `v2` with a service URL and `v1` without.
-     */
-    public function apiVersion(): string
-    {
-        if (strtolower($this->string('api_version')) === static::V1) {
-            return static::V1;
-        }
-
-        // v2 needs a service to talk to; without one the cloud endpoints stay the fallback
-        return $this->serviceUrl() ? static::V2 : static::V1;
-    }
-
     /**
      * Whether the catalog, installs and updates go through the Registry Service.
      */
     public function usesService(): bool
     {
-        return $this->apiVersion() === static::V2;
+        return $this->serviceUrl() !== null;
     }
 
     /**
@@ -128,33 +90,32 @@ public function instance(): array
     }
 
     /**
-     * Instance kind reported at registration and used to match an extension's hosting.
+     * The registry organization this instance is registered to (`id`, `slug`, `name`): it owns the licences
+     * bought here, not the console company. Null before registration.
+     *
+     * @return array{id: string|null, slug: string|null, name: string|null}|null
      */
-    public function instanceKind(): string
+    public function organization(): ?array
     {
-        $kind = $this->string('instance_kind');
-        if (in_array($kind, [static::KIND_SELF_HOSTED, static::KIND_CLOUD], true)) {
-            return $kind;
+        $organization = $this->instance()['organization'] ?? null;
+        if (!is_array($organization)) {
+            return null;
         }
 
-        // An instance that runs its own registry tables is Fleetbase Cloud
-        return Utils::castBoolean($this->registry['self_hosted'] ?? false) === true ? static::KIND_CLOUD : static::KIND_SELF_HOSTED;
-    }
+        $value = fn (string $key) => is_string($organization[$key] ?? null) && $organization[$key] !== '' ? $organization[$key] : null;
+        $out   = ['id' => $value('id'), 'slug' => $value('slug'), 'name' => $value('name')];
 
-    /**
-     * Whether this instance runs its own registry tables (the cloud).
-     */
-    public function isSelfHostedRegistry(): bool
-    {
-        return Utils::castBoolean($this->registry['self_hosted'] ?? false) === true;
+        return array_filter($out) !== [] ? $out : null;
     }
 
     /**
-     * Base URL for client requests in the active mode.
+     * Instance kind reported at registration and used to match an extension's hosting.
      */
-    public function baseUrl(): string
+    public function instanceKind(): string
     {
-        return $this->usesService() ? (string) $this->serviceUrl() : static::normalizeUrl($this->host());
+        $kind = $this->string('instance_kind');
+
+        return in_array($kind, [static::KIND_SELF_HOSTED, static::KIND_CLOUD], true) ? $kind : static::KIND_SELF_HOSTED;
     }
 
     /**
@@ -177,6 +138,41 @@ public function composerRepositoryUrl(): ?string
         return $url ? $url . '/composer' : null;
     }
 
+    /**
+     * Publisher portal URL (the service's website), or null without a service.
+     */
+    public function publisherUrl(): ?string
+    {
+        $url = $this->string('publisher_url');
+        if ($url !== '') {
+            return static::normalizeUrl($url);
+        }
+
+        return $this->usesService() ? $this->serviceUrl() : null;
+    }
+
+    /**
+     * Whether purchases go through the service checkout (`POST /v1/instances/me/purchases/checkout`).
+     *
+     * `checkout` is `auto` (on for a registered instance unless the service answered that it has no
+     * checkout), or a boolean to force it.
+     *
+     * @param bool $serviceSupportsCheckout false once the service answered 404 or 405 to a checkout
+     */
+    public function checkoutEnabled(bool $serviceSupportsCheckout = true): bool
+    {
+        if (!$this->usesService() || !$this->isRegistered()) {
+            return false;
+        }
+
+        $mode = $this->registry['checkout'] ?? 'auto';
+        if (is_string($mode) && in_array(strtolower(trim($mode)), ['', 'auto'], true)) {
+            return $serviceSupportsCheckout;
+        }
+
+        return SupportUtils::castBoolean($mode) === true;
+    }
+
     /**
      * Prefix a URL with https:// when it has no scheme and drop the trailing slash.
      */
diff --git a/server/src/Support/RegistrySettings.php b/server/src/Support/RegistrySettings.php
index 1833098..e2a2d98 100644
--- a/server/src/Support/RegistrySettings.php
+++ b/server/src/Support/RegistrySettings.php
@@ -28,10 +28,6 @@
  */
 class RegistrySettings
 {
-    public const SETTING_HOST = 'registry-bridge.registry.host';
-
-    public const SETTING_TOKEN = 'registry-bridge.registry.token';
-
     /**
      * Container key marking the settings as applied for the current request or job.
      */
@@ -51,10 +47,7 @@ class RegistrySettings
      * Setting key => `registry-bridge.registry` config key.
      */
     public const KEYS = [
-        self::SETTING_HOST                           => 'host',
-        self::SETTING_TOKEN                          => 'token',
         InstanceRegistration::SETTING_SERVICE_URL    => 'service_url',
-        InstanceRegistration::SETTING_API_VERSION    => 'api_version',
         InstanceRegistration::SETTING_INSTANCE_TOKEN => 'instance_token',
         InstanceRegistration::SETTING_INSTANCE       => 'instance',
     ];
diff --git a/server/src/Support/ServiceCatalog.php b/server/src/Support/ServiceCatalog.php
index 9805881..0199fc0 100644
--- a/server/src/Support/ServiceCatalog.php
+++ b/server/src/Support/ServiceCatalog.php
@@ -3,6 +3,9 @@
 namespace Fleetbase\RegistryBridge\Support;
 
 use Fleetbase\RegistryBridge\Exceptions\RegistryException;
+use Fleetbase\RegistryBridge\Support\Installer\Files;
+use Fleetbase\RegistryBridge\Support\Installer\InstallerConfig;
+use Fleetbase\Support\Utils;
 use Illuminate\Http\Request;
 use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Support\Arr;
@@ -10,8 +13,8 @@
 /**
  * Explore, Installed and Purchased data read from the Registry Service (v2).
  *
- * Service listings are mapped into the shape the `RegistryExtension` resource produces so the console renders
- * them with the existing components. Instance state comes from the instance API:
+ * Service listings are mapped into the shape the console's `registry-extension` model reads. Instance state
+ * comes from the instance API:
  *
  * - `is_installed` and `update_available` from `GET /v1/instances/me/updates` (plus local install records),
  * - `is_purchased` from the organization's paid licences in `GET /v1/instances/me`,
@@ -31,7 +34,9 @@ class ServiceCatalog
     /**
      * One page of Explore, mapped, with the Explore request parameters (`query`, `category`, `page`, `limit`).
      *
-     * Listings whose hosting excludes this instance's kind are filtered out by the service.
+     * Every published listing is returned, including those whose hosting excludes this instance's kind: they
+     * carry `install_blocked_code` `hosting` and the reason, so the console can show why they cannot be
+     * installed here.
      *
      * @param array<int, string> $localPackages package names installed on this instance according to local records
      *
@@ -41,20 +46,36 @@ class ServiceCatalog
      */
     public static function query(Request $request, RegistryClient $client, RegistryConfig $config, array $localPackages = []): LengthAwarePaginator
     {
-        $search   = trim(static::str($request->input('query', '')));
-        $category = trim(static::str($request->input('category', '')));
-        $limit    = static::int($request->input('limit', static::DEFAULT_LIMIT), static::DEFAULT_LIMIT);
-        $page     = max(1, static::int($request->input('page', 1), 1));
+        $search        = trim(static::str($request->input('query', '')));
+        $category      = trim(static::str($request->input('category', '')));
+        $limit         = static::int($request->input('limit', static::DEFAULT_LIMIT), static::DEFAULT_LIMIT);
+        $page          = max(1, static::int($request->input('page', 1), 1));
+        $hideInstalled = Utils::castBoolean($request->input('hide_installed', false)) === true;
 
         $filters = array_filter([
             'q'        => $search,
             'category' => $category,
-            'hosting'  => $config->instanceKind(),
-            'sort'     => static::str($request->input('sort', '')),
+            'pricing'  => static::pricingFilter($request->input('pricing')),
+            'hosting'  => static::hostingFilter($request->input('hosting')),
+            'sort'     => static::sortFilter($request->input('sort')),
         ], fn ($value) => $value !== '');
 
         $state = static::state($client, $config, $localPackages);
 
+        // Installed state is only known here, so hiding installed listings pages over the whole filtered catalog
+        if ($hideInstalled) {
+            $items = array_values(array_filter(
+                static::transformMany($client->allCatalogExtensions($filters), $state, $client->host()),
+                fn (array $item) => $item['is_installed'] !== true
+            ));
+            $limit = $limit === -1 ? max(1, count($items)) : max(1, min($limit, static::MAX_LIMIT));
+
+            return new LengthAwarePaginator(array_slice($items, ($page - 1) * $limit, $limit), count($items), $limit, $page, [
+                'path'  => $request->url(),
+                'query' => $request->query(),
+            ]);
+        }
+
         if ($limit === -1) {
             $listings = $client->allCatalogExtensions($filters);
             $items    = static::transformMany($listings, $state, $client->host());
@@ -152,7 +173,9 @@ public static function installed(RegistryClient $client, RegistryConfig $config,
     }
 
     /**
-     * Extensions the instance's organization holds an active paid licence for.
+     * Extensions the instance's organization bought: active paid licences, and paid licences the service has
+     * since revoked (refund, dispute, staff) so their state and receipt stay visible. A revoked licence does
+     * not entitle installs; `is_purchased` stays false for it and `meta.licence_state` says why.
      *
      * @param array<int, string> $localPackages
      *
@@ -167,7 +190,7 @@ public static function purchased(RegistryClient $client, RegistryConfig $config,
 
         $purchased = [];
         foreach ($state['licences'] as $id => $licence) {
-            if (!static::isPaidLicence($licence)) {
+            if (!static::isPaidKind($licence)) {
                 continue;
             }
 
@@ -213,7 +236,7 @@ public static function lookup(string $package, RegistryClient $client): ?array
      *
      * @param array<int, string> $localPackages
      *
-     * @return array{registered: bool, kind: string, installed: array<string, array<string, mixed>>, licences: array<string, array<string, mixed>>, local_packages: array<int, string>, local_ids: array<int, string>, error: string|null}
+     * @return array{registered: bool, kind: string, checkout: bool, installed: array<string, array<string, mixed>>, licences: array<string, array<string, mixed>>, local_packages: array<int, string>, local_ids: array<int, string>, error: string|null}
      */
     public static function state(RegistryClient $client, RegistryConfig $config, array $localPackages = []): array
     {
@@ -230,22 +253,79 @@ public static function state(RegistryClient $client, RegistryConfig $config, arr
             }
         }
 
-        $state          = static::buildState($me, $updates, $localPackages, $client->hasToken(), $config->instanceKind());
-        $state['error'] = $error;
+        $state             = static::buildState($me, $updates, $localPackages, $client->hasToken(), $config->instanceKind(), ServiceCheckout::available($config));
+        $state['receipts'] = ServiceReceipts::all($config);
+        $state['error']    = $error;
+        $state['console']  = app()->bound(InstallerConfig::class) ? static::consoleState(app(InstallerConfig::class)) : null;
 
         return $state;
     }
 
+    /**
+     * What the console build can take, for `install_mode`: the module versions in its host-modules.json (null
+     * when the build has none, so it cannot load prebuilt engines) and the engines built into it.
+     *
+     * @return array{host_versions: array<string, string>|null, built_in: array<int, string>}
+     */
+    public static function consoleState(InstallerConfig $config): array
+    {
+        $hostModules = Files::readJson($config->hostModulesFile());
+        $package     = Files::readJson(rtrim($config->consolePath, '/') . '/package.json') ?? [];
+
+        return [
+            'host_versions' => is_array($hostModules) ? array_filter((array) ($hostModules['versions'] ?? []), 'is_string') : null,
+            'built_in'      => array_keys(array_merge((array) ($package['dependencies'] ?? []), (array) ($package['devDependencies'] ?? []))),
+        ];
+    }
+
+    /**
+     * How the installer will most likely install a release, for the console's time estimate: `runtime` when it
+     * has a prebuilt dist this console can load (a host-modules.json, the same ember-ui and ember-core minor, the
+     * engine not already built in), `build` when it needs a console rebuild, `server` without an engine. The
+     * installer decides for real (ExtensionInstaller); this mirrors its checks without the dist in hand.
+     *
+     * @param array{host_versions: array<string, string>|null, built_in: array<int, string>}|null $console null when unknown
+     */
+    public static function installMode(?string $engine, mixed $dist, ?array $console): string
+    {
+        if ($engine === null) {
+            return 'server';
+        }
+        if (!is_array($dist) || static::str($dist['sha256'] ?? null) === '') {
+            return 'build';
+        }
+        if ($console === null) {
+            return 'runtime';
+        }
+        if ($console['host_versions'] === null || in_array($engine, $console['built_in'], true)) {
+            return 'build';
+        }
+        foreach ((array) ($dist['built_against'] ?? []) as $package => $built) {
+            $host = $console['host_versions'][$package] ?? null;
+            if (is_string($host) && is_string($built) && static::minor($host) !== static::minor($built)) {
+                return 'build';
+            }
+        }
+
+        return 'runtime';
+    }
+
+    protected static function minor(string $version): string
+    {
+        return preg_match('/^\D*(\d+)\.(\d+)/', $version, $match) ? $match[1] . '.' . $match[2] : $version;
+    }
+
     /**
      * Index the instance API responses by extension id.
      *
      * @param array<string, mixed> $me            `GET /v1/instances/me` body
      * @param array<string, mixed> $updates       `GET /v1/instances/me/updates` body
      * @param array<int, string>   $localPackages
+     * @param bool                 $checkout      whether paid listings can be bought through the service checkout
      *
-     * @return array{registered: bool, kind: string, installed: array<string, array<string, mixed>>, licences: array<string, array<string, mixed>>, local_packages: array<int, string>, local_ids: array<int, string>, error: string|null}
+     * @return array{registered: bool, kind: string, checkout: bool, installed: array<string, array<string, mixed>>, licences: array<string, array<string, mixed>>, local_packages: array<int, string>, local_ids: array<int, string>, error: string|null}
      */
-    public static function buildState(array $me = [], array $updates = [], array $localPackages = [], bool $registered = false, string $kind = RegistryConfig::KIND_SELF_HOSTED): array
+    public static function buildState(array $me = [], array $updates = [], array $localPackages = [], bool $registered = false, string $kind = RegistryConfig::KIND_SELF_HOSTED, bool $checkout = false): array
     {
         $installed = [];
         foreach ((array) ($updates['data'] ?? []) as $entry) {
@@ -262,8 +342,8 @@ public static function buildState(array $me = [], array $updates = [], array $lo
                 continue;
             }
 
-            // Prefer an active paid licence over a free one for the same extension
-            if (!isset($licences[$id]) || static::isPaidLicence($licence)) {
+            // Prefer an active paid licence, then a revoked paid one (kept for its state and receipt), then any other
+            if (!isset($licences[$id]) || static::licenceRank($licence) > static::licenceRank($licences[$id])) {
                 $licences[$id] = $licence;
             }
         }
@@ -271,6 +351,8 @@ public static function buildState(array $me = [], array $updates = [], array $lo
         return [
             'registered'     => $registered,
             'kind'           => $kind,
+            'checkout'       => $checkout,
+            'receipts'       => [],
             'installed'      => $installed,
             'licences'       => $licences,
             'local_packages' => array_values(array_filter($localPackages, fn ($name) => is_string($name) && $name !== '')),
@@ -291,7 +373,7 @@ public static function transformMany(array $listings, array $state = [], ?string
     }
 
     /**
-     * Map one service listing (summary or full) into the local `RegistryExtension` resource shape.
+     * Map one service listing (summary or full) into the console's `registry-extension` shape.
      *
      * @param array<string, mixed> $listing entry from `GET /v1/catalog/extensions[/{slug}]`
      * @param array<string, mixed> $state   from `buildState()`
@@ -315,6 +397,9 @@ public static function transform(array $listing, array $state = [], ?string $ser
 
         $update      = static::arr(static::arr($state['installed'] ?? null)[$id] ?? null) ?: null;
         $licence     = static::arr(static::arr($state['licences'] ?? null)[$id] ?? null) ?: null;
+        if ($licence !== null) {
+            $licence = static::withReceipt($licence, static::arr(static::arr($state['receipts'] ?? null)[$id] ?? null));
+        }
         $local       = (array) ($state['local_packages'] ?? []);
         $isLocal     = in_array($id, (array) ($state['local_ids'] ?? []), true)
             || ($id !== '' && in_array($id, $local, true))
@@ -324,20 +409,18 @@ public static function transform(array $listing, array $state = [], ?string $ser
 
         $installedVersion = $update ? static::str(Arr::get($update, 'installed.version')) : '';
         $updateVersion    = $update ? static::str(Arr::get($update, 'latest.version')) : '';
+        $console          = is_array($state['console'] ?? null) ? $state['console'] : null;
+        $nextDist         = $updateVersion !== '' ? Arr::get($update, 'latest.dist') : Arr::get($release, 'dist');
 
-        $blockedReason = static::installBlockedReason($registered, $hosting, $kind, $isPaid, $isPurchased, $names, $latest);
+        $checkout      = (bool) ($state['checkout'] ?? false);
+        $blocked       = static::installBlock($registered, $hosting, $kind, $isPaid, $isPurchased, $names, $latest, $checkout);
+        $blockedReason = $blocked['reason'] ?? null;
 
         return [
             'id'                       => $id,
             'uuid'                     => $id,
             'public_id'                => $id,
-            'company_uuid'             => null,
-            'created_by_uuid'          => null,
-            'registry_user_uuid'       => null,
             'category_uuid'            => $category['id'] ?? null,
-            'current_bundle_uuid'      => null,
-            'next_bundle_uuid'         => null,
-            'icon_uuid'                => null,
             'name'                     => Arr::get($listing, 'name'),
             'subtitle'                 => Arr::get($listing, 'subtitle'),
             'description'              => Arr::get($listing, 'description', Arr::get($listing, 'subtitle')),
@@ -361,19 +444,11 @@ public static function transform(array $listing, array $state = [], ?string $ser
             'sale_price'               => isset($price['sale_amount']) ? static::int($price['sale_amount']) : null,
             'on_sale'                  => (bool) ($price['on_sale'] ?? false),
             'currency'                 => static::str($price['currency'] ?? '') ?: 'USD',
-            'subscription_required'    => false,
             'core_extension'           => false,
-            'self_managed'             => false,
             'installs_count'           => static::int(Arr::get($listing, 'installs_count', 0)),
             'category_name'            => $category['name'] ?? null,
             'publisher_name'           => Arr::get($listing, 'publisher.name'),
             'current_bundle_version'   => $latest ?: null,
-            'current_bundle_id'        => Arr::get($release, 'id'),
-            'current_bundle_public_id' => Arr::get($release, 'id'),
-            'current_bundle_filename'  => null,
-            'next_bundle_id'           => null,
-            'next_bundle_public_id'    => null,
-            'next_bundle_filename'     => null,
             'category'                 => $category,
             'screenshots'              => static::screenshots(Arr::get($listing, 'screenshots', [])),
             'is_installed'             => $isInstalled,
@@ -386,7 +461,6 @@ public static function transform(array $listing, array $state = [], ?string $ser
             'source'                   => static::SOURCE,
             'meta'                     => [
                 'source'                 => static::SOURCE,
-                'api_version'            => RegistryConfig::V2,
                 'registry_host'          => $serviceUrl,
                 'packages'               => $names,
                 'package_names'          => $packages,
@@ -395,8 +469,14 @@ public static function transform(array $listing, array $state = [], ?string $ser
                 'compat'                 => Arr::get($listing, 'compat', Arr::get($release, 'compat')),
                 'latest_release'         => $release ?: null,
                 'licence'                => $licence,
+                'licence_state'          => static::licenceState($licence),
                 'install_blocked_reason' => $blockedReason,
+                'install_blocked_code'   => $blocked['code'] ?? null,
+                'purchase_available'     => ($blocked['code'] ?? null) === 'licence_required' && $checkout,
                 'versions'               => array_values((array) Arr::get($listing, 'versions', [])),
+                // the time estimate in the install and uninstall dialogs: `runtime` (minutes), `build` (a rebuild)
+                'install_mode'           => static::installMode($packages['npm'], $nextDist, $console),
+                'uninstall_mode'         => $packages['npm'] !== null && $console !== null && in_array($packages['npm'], $console['built_in'], true) ? 'build' : 'runtime',
             ],
             'published_at'             => Arr::get($listing, 'published_at'),
             'created_at'               => Arr::get($listing, 'created_at'),
@@ -444,6 +524,143 @@ public static function transformCategory(mixed $category): ?array
         ];
     }
 
+    /**
+     * Sidebar counts from the instance state: installed extensions (service records and local installs),
+     * those with an update, and active paid licences.
+     *
+     * @param array<string, mixed> $state    from `buildState()`
+     * @param array<int, string>   $localIds extension ids installed according to local records
+     *
+     * @return array{installed: int, updates: int, purchased: int}
+     */
+    public static function counts(array $state, array $localIds = []): array
+    {
+        $installed = static::arr($state['installed'] ?? null);
+        $ids       = array_unique(array_merge(array_map('strval', array_keys($installed)), array_values(array_filter($localIds, 'is_string'))));
+        $updates   = array_filter($installed, fn ($entry) => is_array($entry) && ($entry['update_available'] ?? false) === true);
+        $purchased = array_filter(static::arr($state['licences'] ?? null), fn ($licence) => is_array($licence) && static::isPaidLicence($licence));
+
+        return ['installed' => count($ids), 'updates' => count($updates), 'purchased' => count($purchased)];
+    }
+
+    /**
+     * A licence with `receipt_url` (and `purchase`) filled in: from the licence itself when the service sends it
+     * (`receipt_url`, or a `purchase` object with one), else from the receipt this instance kept when its
+     * checkout completed.
+     *
+     * @param array<string, mixed> $licence
+     * @param array<string, mixed> $stored  `ServiceReceipts` record: `receipt_url`, `purchase`, `amount_total`, `currency`, `purchased_at`
+     *
+     * @return array<string, mixed>
+     */
+    public static function withReceipt(array $licence, array $stored = []): array
+    {
+        $purchase = is_array($licence['purchase'] ?? null) ? $licence['purchase'] : [];
+        $receipt  = static::str($licence['receipt_url'] ?? '') ?: (static::str($purchase['receipt_url'] ?? '') ?: (static::str($stored['receipt_url'] ?? '') ?: null));
+
+        $licence['receipt_url'] = $receipt;
+        if ($purchase === [] && $stored !== []) {
+            $licence['purchase'] = array_filter([
+                'id'           => $stored['purchase'] ?? (is_string($licence['purchase'] ?? null) ? $licence['purchase'] : null),
+                'amount_total' => $stored['amount_total'] ?? null,
+                'currency'     => $stored['currency'] ?? null,
+                'receipt_url'  => $receipt,
+                'created_at'   => $stored['purchased_at'] ?? null,
+            ], fn ($value) => $value !== null);
+        }
+
+        return $licence;
+    }
+
+    /**
+     * The service `pricing` filter: `free`, `paid`, or empty for both.
+     */
+    public static function pricingFilter(mixed $pricing): string
+    {
+        $pricing = strtolower(trim(static::str($pricing)));
+
+        return in_array($pricing, ['free', 'paid'], true) ? $pricing : '';
+    }
+
+    /**
+     * The service `hosting` filter: `cloud` or `self_hosted` (listings for that kind, `both` included) or `both`
+     * (listings for either kind); empty for every listing.
+     */
+    public static function hostingFilter(mixed $hosting): string
+    {
+        $hosting = strtolower(trim(static::str($hosting)));
+
+        return in_array($hosting, [RegistryConfig::KIND_CLOUD, RegistryConfig::KIND_SELF_HOSTED, 'both'], true) ? $hosting : '';
+    }
+
+    /**
+     * The service `sort`: `popular` (default), `newest`, `updated`, `name` or `price`.
+     */
+    public static function sortFilter(mixed $sort): string
+    {
+        $sort = strtolower(trim(static::str($sort)));
+
+        return in_array($sort, ['popular', 'newest', 'updated', 'name', 'price'], true) ? $sort : '';
+    }
+
+    /**
+     * Releases of a listing for the console's Versions tab, newest first, or null when the service does not
+     * have the listing.
+     *
+     * @return array{latest: string|null, channels: array<string, string>, releases: array<int, array<string, mixed>>}|null
+     *
+     * @throws RegistryException
+     */
+    public static function releases(string $id, RegistryClient $client, ?string $installedVersion = null): ?array
+    {
+        $payload = $client->catalogReleases($id);
+        if ($payload === null) {
+            return null;
+        }
+
+        return static::transformReleases($payload, $installedVersion);
+    }
+
+    /**
+     * Map a releases payload: each release with `is_latest`, `is_installed` and `is_yanked` flags.
+     *
+     * @param array<string, mixed> $payload `{latest, channels, releases}` from the service
+     *
+     * @return array{latest: string|null, channels: array<string, string>, releases: array<int, array<string, mixed>>}
+     */
+    public static function transformReleases(array $payload, ?string $installedVersion = null): array
+    {
+        $latest   = static::str($payload['latest'] ?? '') ?: null;
+        $releases = [];
+        foreach ((array) ($payload['releases'] ?? []) as $release) {
+            if (!is_array($release) || static::str($release['version'] ?? '') === '') {
+                continue;
+            }
+
+            $version    = static::str($release['version']);
+            $releases[] = [
+                'id'           => $release['id'] ?? null,
+                'version'      => $version,
+                'channel'      => static::str($release['channel'] ?? '') ?: 'stable',
+                'status'       => static::str($release['status'] ?? '') ?: 'published',
+                'compat'       => is_array($release['compat'] ?? null) ? $release['compat'] : [],
+                'size_bytes'   => static::int($release['size_bytes'] ?? 0),
+                'notes'        => $release['notes'] ?? null,
+                'published_at' => $release['published_at'] ?? null,
+                'yanked_at'    => $release['yanked_at'] ?? null,
+                'is_latest'    => $version === $latest,
+                'is_installed' => $installedVersion !== null && $version === $installedVersion,
+                'is_yanked'    => ($release['status'] ?? null) === 'yanked' || ($release['yanked_at'] ?? null) !== null,
+            ];
+        }
+
+        return [
+            'latest'   => $latest,
+            'channels' => array_filter((array) ($payload['channels'] ?? []), 'is_string'),
+            'releases' => $releases,
+        ];
+    }
+
     /**
      * `{npm, composer}` package names a listing declares.
      *
@@ -484,24 +701,39 @@ public static function findListingByPackage(array $listings, string $package): ?
      *
      * @param array<int, string> $packageNames
      */
-    public static function installBlockedReason(bool $registered, string $hosting, string $kind, bool $isPaid, bool $isPurchased, array $packageNames, string $version): ?string
+    public static function installBlockedReason(bool $registered, string $hosting, string $kind, bool $isPaid, bool $isPurchased, array $packageNames, string $version, bool $checkout = false): ?string
+    {
+        return static::installBlock($registered, $hosting, $kind, $isPaid, $isPurchased, $packageNames, $version, $checkout)['reason'] ?? null;
+    }
+
+    /**
+     * Why this instance cannot install a listing, as a code the console branches on (`not_registered`,
+     * `hosting`, `licence_required`, `no_release`) and the sentence it shows, or null when it can.
+     *
+     * @param array<int, string> $packageNames
+     *
+     * @return array{code: string, reason: string}|null
+     */
+    public static function installBlock(bool $registered, string $hosting, string $kind, bool $isPaid, bool $isPurchased, array $packageNames, string $version, bool $checkout = false): ?array
     {
         if (!$registered) {
-            return 'Register this instance with the registry service to install extensions.';
+            return ['code' => 'not_registered', 'reason' => 'Register this instance with the registry service to install extensions.'];
         }
 
         if ($hosting !== 'both' && $hosting !== $kind) {
-            return $hosting === RegistryConfig::KIND_CLOUD
+            return ['code' => 'hosting', 'reason' => $hosting === RegistryConfig::KIND_CLOUD
                 ? 'This extension is only available on Fleetbase Cloud.'
-                : 'This extension is only available on self-hosted instances.';
+                : 'This extension is only available on self-hosted instances.'];
         }
 
         if ($isPaid && !$isPurchased) {
-            return 'Your organization does not hold a licence for this extension. Purchasing through the registry service is not available yet.';
+            return ['code' => 'licence_required', 'reason' => $checkout
+                ? 'Purchase a licence for your organization to install this extension.'
+                : 'Your organization does not hold a licence for this extension. Purchasing through the registry service is not available yet.'];
         }
 
         if ($packageNames === [] || $version === '') {
-            return 'This extension has no published release to install.';
+            return ['code' => 'no_release', 'reason' => 'This extension has no published release to install.'];
         }
 
         return null;
@@ -512,7 +744,47 @@ public static function installBlockedReason(bool $registered, string $hosting, s
      */
     public static function isPaidLicence(array $licence): bool
     {
-        return ($licence['kind'] ?? null) === 'paid' && ($licence['status'] ?? null) === 'active';
+        return static::isPaidKind($licence) && ($licence['status'] ?? null) === 'active';
+    }
+
+    /**
+     * Whether the licence was bought, whatever its status now. Not an entitlement: see `isPaidLicence()`.
+     *
+     * @param array<string, mixed> $licence
+     */
+    public static function isPaidKind(array $licence): bool
+    {
+        return ($licence['kind'] ?? null) === 'paid';
+    }
+
+    /**
+     * What the console shows for a licence: `active`, `refunded` (revoked by a refund), `revoked` (dispute,
+     * staff or a reason this bridge does not know), or the service's status as is; null without a licence.
+     *
+     * @param array<string, mixed>|null $licence
+     */
+    public static function licenceState(?array $licence): ?string
+    {
+        $status = static::str($licence['status'] ?? '');
+        if ($status === '') {
+            return null;
+        }
+
+        if ($status === 'revoked') {
+            return static::str($licence['revoked_reason'] ?? '') === 'refunded' ? 'refunded' : 'revoked';
+        }
+
+        return $status;
+    }
+
+    /**
+     * Which licence `buildState()` keeps when an organization holds several for one extension.
+     *
+     * @param array<string, mixed> $licence
+     */
+    protected static function licenceRank(array $licence): int
+    {
+        return static::isPaidLicence($licence) ? 2 : (static::isPaidKind($licence) ? 1 : 0);
     }
 
     /**
diff --git a/server/src/Support/ServiceCheckout.php b/server/src/Support/ServiceCheckout.php
new file mode 100644
index 0000000..505cb01
--- /dev/null
+++ b/server/src/Support/ServiceCheckout.php
@@ -0,0 +1,125 @@
+<?php
+
+namespace Fleetbase\RegistryBridge\Support;
+
+use Fleetbase\RegistryBridge\Exceptions\RegistryException;
+use Fleetbase\RegistryBridge\Exceptions\RegistryServiceException;
+use Illuminate\Support\Facades\Cache;
+
+/**
+ * Purchases through the Registry Service checkout ("Instance checkout" in the service README).
+ *
+ * The console starts a hosted Stripe Checkout (`POST /v1/instances/me/purchases/checkout`), redirects the
+ * buyer to its `url`, and when Stripe sends the buyer back with `handoff=<id>` polls
+ * `GET /v1/instances/me/purchases/{handoff}` until the webhook has created the purchase and licence. The
+ * hand-off is `open`, then `complete` (with `purchase`, its `receipt_url` and `licence`) or `expired`.
+ */
+class ServiceCheckout
+{
+    public const PENDING = 'pending';
+
+    public const COMPLETED = 'completed';
+
+    public const FAILED = 'failed';
+
+    /** How long a service without the checkout endpoint is remembered, in seconds. */
+    public const UNSUPPORTED_TTL = 3600;
+
+    /** Hand-off statuses mapped onto the three the console shows. */
+    protected const STATUS_MAP = [
+        'open'     => self::PENDING,
+        'complete' => self::COMPLETED,
+        'expired'  => self::FAILED,
+    ];
+
+    /**
+     * Whether paid listings can be bought here: a registered instance whose service has not answered that it
+     * has no checkout (`REGISTRY_SERVICE_CHECKOUT` forces it either way).
+     */
+    public static function available(RegistryConfig $config): bool
+    {
+        return $config->checkoutEnabled(!Cache::has(static::unsupportedKey($config)));
+    }
+
+    /**
+     * Start a checkout for one listing and return where to send the buyer.
+     *
+     * @return array{url: string, handoff: string, status: string, amount: int|null, currency: string|null}
+     *
+     * @throws RegistryException when checkout is off, the service lacks the endpoint, or it refuses
+     */
+    public static function start(RegistryClient $client, RegistryConfig $config, string $extension, string $returnUrl, ?string $cancelUrl = null, ?string $email = null): array
+    {
+        if (!$config->isRegistered()) {
+            throw new RegistryServiceException('Register this instance with the registry service before purchasing extensions.', 409);
+        }
+
+        if (!static::available($config)) {
+            throw new RegistryServiceException(static::unavailableReason(), 409);
+        }
+
+        try {
+            $checkout = $client->createCheckout([
+                'extension'  => $extension,
+                'return_url' => $returnUrl,
+                'cancel_url' => $cancelUrl,
+                'email'      => $email,
+            ]);
+        } catch (RegistryServiceException $e) {
+            if (in_array($e->status(), [404, 405], true) && static::isMissingEndpoint($e)) {
+                Cache::put(static::unsupportedKey($config), true, static::UNSUPPORTED_TTL);
+
+                throw new RegistryServiceException(static::unavailableReason(), 501, [], [], $e);
+            }
+
+            throw $e;
+        }
+
+        return $checkout;
+    }
+
+    /**
+     * The hand-off as the console reads it: `status` (pending, completed or failed), the service's own status,
+     * the extension, the purchase and its receipt.
+     *
+     * @param array<string, mixed> $body `GET /v1/instances/me/purchases/{handoff}` body
+     *
+     * @return array{status: string, service_status: string|null, handoff: string|null, extension: array<string, mixed>|null, purchase: array<string, mixed>|null, receipt_url: string|null, amount: int|null, currency: string|null, expires_at: string|null}
+     */
+    public static function describe(array $body): array
+    {
+        $serviceStatus = is_string($body['status'] ?? null) ? strtolower($body['status']) : null;
+        $purchase      = is_array($body['purchase'] ?? null) ? $body['purchase'] : null;
+        $receipt       = $purchase['receipt_url'] ?? null;
+
+        return [
+            'status'         => static::STATUS_MAP[$serviceStatus] ?? static::PENDING,
+            'service_status' => $serviceStatus,
+            'handoff'        => is_string($body['handoff'] ?? null) ? $body['handoff'] : null,
+            'extension'      => is_array($body['extension'] ?? null) ? $body['extension'] : null,
+            'purchase'       => $purchase,
+            'receipt_url'    => is_string($receipt) ? $receipt : null,
+            'amount'         => is_numeric($body['amount'] ?? null) ? (int) $body['amount'] : null,
+            'currency'       => is_string($body['currency'] ?? null) ? $body['currency'] : null,
+            'expires_at'     => is_string($body['expires_at'] ?? null) ? $body['expires_at'] : null,
+        ];
+    }
+
+    public static function unavailableReason(): string
+    {
+        return 'Purchasing through the registry service is not available yet.';
+    }
+
+    /**
+     * A 404 for an unknown extension carries the service's message; a missing route does not.
+     */
+    protected static function isMissingEndpoint(RegistryServiceException $e): bool
+    {
+        return $e->status() === 405 || !str_contains(strtolower($e->getMessage()), 'extension');
+    }
+
+    protected static function unsupportedKey(RegistryConfig $config): string
+    {
+        return 'registry-bridge:checkout-unsupported:' . sha1((string) $config->serviceUrl());
+    }
+}
diff --git a/server/src/Support/ServiceReceipts.php b/server/src/Support/ServiceReceipts.php
new file mode 100644
index 0000000..8fbcb9a
--- /dev/null
+++ b/server/src/Support/ServiceReceipts.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace Fleetbase\RegistryBridge\Support;
+
+use Illuminate\Support\Facades\Cache;
+
+/**
+ * Stripe receipts of purchases made from this console, keyed by extension id.
+ *
+ * The service puts the receipt on the completed checkout hand-off; its `GET /v1/instances/me` licences
+ * do not carry it yet. The receipt is kept here when the hand-off completes so Purchased can link it, and
+ * a receipt the service sends on the licence always wins (`ServiceCatalog::withReceipt`).
+ */
+class ServiceReceipts
+{
+    protected const CACHE_PREFIX = 'registry-bridge:receipts';
+
+    /**
+     * Keep the receipt of a completed hand-off (`ServiceCheckout::describe()` shape).
+     *
+     * @param array<string, mixed> $handoff
+     */
+    public static function remember(RegistryConfig $config, array $handoff): void
+    {
+        $extension = is_array($handoff['extension'] ?? null) ? ($handoff['extension']['id'] ?? null) : null;
+        if (!is_string($extension) || $extension === '' || ($handoff['status'] ?? null) !== ServiceCheckout::COMPLETED) {
+            return;
+        }
+
+        $purchase             = is_array($handoff['purchase'] ?? null) ? $handoff['purchase'] : [];
+        $receipts             = static::all($config);
+        $receipts[$extension] = array_filter([
+            'receipt_url'  => $handoff['receipt_url'] ?? ($purchase['receipt_url'] ?? null),
+            'purchase'     => $purchase['id'] ?? null,
+            'amount_total' => $purchase['amount_total'] ?? null,
+            'currency'     => $purchase['currency'] ?? null,
+            'purchased_at' => $purchase['created_at'] ?? null,
+        ], fn ($value) => $value !== null);
+
+        Cache::forever(static::key($config), $receipts);
+    }
+
+    /**
+     * @return array<string, array<string, mixed>>
+     */
+    public static function all(RegistryConfig $config): array
+    {
+        $receipts = Cache::get(static::key($config), []);
+
+        return is_array($receipts) ? array_filter($receipts, 'is_array') : [];
+    }
+
+    protected static function key(RegistryConfig $config): string
+    {
+        return static::CACHE_PREFIX . ':' . sha1((string) $config->serviceUrl() . '|' . ($config->instance()['id'] ?? ''));
+    }
+}
diff --git a/server/src/Support/Utils.php b/server/src/Support/Utils.php
deleted file mode 100644
index 8643a4e..0000000
--- a/server/src/Support/Utils.php
+++ /dev/null
@@ -1,154 +0,0 @@
-<?php
-
-namespace Fleetbase\RegistryBridge\Support;
-
-use Fleetbase\Support\Utils as SupportUtils;
-use Stripe\StripeClient;
-
-class Utils extends SupportUtils
-{
-    /**
-     * Get the StripeClient instance.
-     */
-    public static function getStripeClient(array $options = []): ?StripeClient
-    {
-        return new StripeClient([
-            'api_key' => config('registry-bridge.stripe.secret'),
-            ...$options,
-        ]);
-    }
-
-    /**
-     * Set the npm configuration for the console.
-     *
-     * This function sets the npm configuration in the .npmrc file located in the console path.
-     * It sets the registry for npm and the Fleetbase scope registry.
-     * If the .npmrc file does not exist or if the reset flag is set to true, it writes the configuration to the file.
-     *
-     * @param bool $reset whether to reset the configuration if the file already exists
-     *
-     * @return bool true if the configuration was set, false otherwise
-     */
-    public static function setConsoleNpmrcConfig(bool $reset = false): bool
-    {
-        $npmrcPath             = static::consolePath('.npmrc');
-        $registryHost          = config('registry-bridge.registry.host', env('REGISTRY_HOST', 'https://registry.fleetbase.io'));
-        $config                = implode(PHP_EOL, [
-            'registry=https://registry.npmjs.org/',
-            '@fleetbase:registry=' . rtrim($registryHost, '/') . '/',
-        ]) . PHP_EOL;
-
-        if (!file_exists($npmrcPath) || $reset === true) {
-            file_put_contents($npmrcPath, $config, LOCK_EX);
-
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Set the global npm authentication token.
-     *
-     * This function sets the authentication token in the global .npmrc file located in the user's home directory.
-     * If the .npmrc file does not exist or if the reset flag is set to true, it writes the authentication token to the file.
-     *
-     * @param bool $reset whether to reset the configuration if the file already exists
-     *
-     * @return bool true if the authentication token was set, false otherwise
-     */
-    public static function setGlobalNpmrcAuthKey(bool $reset = false): bool
-    {
-        $homePath               = rtrim(getenv('HOME'), DIRECTORY_SEPARATOR);
-        $npmrcPath              = $homePath . DIRECTORY_SEPARATOR . '.npmrc';
-        $registryHost           = config('registry-bridge.registry.host', env('REGISTRY_HOST', 'https://registry.fleetbase.io'));
-        $registryToken          = config('registry-bridge.registry.token', env('REGISTRY_TOKEN'));
-        $authString             = '//' . str_replace(['http://', 'https://'], '', rtrim($registryHost, '/')) . '/:_authToken="' . $registryToken . '"' . PHP_EOL;
-
-        if (!file_exists($npmrcPath) || $reset === true) {
-            file_put_contents($npmrcPath, $authString, LOCK_EX);
-
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Set the Composer authentication configuration.
-     *
-     * This function sets or updates the auth.json file with the registry token for authentication.
-     * It ensures that no bearer tokens with null or empty values are set.
-     *
-     * @return bool true if the operation was successful, otherwise false
-     *
-     * @throws \RuntimeException if there is a JSON encoding/decoding error
-     */
-    public static function setComposerAuthConfig(): bool
-    {
-        $composerAuthPath = base_path('auth.json');
-        $registryHost     = static::getDomainFromUrl(config('registry-bridge.registry.host', env('REGISTRY_HOST', 'https://registry.fleetbase.io')), true);
-        $registryToken    = config('registry-bridge.registry.token', env('REGISTRY_TOKEN'));
-
-        // Ensure the registry token is not null or empty
-        if (empty($registryToken)) {
-            return false;
-        }
-
-        $newBearerConfig = [
-            'bearer' => [
-                $registryHost => $registryToken,
-            ],
-        ];
-
-        $currentConfig = [];
-
-        if (file_exists($composerAuthPath)) {
-            $jsonContent   = file_get_contents($composerAuthPath);
-            $currentConfig = json_decode($jsonContent, true);
-            if ($currentConfig === null && json_last_error() !== JSON_ERROR_NONE) {
-                throw new \RuntimeException('Failed to decode JSON: ' . json_last_error_msg());
-            }
-
-            // Merge existing config with the new bearer config
-            if (isset($currentConfig['bearer'])) {
-                $currentConfig['bearer'] = array_merge($currentConfig['bearer'], $newBearerConfig['bearer']);
-            } else {
-                $currentConfig['bearer'] = $newBearerConfig['bearer'];
-            }
-        } else {
-            $currentConfig = $newBearerConfig;
-        }
-
-        $jsonContent = json_encode($currentConfig, JSON_PRETTY_PRINT);
-        if ($jsonContent === false) {
-            throw new \RuntimeException('Failed to encode JSON: ' . json_last_error_msg());
-        }
-
-        file_put_contents($composerAuthPath, $jsonContent, LOCK_EX);
-
-        return true;
-    }
-
-    /**
-     * Initializes and sets up the npm registry authentication configuration.
-     *
-     * This method constructs the registry authentication string from configuration settings,
-     * checks for the existence of an npmrc file in the user's home directory, and creates it
-     * with the registry authentication string if it doesn't already exist.
-     *
-     * The registry configuration and token are pulled from the application's configuration files.
-     * It ensures the path to the .npmrc file is correctly formed regardless of trailing slashes
-     * in the HOME directory path or the registry host configuration.
-     *
-     * @param bool $reset - Overwrites existing file, "resetting" the .npmrc
-     *
-     * @return void
-     */
-    public static function bootRegistryAuth(bool $reset = false)
-    {
-        Utils::setConsoleNpmrcConfig($reset);
-        Utils::setGlobalNpmrcAuthKey($reset);
-        Utils::setComposerAuthConfig();
-    }
-}
diff --git a/server/src/routes.php b/server/src/routes.php
index 28ea432..f6bdda3 100644
--- a/server/src/routes.php
+++ b/server/src/routes.php
@@ -4,92 +4,51 @@
 
 /*
 |--------------------------------------------------------------------------
-| API Routes
+| Registry Bridge routes
 |--------------------------------------------------------------------------
 |
-| Here is where you can register API routes for your application. These
-| routes are loaded by the RouteServiceProvider within a group which
-| is assigned the "api" middleware group. Enjoy building your API!
+| The console's Extensions module talks to the Registry Service through these routes: the catalog,
+| this instance's installs and licences, the installer and the service checkout. Publishing, review
+| and payouts live on the publisher website.
 |
 */
-// Public endpoints (no authentication required)
-Route::get(config('registry-bridge.api.routing.prefix', '~registry') . '/v1/extensions', 'Fleetbase\RegistryBridge\Http\Controllers\Internal\v1\RegistryExtensionController@listPublicExtensions');
-Route::get(config('registry-bridge.api.routing.prefix', '~registry') . '/v1/lookup', 'Fleetbase\RegistryBridge\Http\Controllers\Internal\v1\RegistryController@lookupPackage');
-Route::post(config('registry-bridge.api.routing.prefix', '~registry') . '/v1/bundle-upload', 'Fleetbase\RegistryBridge\Http\Controllers\Internal\v1\RegistryController@bundleUpload');
+$prefix = config('registry-bridge.api.routing.prefix', '~registry');
+
 // Runtime engines manifest: read by the console at boot, before sign-in
-Route::get(config('registry-bridge.api.routing.prefix', '~registry') . '/v1/engines/runtime', 'Fleetbase\RegistryBridge\Http\Controllers\Internal\v1\RuntimeEngineController@index');
+Route::get($prefix . '/v1/engines/runtime', 'Fleetbase\RegistryBridge\Http\Controllers\Internal\v1\RuntimeEngineController@index');
 
-// Developer account registration (public, no auth required)
-Route::post(config('registry-bridge.api.routing.prefix', '~registry') . '/v1/developer-account/register', 'Fleetbase\RegistryBridge\Http\Controllers\Internal\v1\RegistryDeveloperAccountController@register');
-Route::post(config('registry-bridge.api.routing.prefix', '~registry') . '/v1/developer-account/verify', 'Fleetbase\RegistryBridge\Http\Controllers\Internal\v1\RegistryDeveloperAccountController@verifyEmail');
-Route::post(config('registry-bridge.api.routing.prefix', '~registry') . '/v1/developer-account/resend-verification', 'Fleetbase\RegistryBridge\Http\Controllers\Internal\v1\RegistryDeveloperAccountController@resendVerification');
-Route::post(config('registry-bridge.api.routing.prefix', '~registry') . '/v1/developer-account/generate-token', 'Fleetbase\RegistryBridge\Http\Controllers\Internal\v1\RegistryDeveloperAccountController@generateToken');
-Route::prefix(config('registry-bridge.api.routing.prefix', '~registry'))->middleware(['fleetbase.registry'])->namespace('Fleetbase\RegistryBridge\Http\Controllers')->group(
+Route::prefix($prefix)->middleware(['fleetbase.registry'])->namespace('Fleetbase\RegistryBridge\Http\Controllers')->group(
     function ($router) {
-        /*
-         * Internal Routes v1
-         */
-        $router->group(['prefix' => config('registry-bridge.api.routing.internal_prefix', 'v1'), 'namespace' => 'Internal\v1'], function ($router) {
-            $router->group(['prefix' => 'auth'], function ($router) {
-                $router->group(['middleware' => ['fleetbase.protected']], function ($router) {
-                    $router->get('registry-tokens', 'RegistryAuthController@getRegistryTokens');
-                    $router->delete('registry-tokens/{id}', 'RegistryAuthController@deleteRegistryToken');
-                    $router->post('registry-tokens', 'RegistryAuthController@createRegistryUser');
-                });
-
-                $router->post('composer-auth', 'RegistryAuthController@composerAuthentication');
-                $router->post('authenticate', 'RegistryAuthController@authenticate');
-                $router->post('add-user', 'RegistryAuthController@addUser');
-                $router->post('check-access', 'RegistryAuthController@checkAccess');
-                $router->post('check-publish', 'RegistryAuthController@checkPublishAllowed');
+        $router->group(['prefix' => config('registry-bridge.api.routing.internal_prefix', 'v1'), 'namespace' => 'Internal\v1', 'middleware' => ['fleetbase.protected']], function ($router) {
+            $router->get('categories', 'RegistryController@categories');
+            $router->get('engines', 'RegistryController@getInstalledEngines');
+            $router->get('engine-install-status', 'RegistryController@getEngineInstallStatus');
+
+            $router->group(['prefix' => 'installer'], function ($router) {
+                $router->post('install', 'ExtensionInstallerController@install');
+                $router->post('uninstall', 'ExtensionInstallerController@uninstall');
+                $router->post('update', 'ExtensionInstallerController@update');
+                $router->get('jobs/{id}', 'ExtensionInstallerController@job');
             });
 
-            // Developer account profile routes (require authentication)
-            $router->group(['prefix' => 'developer-account'], function ($router) {
-                $router->get('profile', 'RegistryDeveloperAccountController@profile');
-                $router->post('profile', 'RegistryDeveloperAccountController@updateProfile');
+            $router->group(['prefix' => 'purchases'], function ($router) {
+                $router->post('checkout', 'ServicePurchaseController@checkout');
+                $router->get('{handoff}', 'ServicePurchaseController@handoff');
             });
 
-            $router->group(['middleware' => ['fleetbase.protected']], function ($router) {
-                $router->get('categories', 'RegistryController@categories');
-                $router->get('engines', 'RegistryController@getInstalledEngines');
-                $router->get('engine-install-status', 'RegistryController@getEngineInstallStatus');
-
-                $router->group(['prefix' => 'installer'], function ($router) {
-                    $router->post('install', 'ExtensionInstallerController@install');
-                    $router->post('uninstall', 'ExtensionInstallerController@uninstall');
-                    $router->get('jobs/{id}', 'ExtensionInstallerController@job');
-                });
-
-                $router->group(['prefix' => 'payments'], function ($router) {
-                    $router->post('account', 'RegistryPaymentsController@getStripeAccount');
-                    $router->post('account-session', 'RegistryPaymentsController@getStripeAccountSession');
-                    $router->post('account-management-session', 'RegistryPaymentsController@createAccountManagementSession');
-                    $router->get('has-stripe-connect-account', 'RegistryPaymentsController@hasStripeConnectAccount');
-                    $router->post('create-checkout-session', 'RegistryPaymentsController@createStripeCheckoutSession');
-                    $router->post('get-checkout-session', 'RegistryPaymentsController@getStripeCheckoutSessionStatus');
-                    $router->get('author-received', 'RegistryPaymentsController@getAuthorReceivedPayments');
-                });
-
-                $router->fleetbaseRoutes('registry-extensions', function ($router, $controller) {
-                    $router->post('{id}/submit', $controller('submit'));
-                    $router->post('approve', $controller('approve'));
-                    $router->post('reject', $controller('reject'));
-                    $router->post('publish', $controller('manualPublish'));
-                    $router->get('download-bundle', $controller('downloadBundle'));
-                    $router->get('analytics', $controller('analytics'));
-                    $router->get('installed', $controller('installed'));
-                    $router->get('purchased', $controller('purchased'));
-                    $router->get('config', $controller('getConfig'));
-                    $router->post('config', $controller('saveConfig'));
-                    $router->post('config/test', $controller('testConfig'));
-                    $router->post('instance/register', $controller('registerInstance'));
-                    $router->delete('instance', $controller('unregisterInstance'));
-                });
-
-                $router->fleetbaseRoutes('registry-extension-bundles', function ($router, $controller) {
-                    $router->get('download', $controller('download'));
-                });
+            $router->group(['prefix' => 'registry-extensions'], function ($router) {
+                $router->get('/', 'RegistryExtensionController@query');
+                $router->get('context', 'RegistryExtensionController@context');
+                $router->get('counts', 'RegistryExtensionController@counts');
+                $router->get('installed', 'RegistryExtensionController@installed');
+                $router->get('purchased', 'RegistryExtensionController@purchased');
+                $router->get('config', 'RegistryExtensionController@getConfig');
+                $router->post('config', 'RegistryExtensionController@saveConfig');
+                $router->post('config/test', 'RegistryExtensionController@testConfig');
+                $router->post('instance/register', 'RegistryExtensionController@registerInstance');
+                $router->delete('instance', 'RegistryExtensionController@unregisterInstance');
+                $router->get('{id}/releases', 'RegistryExtensionController@releases');
+                $router->get('{id}', 'RegistryExtensionController@find');
             });
         });
     }
diff --git a/server/tests/Fixtures/registry-service/catalog-extensions-every-hosting.json b/server/tests/Fixtures/registry-service/catalog-extensions-every-hosting.json
new file mode 100644
index 0000000..bf4ce01
--- /dev/null
+++ b/server/tests/Fixtures/registry-service/catalog-extensions-every-hosting.json
@@ -0,0 +1,236 @@
+{
+    "request": {
+        "method": "GET",
+        "path": "/v1/catalog/extensions"
+    },
+    "status": 200,
+    "body": {
+        "data": [
+            {
+                "id": "ext_a2unpicvi8",
+                "slug": "acme-fleet-insights",
+                "name": "Acme Fleet Insights",
+                "subtitle": "Dashboards for fuel, utilisation and driver behaviour.",
+                "fa_icon": "chart-line",
+                "icon_url": null,
+                "tags": [
+                    "analytics",
+                    "reports"
+                ],
+                "hosting": "cloud",
+                "status": "published",
+                "publisher": {
+                    "id": "org_7nwqd9szuv",
+                    "slug": "acme",
+                    "name": "Acme Logistics",
+                    "is_verified": true
+                },
+                "category": {
+                    "id": "cat_jqtma8luwq",
+                    "slug": "analytics-and-reporting",
+                    "name": "Analytics and Reporting",
+                    "icon": "chart-line"
+                },
+                "latest_release": null,
+                "latest_version": null,
+                "compat": null,
+                "packages": {
+                    "npm": "@acme/acme-fleet-insights-engine",
+                    "composer": "acme/acme-fleet-insights-api"
+                },
+                "price": {
+                    "model": "one_time",
+                    "amount": 1900,
+                    "currency": "USD",
+                    "on_sale": false,
+                    "sale_amount": null,
+                    "effective_amount": 1900
+                },
+                "is_paid": true,
+                "installs_count": 0,
+                "published_at": "2026-10-23T08:27:09.000000Z",
+                "updated_at": "2026-10-23T08:05:25.000000Z",
+                "created_at": "2026-10-23T08:05:25.000000Z"
+            },
+            {
+                "id": "ext_qo76q0el02",
+                "slug": "acme-route-planner",
+                "name": "Acme Route Planner",
+                "subtitle": "Plan multi-stop routes (draft).",
+                "fa_icon": null,
+                "icon_url": null,
+                "tags": [
+                    "routing"
+                ],
+                "hosting": "both",
+                "status": "published",
+                "publisher": {
+                    "id": "org_7nwqd9szuv",
+                    "slug": "acme",
+                    "name": "Acme Logistics",
+                    "is_verified": true
+                },
+                "category": null,
+                "latest_release": null,
+                "latest_version": null,
+                "compat": null,
+                "packages": {
+                    "npm": "@acme/acme-route-planner-engine",
+                    "composer": "acme/acme-route-planner-api"
+                },
+                "price": {
+                    "model": "one_time",
+                    "amount": 2900,
+                    "currency": "USD",
+                    "on_sale": false,
+                    "sale_amount": null,
+                    "effective_amount": 2900
+                },
+                "is_paid": true,
+                "installs_count": 0,
+                "published_at": "2026-10-23T08:27:09.000000Z",
+                "updated_at": "2026-10-23T08:05:25.000000Z",
+                "created_at": "2026-10-23T08:05:25.000000Z"
+            },
+            {
+                "id": "ext_lrmamhjvoi",
+                "slug": "registry-demo-hello",
+                "name": "Registry Demo Hello",
+                "subtitle": "A free demo extension that says hello from the console.",
+                "fa_icon": "puzzle-piece",
+                "icon_url": null,
+                "tags": [
+                    "demo",
+                    "free",
+                    "getting-started"
+                ],
+                "hosting": "both",
+                "status": "published",
+                "publisher": {
+                    "id": "org_jgpeqfbxcf",
+                    "slug": "registry-demo",
+                    "name": "Registry Demo",
+                    "is_verified": true
+                },
+                "category": {
+                    "id": "cat_pilzzobwtq",
+                    "slug": "fleet-management",
+                    "name": "Fleet Management",
+                    "icon": "truck-moving"
+                },
+                "latest_release": {
+                    "id": "rel_dlx3qr7woe",
+                    "version": "1.0.0",
+                    "channel": "stable",
+                    "status": "published",
+                    "compat": {
+                        "console": ">=0.7.0",
+                        "api": ">=1.6.0"
+                    },
+                    "size_bytes": 882,
+                    "checksum": "sha256:69384a4894fa04287ac37662724b8ffcaa59e3b1e02546356465388bccb05623",
+                    "notes": "Seeded by registry:seed --seed-release.",
+                    "published_at": "2026-10-23T08:05:13.000000Z",
+                    "yanked_at": null,
+                    "created_at": "2026-10-23T08:05:13.000000Z"
+                },
+                "latest_version": "1.0.0",
+                "compat": {
+                    "console": ">=0.7.0",
+                    "api": ">=1.6.0"
+                },
+                "packages": {
+                    "npm": "@registry-demo/hello-engine",
+                    "composer": "registry-demo/hello-api"
+                },
+                "price": {
+                    "model": "free",
+                    "amount": 0,
+                    "currency": "USD",
+                    "on_sale": false,
+                    "sale_amount": null,
+                    "effective_amount": 0
+                },
+                "is_paid": false,
+                "installs_count": 0,
+                "published_at": "2026-10-23T08:05:21.000000Z",
+                "updated_at": "2026-10-23T08:05:21.000000Z",
+                "created_at": "2026-10-23T08:05:13.000000Z"
+            },
+            {
+                "id": "ext_ts109fqyn8",
+                "slug": "registry-demo-pro",
+                "name": "Registry Demo Pro",
+                "subtitle": "A paid demo extension with reports for fleet managers.",
+                "fa_icon": "puzzle-piece",
+                "icon_url": null,
+                "tags": [
+                    "demo",
+                    "paid",
+                    "reports"
+                ],
+                "hosting": "both",
+                "status": "published",
+                "publisher": {
+                    "id": "org_jgpeqfbxcf",
+                    "slug": "registry-demo",
+                    "name": "Registry Demo",
+                    "is_verified": true
+                },
+                "category": {
+                    "id": "cat_jqtma8luwq",
+                    "slug": "analytics-and-reporting",
+                    "name": "Analytics and Reporting",
+                    "icon": "chart-line"
+                },
+                "latest_release": {
+                    "id": "rel_387nbicatn",
+                    "version": "1.0.0",
+                    "channel": "stable",
+                    "status": "published",
+                    "compat": {
+                        "console": ">=0.7.0",
+                        "api": ">=1.6.0"
+                    },
+                    "size_bytes": 873,
+                    "checksum": "sha256:93885f12e28ddb3b3940f7f238a3eb80b7614d21860ba7d3b0e88f672dc7a414",
+                    "notes": "Seeded by registry:seed --seed-release.",
+                    "published_at": "2026-10-23T08:05:13.000000Z",
+                    "yanked_at": null,
+                    "created_at": "2026-10-23T08:05:13.000000Z"
+                },
+                "latest_version": "1.0.0",
+                "compat": {
+                    "console": ">=0.7.0",
+                    "api": ">=1.6.0"
+                },
+                "packages": {
+                    "npm": "@registry-demo/pro-engine",
+                    "composer": "registry-demo/pro-api"
+                },
+                "price": {
+                    "model": "one_time",
+                    "amount": 4900,
+                    "currency": "USD",
+                    "on_sale": false,
+                    "sale_amount": null,
+                    "effective_amount": 4900
+                },
+                "is_paid": true,
+                "installs_count": 0,
+                "published_at": "2026-10-23T08:05:21.000000Z",
+                "updated_at": "2026-10-23T08:05:21.000000Z",
+                "created_at": "2026-10-23T08:05:13.000000Z"
+            }
+        ],
+        "meta": {
+            "total": 4,
+            "per_page": 30,
+            "current_page": 1,
+            "last_page": 1,
+            "from": 1,
+            "to": 4,
+            "time": 823
+        }
+    }
+}
diff --git a/server/tests/Fixtures/registry-service/catalog-releases-not-found.json b/server/tests/Fixtures/registry-service/catalog-releases-not-found.json
new file mode 100644
index 0000000..78a18b8
--- /dev/null
+++ b/server/tests/Fixtures/registry-service/catalog-releases-not-found.json
@@ -0,0 +1,12 @@
+{
+    "request": {
+        "method": "GET",
+        "path": "/v1/catalog/extensions/does-not-exist/releases"
+    },
+    "status": 404,
+    "body": {
+        "errors": [
+            "Resource not found."
+        ]
+    }
+}
diff --git a/server/tests/Fixtures/registry-service/catalog-releases.json b/server/tests/Fixtures/registry-service/catalog-releases.json
new file mode 100644
index 0000000..3ed34ac
--- /dev/null
+++ b/server/tests/Fixtures/registry-service/catalog-releases.json
@@ -0,0 +1,32 @@
+{
+    "request": {
+        "method": "GET",
+        "path": "/v1/catalog/extensions/registry-demo-hello/releases"
+    },
+    "status": 200,
+    "body": {
+        "extension": "registry-demo-hello",
+        "latest": "1.0.0",
+        "channels": {
+            "stable": "1.0.0"
+        },
+        "releases": [
+            {
+                "id": "rel_dlx3qr7woe",
+                "version": "1.0.0",
+                "channel": "stable",
+                "status": "published",
+                "compat": {
+                    "console": ">=0.7.0",
+                    "api": ">=1.6.0"
+                },
+                "size_bytes": 882,
+                "checksum": "sha256:69384a4894fa04287ac37662724b8ffcaa59e3b1e02546356465388bccb05623",
+                "notes": "Seeded by registry:seed --seed-release.",
+                "published_at": "2026-10-23T08:05:13.000000Z",
+                "yanked_at": null,
+                "created_at": "2026-10-23T08:05:13.000000Z"
+            }
+        ]
+    }
+}
diff --git a/server/tests/Fixtures/registry-service/checkout-already-licensed.json b/server/tests/Fixtures/registry-service/checkout-already-licensed.json
new file mode 100644
index 0000000..abac121
--- /dev/null
+++ b/server/tests/Fixtures/registry-service/checkout-already-licensed.json
@@ -0,0 +1,12 @@
+{
+    "request": {
+        "method": "POST",
+        "path": "/v1/instances/me/purchases/checkout"
+    },
+    "status": 409,
+    "body": {
+        "errors": [
+            "Registry Demo Buyer already holds a licence for Acme Route Planner. Ask Fleetbase staff for more seats."
+        ]
+    }
+}
diff --git a/server/tests/Fixtures/registry-service/checkout-hosting-mismatch.json b/server/tests/Fixtures/registry-service/checkout-hosting-mismatch.json
new file mode 100644
index 0000000..a54278b
--- /dev/null
+++ b/server/tests/Fixtures/registry-service/checkout-hosting-mismatch.json
@@ -0,0 +1,12 @@
+{
+    "request": {
+        "method": "POST",
+        "path": "/v1/instances/me/purchases/checkout"
+    },
+    "status": 422,
+    "body": {
+        "errors": [
+            "This extension is only available for cloud instances."
+        ]
+    }
+}
diff --git a/server/tests/Fixtures/registry-service/checkout-no-stripe.json b/server/tests/Fixtures/registry-service/checkout-no-stripe.json
new file mode 100644
index 0000000..f51c742
--- /dev/null
+++ b/server/tests/Fixtures/registry-service/checkout-no-stripe.json
@@ -0,0 +1,12 @@
+{
+    "request": {
+        "method": "POST",
+        "path": "/v1/instances/me/purchases/checkout"
+    },
+    "status": 422,
+    "body": {
+        "errors": [
+            "Acme Route Planner cannot be bought right now: its publisher has not finished setting up payouts."
+        ]
+    }
+}
diff --git a/server/tests/Fixtures/registry-service/checkout-unknown-extension.json b/server/tests/Fixtures/registry-service/checkout-unknown-extension.json
new file mode 100644
index 0000000..39585c1
--- /dev/null
+++ b/server/tests/Fixtures/registry-service/checkout-unknown-extension.json
@@ -0,0 +1,12 @@
+{
+    "request": {
+        "method": "POST",
+        "path": "/v1/instances/me/purchases/checkout"
+    },
+    "status": 404,
+    "body": {
+        "errors": [
+            "Extension not found."
+        ]
+    }
+}
diff --git a/server/tests/Fixtures/registry-service/checkout-validation.json b/server/tests/Fixtures/registry-service/checkout-validation.json
new file mode 100644
index 0000000..82a4772
--- /dev/null
+++ b/server/tests/Fixtures/registry-service/checkout-validation.json
@@ -0,0 +1,17 @@
+{
+    "request": {
+        "method": "POST",
+        "path": "/v1/instances/me/purchases/checkout"
+    },
+    "status": 422,
+    "body": {
+        "errors": [
+            "The return url field is required."
+        ],
+        "fields": {
+            "return_url": [
+                "The return url field is required."
+            ]
+        }
+    }
+}
diff --git a/server/tests/Fixtures/registry-service/instances-me-purchased.json b/server/tests/Fixtures/registry-service/instances-me-purchased.json
new file mode 100644
index 0000000..46d2b91
--- /dev/null
+++ b/server/tests/Fixtures/registry-service/instances-me-purchased.json
@@ -0,0 +1,65 @@
+{
+    "request": {
+        "method": "GET",
+        "path": "/v1/instances/me"
+    },
+    "status": 200,
+    "body": {
+        "instance": {
+            "id": "inst_mynymbvr9q",
+            "name": "Bridge verification",
+            "host": "http://localhost:4200",
+            "kind": "self_hosted",
+            "console_version": "0.7.69",
+            "api_version": "1.6.30",
+            "status": "active",
+            "organization": {
+                "id": "org_9sz9sh8ivz",
+                "slug": "registry-demo-buyer",
+                "name": "Registry Demo Buyer",
+                "website": null,
+                "bio": null,
+                "avatar_url": null,
+                "is_personal": false,
+                "is_staff": false,
+                "is_verified": true,
+                "verified_at": "2026-10-23T08:05:21.000000Z",
+                "created_at": "2026-10-23T08:05:16.000000Z"
+            },
+            "last_seen_at": "2026-10-23T08:27:27.000000Z",
+            "created_at": "2026-10-23T08:07:32.000000Z"
+        },
+        "licences": [
+            {
+                "id": "lic_akhx6yariq",
+                "extension": {
+                    "id": "ext_qo76q0el02",
+                    "slug": "acme-route-planner",
+                    "name": "Acme Route Planner"
+                },
+                "kind": "paid",
+                "status": "active",
+                "max_activations": 5,
+                "seats_used": 0,
+                "activated_here": false,
+                "expires_at": null,
+                "created_at": "2026-10-23T08:23:33.000000Z"
+            },
+            {
+                "id": "lic_qmirbm8exz",
+                "extension": {
+                    "id": "ext_ts109fqyn8",
+                    "slug": "registry-demo-pro",
+                    "name": "Registry Demo Pro"
+                },
+                "kind": "paid",
+                "status": "active",
+                "max_activations": 5,
+                "seats_used": 0,
+                "activated_here": false,
+                "expires_at": null,
+                "created_at": "2026-10-23T08:05:16.000000Z"
+            }
+        ]
+    }
+}
diff --git a/server/tests/Fixtures/registry-service/purchases-handoff-complete.json b/server/tests/Fixtures/registry-service/purchases-handoff-complete.json
new file mode 100644
index 0000000..fc541c0
--- /dev/null
+++ b/server/tests/Fixtures/registry-service/purchases-handoff-complete.json
@@ -0,0 +1,53 @@
+{
+    "request": {
+        "method": "GET",
+        "path": "/v1/instances/me/purchases/chk_3tampcinhk"
+    },
+    "status": 200,
+    "body": {
+        "handoff": "chk_3tampcinhk",
+        "status": "complete",
+        "source": "instance",
+        "extension": {
+            "id": "ext_qo76q0el02",
+            "slug": "acme-route-planner",
+            "name": "Acme Route Planner"
+        },
+        "organization": {
+            "id": "org_9sz9sh8ivz",
+            "slug": "registry-demo-buyer",
+            "name": "Registry Demo Buyer"
+        },
+        "amount": 2900,
+        "currency": "USD",
+        "url": null,
+        "expires_at": "2026-10-23T09:23:33.000000Z",
+        "completed_at": "2026-10-23T08:23:33.000000Z",
+        "purchase": {
+            "id": "pur_rqcusnwvoh",
+            "extension": {
+                "id": "ext_qo76q0el02",
+                "slug": "acme-route-planner",
+                "name": "Acme Route Planner"
+            },
+            "source": "instance",
+            "amount_total": 3190,
+            "amount_subtotal": 2900,
+            "amount_tax": 290,
+            "amount_refunded": 0,
+            "currency": "USD",
+            "status": "paid",
+            "receipt_url": "https://pay.stripe.com/receipts/payment/bridge_test",
+            "licence": {
+                "id": "lic_akhx6yariq",
+                "kind": "paid",
+                "status": "active",
+                "max_activations": 5,
+                "expires_at": null,
+                "created_at": "2026-10-23T08:23:33.000000Z"
+            },
+            "created_at": "2026-10-23T08:23:32.000000Z"
+        },
+        "created_at": "2026-10-23T08:23:33.000000Z"
+    }
+}
diff --git a/server/tests/Fixtures/registry-service/purchases-handoff-expired.json b/server/tests/Fixtures/registry-service/purchases-handoff-expired.json
new file mode 100644
index 0000000..cdb9342
--- /dev/null
+++ b/server/tests/Fixtures/registry-service/purchases-handoff-expired.json
@@ -0,0 +1,29 @@
+{
+    "request": {
+        "method": "GET",
+        "path": "/v1/instances/me/purchases/chk_bnmurzxpoe"
+    },
+    "status": 200,
+    "body": {
+        "handoff": "chk_bnmurzxpoe",
+        "status": "expired",
+        "source": "instance",
+        "extension": {
+            "id": "ext_qo76q0el02",
+            "slug": "acme-route-planner",
+            "name": "Acme Route Planner"
+        },
+        "organization": {
+            "id": "org_9sz9sh8ivz",
+            "slug": "registry-demo-buyer",
+            "name": "Registry Demo Buyer"
+        },
+        "amount": 2900,
+        "currency": "USD",
+        "url": null,
+        "expires_at": "2026-10-23T08:22:32.000000Z",
+        "completed_at": null,
+        "purchase": null,
+        "created_at": "2026-10-23T08:23:32.000000Z"
+    }
+}
diff --git a/server/tests/Fixtures/registry-service/purchases-handoff-not-found.json b/server/tests/Fixtures/registry-service/purchases-handoff-not-found.json
new file mode 100644
index 0000000..485a2a9
--- /dev/null
+++ b/server/tests/Fixtures/registry-service/purchases-handoff-not-found.json
@@ -0,0 +1,12 @@
+{
+    "request": {
+        "method": "GET",
+        "path": "/v1/instances/me/purchases/chk_doesnotexist"
+    },
+    "status": 404,
+    "body": {
+        "errors": [
+            "Resource not found."
+        ]
+    }
+}
diff --git a/server/tests/Fixtures/registry-service/purchases-handoff-open.json b/server/tests/Fixtures/registry-service/purchases-handoff-open.json
new file mode 100644
index 0000000..162f2c7
--- /dev/null
+++ b/server/tests/Fixtures/registry-service/purchases-handoff-open.json
@@ -0,0 +1,29 @@
+{
+    "request": {
+        "method": "GET",
+        "path": "/v1/instances/me/purchases/chk_67kki2d00u"
+    },
+    "status": 200,
+    "body": {
+        "handoff": "chk_67kki2d00u",
+        "status": "open",
+        "source": "instance",
+        "extension": {
+            "id": "ext_qo76q0el02",
+            "slug": "acme-route-planner",
+            "name": "Acme Route Planner"
+        },
+        "organization": {
+            "id": "org_9sz9sh8ivz",
+            "slug": "registry-demo-buyer",
+            "name": "Registry Demo Buyer"
+        },
+        "amount": 2900,
+        "currency": "USD",
+        "url": "https://checkout.stripe.com/c/pay/cs_test_bridge",
+        "expires_at": "2026-10-23T09:23:32.000000Z",
+        "completed_at": null,
+        "purchase": null,
+        "created_at": "2026-10-23T08:23:32.000000Z"
+    }
+}
diff --git a/server/tests/Fixtures/registry-service/record_phase4.py b/server/tests/Fixtures/registry-service/record_phase4.py
new file mode 100644
index 0000000..fd27ef8
--- /dev/null
+++ b/server/tests/Fixtures/registry-service/record_phase4.py
@@ -0,0 +1,37 @@
+import json, sys, subprocess, urllib.request, urllib.error
+HOST, TOKEN, OUT, SVC = sys.argv[1:5]
+def call(method, path, body=None):
+    data = json.dumps(body).encode() if body is not None else None
+    req = urllib.request.Request(HOST + path, data=data, method=method)
+    req.add_header('Accept', 'application/json')
+    if data is not None: req.add_header('Content-Type', 'application/json')
+    req.add_header('Authorization', 'Bearer ' + TOKEN)
+    try:
+        with urllib.request.urlopen(req) as r: return r.status, json.loads(r.read() or b'null')
+    except urllib.error.HTTPError as e: return e.code, json.loads(e.read() or b'null')
+def tinker(code):
+    subprocess.run(['php', 'artisan', 'tinker', '--execute', code], cwd=SVC, check=True, capture_output=True)
+def save(name, method, path, body=None):
+    status, payload = call(method, path, body)
+    with open(f'{OUT}/{name}.json', 'w') as f:
+        json.dump({'request': {'method': method, 'path': path.split('?')[0]}, 'status': status, 'body': payload}, f, indent=4)
+        f.write('\n')
+    print(name, status)
+    return payload
+handoffs = json.loads(sys.argv[5])
+save('catalog-extensions-every-hosting', 'GET', '/v1/catalog/extensions?limit=30')
+save('catalog-releases', 'GET', '/v1/catalog/extensions/registry-demo-hello/releases')
+save('catalog-releases-not-found', 'GET', '/v1/catalog/extensions/does-not-exist/releases')
+save('instances-me-purchased', 'GET', '/v1/instances/me')
+ret = {'extension': 'acme-route-planner', 'return_url': 'https://fleet.example.test/extensions?extension_id=ext_x&purchase_return=1', 'cancel_url': 'https://fleet.example.test/extensions?extension_id=ext_x&purchase_return=1', 'email': 'ops@example.test'}
+save('checkout-already-licensed', 'POST', '/v1/instances/me/purchases/checkout', ret)
+tinker('App\\Models\\Licence::whereHas("extension", fn($q) => $q->where("slug","acme-route-planner"))->update(["status" => "revoked"]);')
+save('checkout-no-stripe', 'POST', '/v1/instances/me/purchases/checkout', ret)
+tinker('App\\Models\\Licence::whereHas("extension", fn($q) => $q->where("slug","acme-route-planner"))->update(["status" => "active"]);')
+save('checkout-hosting-mismatch', 'POST', '/v1/instances/me/purchases/checkout', {**ret, 'extension': 'acme-fleet-insights'})
+save('checkout-unknown-extension', 'POST', '/v1/instances/me/purchases/checkout', {**ret, 'extension': 'does-not-exist'})
+save('checkout-validation', 'POST', '/v1/instances/me/purchases/checkout', {'extension': 'acme-route-planner'})
+save('purchases-handoff-open', 'GET', '/v1/instances/me/purchases/' + handoffs[0])
+save('purchases-handoff-expired', 'GET', '/v1/instances/me/purchases/' + handoffs[1])
+save('purchases-handoff-complete', 'GET', '/v1/instances/me/purchases/' + handoffs[2])
+save('purchases-handoff-not-found', 'GET', '/v1/instances/me/purchases/chk_doesnotexist')
diff --git a/server/tests/Installer/InstallerCommandsTest.php b/server/tests/Installer/InstallerCommandsTest.php
index 3018ffd..b3c7c78 100644
--- a/server/tests/Installer/InstallerCommandsTest.php
+++ b/server/tests/Installer/InstallerCommandsTest.php
@@ -77,7 +77,7 @@ public function runningUnitTests(): bool
     $job = json_decode($output, true);
     expect($code)->toBe(0);
     expect($job)->toMatchArray(['action' => 'install', 'status' => 'queued', 'version' => '1.2.0', 'position' => 1]);
-    expect($job['extension'])->toBe(['uuid' => 'ext-uuid-1', 'id' => 'extension_widgets', 'name' => 'Widgets', 'source' => 'local']);
+    expect($job['extension'])->toBe(['uuid' => 'ext-uuid-1', 'id' => 'extension_widgets', 'name' => 'Widgets', 'source' => 'registry-service']);
 });
 
 test('the version can follow the extension after an @', function () {
diff --git a/server/tests/Installer/RegistryServiceInstallTest.php b/server/tests/Installer/RegistryServiceInstallTest.php
index 159276d..c1a83df 100644
--- a/server/tests/Installer/RegistryServiceInstallTest.php
+++ b/server/tests/Installer/RegistryServiceInstallTest.php
@@ -21,11 +21,9 @@
 use Fleetbase\RegistryBridge\Support\Installer\ServiceInstallReporter;
 use Fleetbase\RegistryBridge\Support\Installer\ServicePackageCredentials;
 use Fleetbase\RegistryBridge\Support\Installer\ServiceReleaseSource;
-use Fleetbase\RegistryBridge\Support\Installer\SourceRoutingReleaseSource;
 use Fleetbase\RegistryBridge\Support\PackageAuth;
 use Fleetbase\RegistryBridge\Support\RegistryClient;
 use Fleetbase\RegistryBridge\Support\RegistryConfig;
-use Fleetbase\RegistryBridge\Tests\Installer\Fakes\FakeReleaseSource;
 use Fleetbase\RegistryBridge\Tests\Installer\Fakes\InstallerSandbox;
 use Fleetbase\RegistryBridge\Tests\Installer\Fakes\RecordingDispatcher;
 use Fleetbase\RegistryBridge\Tests\Support\RegistryServiceFake;
@@ -429,22 +427,16 @@ function installReports(RegistryServiceFake $service): array
         ->and($release->composerRequirement())->toBe(HELLO_API . ':1.0.0');
 });
 
-test('local extensions still install while the service is unreachable', function () {
+test('an unreachable service fails the lookup with a clear message', function () {
     $this->service->respondWith('GET', 'v1/catalog/extensions', 503, ['errors' => ['Service Unavailable']]);
-    $local = new FakeReleaseSource();
-    $local->add(new Release(new ExtensionRef('ext-uuid-1', 'extension_widgets', 'Widgets'), '1.0.0', 'acme/widgets-api', '1.0.0'));
-    $routing = new SourceRoutingReleaseSource([
-        ExtensionRef::REGISTRY_SERVICE => new ServiceReleaseSource(RegistryClient::fromConfig(RegistryServiceFake::config()), RegistryServiceFake::config()),
-        ExtensionRef::LOCAL            => $local,
-    ]);
-
-    expect($routing->find('extension_widgets')->source)->toBe('local');
-    expect(fn () => $routing->find(HELLO_NPM))->toThrow(InstallerException::class, 'The registry service could not be reached');
+    $source = new ServiceReleaseSource(RegistryClient::fromConfig(RegistryServiceFake::config()), RegistryServiceFake::config());
+
+    expect(fn () => $source->find(HELLO_NPM))->toThrow(InstallerException::class, 'The registry service could not be reached');
 });
 
 test('job records keep the extension source across the queue', function () {
     $ref = ExtensionRef::fromArray(helloRef()->toArray());
 
     expect($ref->isFromRegistryService())->toBeTrue()
-        ->and(ExtensionRef::fromArray(['uuid' => 'u', 'id' => 'extension_x', 'name' => 'X'])->source)->toBe('local');
+        ->and(ExtensionRef::fromArray(['uuid' => 'u', 'id' => 'ext_x', 'name' => 'X'])->source)->toBe('registry-service');
 });
diff --git a/server/tests/SandboxConnectionTest.php b/server/tests/SandboxConnectionTest.php
index a3515db..9447d98 100644
--- a/server/tests/SandboxConnectionTest.php
+++ b/server/tests/SandboxConnectionTest.php
@@ -1,8 +1,7 @@
 <?php
 
 /*
- * Registry data (extensions, bundles, installs, purchases, registry users and
- * developer accounts) only exists in the live database: this package ships with
+ * Registry data (installs from the Registry Service) only exists in the live database: this package ships with
  * `extra.fleetbase.sandbox-migrations: false`. When core-api switches a request
  * into sandbox ("test mode") it sets `database.default` and
  * `fleetbase.connection.db` to `sandbox`, and every Fleetbase model that is not
@@ -16,10 +15,7 @@
  */
 
 use Fleetbase\Models\Category;
-use Fleetbase\RegistryBridge\Expansions\CategoryExpansion;
 use Fleetbase\RegistryBridge\Http\Controllers\Internal\v1\RegistryController;
-use Fleetbase\RegistryBridge\Http\Controllers\Internal\v1\RegistryExtensionController;
-use Fleetbase\RegistryBridge\Models\RegistryExtension;
 use Illuminate\Config\Repository;
 use Illuminate\Container\Container;
 use Illuminate\Contracts\Routing\ResponseFactory as ResponseFactoryContract;
@@ -73,9 +69,7 @@ function bootSandboxHarness(): Capsule
                 SANDBOX_CONNECTION => ['driver' => 'sqlite', 'database' => ':memory:', 'prefix' => ''],
             ],
         ],
-        'fleetbase' => ['connection' => ['db' => LIVE_CONNECTION]],
-        // The local registry tables are only read when this instance is itself the registry (cloud)
-        'registry-bridge' => ['registry' => ['self_hosted' => true]],
+        'fleetbase'       => ['connection' => ['db' => LIVE_CONNECTION]],
         'cache'           => ['default' => 'array', 'stores' => ['array' => ['driver' => 'array']]],
     ]));
 
@@ -111,32 +105,7 @@ function bootSandboxHarness(): Capsule
     }
 
     // Registry tables only exist on the live connection.
-    $schema = $capsule->schema(LIVE_CONNECTION);
-    $schema->create('registry_extension_bundles', function (Blueprint $table) {
-        $table->string('uuid')->primary();
-        $table->string('extension_uuid')->nullable();
-        $table->text('meta')->nullable();
-        $table->timestamps();
-        $table->softDeletes();
-    });
-    $schema->create('registry_extensions', function (Blueprint $table) {
-        $table->string('uuid')->primary();
-        $table->string('public_id')->nullable();
-        $table->string('name')->nullable();
-        $table->string('status')->nullable();
-        $table->string('category_uuid')->nullable();
-        $table->string('current_bundle_uuid')->nullable();
-        $table->timestamps();
-        $table->softDeletes();
-    });
-    $schema->create('registry_extension_installs', function (Blueprint $table) {
-        $table->string('uuid')->primary();
-        $table->string('company_uuid')->nullable();
-        $table->string('extension_uuid')->nullable();
-        $table->timestamps();
-        $table->softDeletes();
-    });
-    $schema->create('registry_service_installs', function (Blueprint $table) {
+    $capsule->schema(LIVE_CONNECTION)->create('registry_service_installs', function (Blueprint $table) {
         $table->increments('id');
         $table->string('uuid')->nullable();
         $table->string('company_uuid')->nullable();
@@ -147,41 +116,9 @@ function bootSandboxHarness(): Capsule
         $table->timestamps();
         $table->softDeletes();
     });
-    $schema->create('registry_extension_purchases', function (Blueprint $table) {
-        $table->string('uuid')->primary();
-        $table->string('company_uuid')->nullable();
-        $table->string('extension_uuid')->nullable();
-        $table->timestamps();
-        $table->softDeletes();
-    });
-
-    $live = $capsule->getConnection(LIVE_CONNECTION);
-    $live->table('categories')->insert([
-        ['uuid' => 'cat-with-extension', 'public_id' => 'category_live1', 'name' => 'Telematics', 'slug' => 'telematics', 'for' => 'extension_category', 'core_category' => 1],
-        ['uuid' => 'cat-empty', 'public_id' => 'category_live2', 'name' => 'Empty', 'slug' => 'empty', 'for' => 'extension_category', 'core_category' => 1],
-    ]);
-    $live->table('registry_extension_bundles')->insert([
-        'uuid'           => 'bundle-1',
-        'extension_uuid' => 'ext-1',
-        'meta'           => json_encode(['package.json' => ['name' => '@fleetbase/test-engine']]),
+    $capsule->getConnection(LIVE_CONNECTION)->table('registry_service_installs')->insert([
+        'uuid' => 'install-1', 'company_uuid' => TEST_COMPANY_UUID, 'extension_id' => 'ext_test', 'npm_package' => '@fleetbase/test-engine', 'version' => '1.2.0',
     ]);
-    $live->table('registry_extensions')->insert([
-        'uuid'                => 'ext-1',
-        'public_id'           => 'extension_1',
-        'name'                => 'Test Engine',
-        'status'              => 'published',
-        'category_uuid'       => 'cat-with-extension',
-        'current_bundle_uuid' => 'bundle-1',
-    ]);
-    $live->table('registry_extension_installs')->insert(['uuid' => 'install-1', 'company_uuid' => TEST_COMPANY_UUID, 'extension_uuid' => 'ext-1']);
-    $live->table('registry_extension_purchases')->insert(['uuid' => 'purchase-1', 'company_uuid' => TEST_COMPANY_UUID, 'extension_uuid' => 'ext-1']);
-
-    // The sandbox database has a category of the same kind, which must never be returned.
-    $capsule->getConnection(SANDBOX_CONNECTION)->table('categories')->insert([
-        'uuid' => 'cat-sandbox', 'public_id' => 'category_sandbox', 'name' => 'Sandbox', 'slug' => 'sandbox', 'for' => 'extension_category', 'core_category' => 1,
-    ]);
-
-    Category::expand('registryExtensions', CategoryExpansion::registryExtensions());
 
     // Switch into sandbox mode exactly like Auth::setSandboxSession().
     config(['database.default' => SANDBOX_CONNECTION, 'fleetbase.connection.db' => SANDBOX_CONNECTION]);
@@ -211,7 +148,7 @@ function sandboxRequest(): Request
 });
 
 test('the models directory contains every registry model', function () {
-    expect(registryBridgeModelClasses())->toHaveCount(7);
+    expect(registryBridgeModelClasses())->toHaveCount(1);
 });
 
 test('every registry-bridge model is pinned to the live connection while sandbox is active', function () {
@@ -225,29 +162,10 @@ function sandboxRequest(): Request
     }
 });
 
-test('the registry extension category relation resolves against the live connection', function () {
-    $extension = RegistryExtension::where('uuid', 'ext-1')->firstOrFail();
-
-    expect($extension->category()->getQuery()->getConnection()->getName())->toBe(LIVE_CONNECTION);
-    expect($extension->category)->not->toBeNull();
-    expect($extension->category->uuid)->toBe('cat-with-extension');
-
-    $eager = RegistryExtension::with('category')->where('uuid', 'ext-1')->firstOrFail();
-    expect($eager->category->uuid)->toBe('cat-with-extension');
-});
-
-test('categories endpoint queries live categories and live registry extensions in sandbox mode', function () {
-    $response = app(RegistryController::class)->categories();
-    $uuids    = collect($response->resource)->pluck('uuid')->all();
-
-    expect($uuids)->toBe(['cat-with-extension']);
-    collect($response->resource)->each(fn ($category) => expect($category->getConnectionName())->toBe(LIVE_CONNECTION));
-});
-
 test('engines endpoint reads installs from the live connection in sandbox mode', function () {
     $response = app(RegistryController::class)->getInstalledEngines(sandboxRequest());
 
-    expect($response->getData(true))->toBe([['name' => '@fleetbase/test-engine']]);
+    expect($response->getData(true))->toBe([['name' => '@fleetbase/test-engine', 'version' => '1.2.0']]);
 });
 
 test('engine install status reads from the live connection in sandbox mode', function () {
@@ -256,15 +174,3 @@ function sandboxRequest(): Request
 
     expect(app(RegistryController::class)->getEngineInstallStatus($request))->toBe(['installed' => true]);
 });
-
-test('installed and purchased extensions are read from the live connection in sandbox mode', function () {
-    $controller = app(RegistryExtensionController::class);
-
-    foreach (['installed', 'purchased'] as $method) {
-        $response = $controller->{$method}();
-        $models   = collect($response->resource);
-
-        expect($models->pluck('uuid')->all())->toBe(['ext-1'], $method);
-        $models->each(fn ($extension) => expect($extension->getConnectionName())->toBe(LIVE_CONNECTION));
-    }
-});
diff --git a/server/tests/Unit/CentralCatalogTest.php b/server/tests/Unit/CentralCatalogTest.php
deleted file mode 100644
index 0770a95..0000000
--- a/server/tests/Unit/CentralCatalogTest.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-
-use Fleetbase\RegistryBridge\Support\CentralCatalog;
-
-function remoteExtension(array $overrides = []): array
-{
-    return array_merge([
-        'id'               => 'extension_abc123',
-        'slug'             => 'fleet-ops',
-        'name'             => 'Fleet-Ops',
-        'subtitle'         => 'Fleet management',
-        'description'      => 'Fleet & Transport Management Extension for Fleetbase',
-        'icon_url'         => 'https://example.test/icon.svg',
-        'tags'             => ['fleet'],
-        'version'          => '0.6.73',
-        'status'           => 'published',
-        'payment_required' => false,
-        'installs_count'   => 42,
-        'publisher'        => ['name' => 'Fleetbase', 'slug' => 'fleetbase'],
-        'category'         => ['id' => 'category_logistics', 'name' => 'Logistics', 'slug' => 'logistics', 'icon' => 'truck'],
-        'current_bundle'   => [
-            'version' => '0.6.73',
-            'meta'    => [
-                'package.json'  => ['name' => '@fleetbase/fleetops-engine'],
-                'composer.json' => ['name' => 'fleetbase/fleetops-api'],
-            ],
-        ],
-    ], $overrides);
-}
-
-test('transform maps a registry entry into the RegistryExtension resource shape', function () {
-    $mapped = CentralCatalog::transform(remoteExtension(), [], 'https://registry.fleetbase.io');
-
-    expect($mapped['id'])->toBe('extension_abc123')
-        ->and($mapped['uuid'])->toBe('extension_abc123')
-        ->and($mapped['public_id'])->toBe('extension_abc123')
-        ->and($mapped['name'])->toBe('Fleet-Ops')
-        ->and($mapped['category_name'])->toBe('Logistics')
-        ->and($mapped['category_uuid'])->toBe('category_logistics')
-        ->and($mapped['category']['slug'])->toBe('logistics')
-        ->and($mapped['category']['for'])->toBe('extension_category')
-        ->and($mapped['publisher_name'])->toBe('Fleetbase')
-        ->and($mapped['current_bundle_version'])->toBe('0.6.73')
-        ->and($mapped['installs_count'])->toBe(42)
-        ->and($mapped['is_purchased'])->toBeFalse()
-        ->and($mapped['is_author'])->toBeFalse()
-        ->and($mapped['is_installable'])->toBeFalse()
-        ->and($mapped['source'])->toBe('registry')
-        ->and($mapped['meta']['registry_host'])->toBe('https://registry.fleetbase.io')
-        ->and($mapped['meta']['packages'])->toBe(['@fleetbase/fleetops-engine', 'fleetbase/fleetops-api']);
-});
-
-test('is_installed is derived from local package names', function () {
-    expect(CentralCatalog::transform(remoteExtension(), [])['is_installed'])->toBeFalse()
-        ->and(CentralCatalog::transform(remoteExtension(), ['fleetbase/fleetops-api'])['is_installed'])->toBeTrue()
-        ->and(CentralCatalog::transform(remoteExtension(), ['@fleetbase/fleetops-engine'])['is_installed'])->toBeTrue()
-        ->and(CentralCatalog::transform(remoteExtension(), ['@fleetbase/other'])['is_installed'])->toBeFalse();
-});
-
-test('packageNames reads dotted manifest keys from bundle meta', function () {
-    expect(CentralCatalog::packageNames(remoteExtension()))->toBe(['@fleetbase/fleetops-engine', 'fleetbase/fleetops-api'])
-        ->and(CentralCatalog::packageNames(['current_bundle' => null]))->toBe([])
-        ->and(CentralCatalog::packageNames(['package_name' => 'acme/thing']))->toBe(['acme/thing']);
-});
-
-test('transformCategory falls back to a slug derived id and ignores invalid input', function () {
-    $category = CentralCatalog::transformCategory(['name' => 'Last Mile']);
-
-    expect($category['id'])->toBe('category_last-mile')
-        ->and($category['slug'])->toBe('last-mile')
-        ->and($category['core_category'])->toBe(1)
-        ->and(CentralCatalog::transformCategory(null))->toBeNull()
-        ->and(CentralCatalog::transformCategory(['slug' => 'no-name']))->toBeNull();
-});
diff --git a/server/tests/Unit/ExtensionManifestTest.php b/server/tests/Unit/ExtensionManifestTest.php
deleted file mode 100644
index 5a1aeb3..0000000
--- a/server/tests/Unit/ExtensionManifestTest.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-
-use Fleetbase\RegistryBridge\Support\ExtensionManifest;
-
-function validManifest(array $overrides = []): array
-{
-    return array_merge([
-        'name'        => 'Registry Bridge',
-        'version'     => '0.1.10',
-        'description' => 'Internal Bridge between Fleetbase API and Extensions Registry',
-        'engine'      => 'package.json',
-        'api'         => 'composer.json',
-    ], $overrides);
-}
-
-test('schema file is valid JSON Schema 2020-12', function () {
-    $schema = json_decode((string) file_get_contents(ExtensionManifest::schemaPath()), true);
-
-    expect($schema)->toBeArray()
-        ->and($schema['$schema'])->toBe('https://json-schema.org/draft/2020-12/schema')
-        ->and($schema['required'])->toBe(['name', 'version']);
-});
-
-test('accepts the manifest shape existing extensions ship', function () {
-    expect(ExtensionManifest::validate(validManifest()))->toBe([]);
-});
-
-test('accepts package names for engine and api', function () {
-    $manifest = validManifest(['engine' => '@fleetbase/fleetops-engine', 'api' => 'fleetbase/fleetops-api']);
-
-    expect(ExtensionManifest::validate($manifest))->toBe([]);
-});
-
-test('accepts compat ranges, channel and keywords', function () {
-    $manifest = validManifest([
-        'compat'   => ['console' => '>=0.7 <1.0', 'api' => '^1.6'],
-        'channel'  => 'beta',
-        'keywords' => ['fleet', 'routing'],
-    ]);
-
-    expect(ExtensionManifest::validate($manifest))->toBe([]);
-});
-
-test('accepts a stdClass manifest as decoded from extension.json', function () {
-    $manifest = json_decode((string) json_encode(validManifest()));
-
-    expect(ExtensionManifest::validate($manifest))->toBe([]);
-});
-
-test('rejects a non semver version', function () {
-    $errors = ExtensionManifest::validate(validManifest(['version' => 'v1']));
-
-    expect($errors)->toHaveKey('/version');
-});
-
-test('requires name and version', function () {
-    $errors = ExtensionManifest::validate(['engine' => 'package.json']);
-
-    expect($errors)->not->toBe([])
-        ->and(implode(' ', ExtensionManifest::flatten($errors)))->toContain('name');
-});
-
-test('requires engine or api', function () {
-    $errors = ExtensionManifest::validate(['name' => 'Nothing', 'version' => '1.0.0']);
-
-    expect($errors)->not->toBe([]);
-});
-
-test('rejects an unknown channel and a malformed compat block', function () {
-    $errors = ExtensionManifest::validate(validManifest(['channel' => 'nightly']));
-    expect($errors)->toHaveKey('/channel');
-
-    $errors = ExtensionManifest::validate(validManifest(['compat' => ['web' => '1.0']]));
-    expect($errors)->toHaveKey('/compat');
-});
-
-test('rejects duplicate keywords', function () {
-    $errors = ExtensionManifest::validate(validManifest(['keywords' => ['a', 'a']]));
-
-    expect($errors)->toHaveKey('/keywords');
-});
-
-test('flatten produces pointer prefixed lines', function () {
-    $lines = ExtensionManifest::flatten(['/version' => ['bad version'], '/' => ['missing']]);
-
-    expect($lines)->toBe(['/version: bad version', '/: missing']);
-});
diff --git a/server/tests/Unit/PackageAuthTest.php b/server/tests/Unit/PackageAuthTest.php
index e5911f3..2499165 100644
--- a/server/tests/Unit/PackageAuthTest.php
+++ b/server/tests/Unit/PackageAuthTest.php
@@ -52,8 +52,8 @@
         ->and(PackageAuth::composerInstallSpec('registry-demo/hello-api', '1.1.0'))->toBe('registry-demo/hello-api:1.1.0');
 });
 
-test('the v1 fallback config produces no service credentials', function () {
-    $auth = new PackageAuth(new RegistryConfig(['host' => 'https://registry.fleetbase.io', 'token' => 'legacy']));
+test('no credentials are produced without a service URL', function () {
+    $auth = new PackageAuth(new RegistryConfig(['service_url' => '']));
 
     expect($auth->composerEnv())->toBe([])
         ->and($auth->npmEnv())->toBe([])
diff --git a/server/tests/Unit/RegistryClientServiceTest.php b/server/tests/Unit/RegistryClientServiceTest.php
index b1033da..5bb5de6 100644
--- a/server/tests/Unit/RegistryClientServiceTest.php
+++ b/server/tests/Unit/RegistryClientServiceTest.php
@@ -10,25 +10,23 @@
     $this->service = new RegistryServiceFake();
 });
 
-test('api version defaults to v2 with a service URL and falls back to v1 without one', function () {
-    expect((new RegistryConfig(['service_url' => 'registry.example.test']))->apiVersion())->toBe('v2')
-        ->and((new RegistryConfig(['service_url' => 'registry.example.test']))->serviceUrl())->toBe('https://registry.example.test')
-        ->and((new RegistryConfig([]))->apiVersion())->toBe('v1')
-        ->and((new RegistryConfig(['service_url' => 'https://registry.example.test', 'api_version' => 'v1']))->apiVersion())->toBe('v1')
-        ->and((new RegistryConfig(['api_version' => 'v2']))->apiVersion())->toBe('v1')
-        ->and((new RegistryConfig(['self_hosted' => true]))->instanceKind())->toBe('cloud')
+test('the service URL is normalised and decides whether the service is used', function () {
+    expect((new RegistryConfig(['service_url' => 'registry.example.test/']))->serviceUrl())->toBe('https://registry.example.test')
+        ->and((new RegistryConfig(['service_url' => 'registry.example.test']))->usesService())->toBeTrue()
+        ->and((new RegistryConfig([]))->usesService())->toBeFalse()
+        ->and((new RegistryConfig(['instance_kind' => 'cloud']))->instanceKind())->toBe('cloud')
+        ->and((new RegistryConfig(['instance_kind' => 'other']))->instanceKind())->toBe('self_hosted')
         ->and((new RegistryConfig([]))->instanceKind())->toBe('self_hosted');
 });
 
-test('a v2 client targets the service URL with the instance token, a v1 client the registry host', function () {
-    $v2 = RegistryClient::fromConfig(RegistryServiceFake::config());
-    $v1 = RegistryClient::fromConfig(new RegistryConfig(['host' => 'registry.fleetbase.io', 'token' => 'legacy']));
+test('a client targets the service URL with the instance token, or the default service', function () {
+    $client  = RegistryClient::fromConfig(RegistryServiceFake::config());
+    $default = RegistryClient::fromConfig(new RegistryConfig([]));
 
-    expect($v2->usesService())->toBeTrue()
-        ->and($v2->host())->toBe(RegistryServiceFake::SERVICE_URL)
-        ->and($v2->hasToken())->toBeTrue()
-        ->and($v1->usesService())->toBeFalse()
-        ->and($v1->host())->toBe('https://registry.fleetbase.io');
+    expect($client->host())->toBe(RegistryServiceFake::SERVICE_URL)
+        ->and($client->hasToken())->toBeTrue()
+        ->and($default->host())->toBe(RegistryConfig::DEFAULT_SERVICE_URL)
+        ->and($default->hasToken())->toBeFalse();
 });
 
 test('catalog pages come from /v1/catalog/extensions and are cached', function () {
@@ -207,7 +205,7 @@
 
 test('an outage serves the last good catalog', function () {
     $this->service->on('GET', 'v1/catalog/categories', 'catalog-categories');
-    $client = new class(null, null, null, RegistryServiceFake::config()) extends RegistryClient {
+    $client = new class(null, null, RegistryServiceFake::config()) extends RegistryClient {
         public function freshKey(string $path): string
         {
             return $this->cacheKey($path, []);
@@ -237,15 +235,7 @@ public function freshKey(string $path): string
         ->and(count($this->service->requests))->toBe($before);
 });
 
-test('the v1 fallback still reads the cloud catalog endpoint', function () {
-    $this->service->respondWith('GET', '~registry/v1/extensions', 200, [['id' => 'extension_abc', 'name' => 'Fleet-Ops']]);
-    $client = RegistryClient::fromConfig(new RegistryConfig(['host' => 'https://registry.fleetbase.io']));
-
-    expect($client->listPublicExtensions())->toBe([['id' => 'extension_abc', 'name' => 'Fleet-Ops']])
-        ->and($this->service->requests[0]->url())->toBe('https://registry.fleetbase.io/~registry/v1/extensions');
-});
-
-test('testing a v2 connection counts the catalog and checks the instance token', function () {
+test('testing the connection counts the catalog and checks the instance token', function () {
     $this->service
         ->on('GET', 'v1/catalog/extensions', 'catalog-extensions-search')
         ->on('GET', 'v1/instances/me', 'instances-me');
@@ -260,7 +250,7 @@ public function freshKey(string $path): string
         ->and($result['instance']['organization'])->toBe('Registry Demo Buyer');
 });
 
-test('testing a v2 connection reports a rejected instance token', function () {
+test('testing the connection reports a rejected instance token', function () {
     $this->service
         ->on('GET', 'v1/catalog/extensions', 'catalog-extensions')
         ->on('GET', 'v1/instances/me', 'instances-me-unauthenticated');
diff --git a/server/tests/Unit/RegistrySettingsTest.php b/server/tests/Unit/RegistrySettingsTest.php
index 833151f..fcc5b19 100644
--- a/server/tests/Unit/RegistrySettingsTest.php
+++ b/server/tests/Unit/RegistrySettingsTest.php
@@ -53,7 +53,7 @@ function storedRegistration(string $token, string $id, string $serviceUrl = 'htt
 
     $this->container = new Container();
     $this->container->instance('config', new Config([
-        'registry-bridge' => ['registry' => ['host' => 'https://registry.fleetbase.io', 'instance_kind' => 'self_hosted', 'instance' => []]],
+        'registry-bridge' => ['registry' => ['instance_kind' => 'self_hosted', 'instance' => []]],
     ]));
     $this->container->instance('encrypter', settingsEncrypter());
     $this->container->instance('events', new Dispatcher($this->container));
@@ -68,10 +68,9 @@ function storedRegistration(string $token, string $id, string $serviceUrl = 'htt
 
 test('stored settings override the config file and missing ones fall back to it', function () {
     $values = RegistrySettings::merge(
-        ['host' => 'https://registry.fleetbase.io', 'service_url' => 'https://env.example.test', 'instance_token' => null],
+        ['service_url' => 'https://env.example.test', 'instance_token' => null],
         [
-            RegistrySettings::SETTING_HOST               => '',
-            InstanceRegistration::SETTING_API_VERSION    => 'v1',
+            InstanceRegistration::SETTING_SERVICE_URL    => '',
             InstanceRegistration::SETTING_INSTANCE_TOKEN => 'not-encrypted',
             InstanceRegistration::SETTING_INSTANCE       => ['id' => 'inst_1'],
         ],
@@ -79,10 +78,7 @@ function storedRegistration(string $token, string $id, string $serviceUrl = 'htt
     );
 
     expect($values)->toBe([
-        'host'           => 'https://registry.fleetbase.io',
-        'token'          => null,
         'service_url'    => 'https://env.example.test',
-        'api_version'    => 'v1',
         'instance_token' => null,
         'instance'       => ['id' => 'inst_1'],
     ]);
@@ -98,8 +94,7 @@ function storedRegistration(string $token, string $id, string $serviceUrl = 'htt
         ->and($config->instanceToken())->toBe('flbi_first')
         ->and($config->serviceUrl())->toBe('https://registry.example.test')
         ->and($config->instance()['id'])->toBe('inst_first')
-        ->and($config->instanceKind())->toBe('self_hosted')
-        ->and($config->host())->toBe('https://registry.fleetbase.io');
+        ->and($config->instanceKind())->toBe('self_hosted');
 });
 
 test('an Octane request sees a registration another process stored after the worker booted', function () {
@@ -157,7 +152,7 @@ function storedRegistration(string $token, string $id, string $serviceUrl = 'htt
     $config = RegistryConfig::current();
 
     expect($config->isRegistered())->toBeFalse()
-        ->and($config->host())->toBe('https://registry.fleetbase.io')
+        ->and($config->instanceKind())->toBe('self_hosted')
         ->and(StoredRegistrySettings::$reads)->toBe(1);
 });
 
@@ -200,7 +195,7 @@ function settingsCache(Container $container): Cache
     RegistrySettings::settingChanged(null);
     expect($cache->get(RegistrySettings::CACHE_KEY))->toBe(['kept' => true]);
 
-    RegistrySettings::settingChanged(RegistrySettings::SETTING_HOST);
+    RegistrySettings::settingChanged(InstanceRegistration::SETTING_SERVICE_URL);
     expect($cache->has(RegistrySettings::CACHE_KEY))->toBeFalse();
 });
 
diff --git a/server/tests/Unit/ServiceCatalogTest.php b/server/tests/Unit/ServiceCatalogTest.php
index e0a8579..a9dbf0c 100644
--- a/server/tests/Unit/ServiceCatalogTest.php
+++ b/server/tests/Unit/ServiceCatalogTest.php
@@ -1,5 +1,7 @@
 <?php
 
+use Fleetbase\RegistryBridge\Support\Installer\Files;
+use Fleetbase\RegistryBridge\Support\Installer\InstallerConfig;
 use Fleetbase\RegistryBridge\Support\RegistryClient;
 use Fleetbase\RegistryBridge\Support\ServiceCatalog;
 use Fleetbase\RegistryBridge\Tests\Support\RegistryServiceFake;
@@ -42,12 +44,11 @@ function registeredState(): array
         ->and($mapped['category_name'])->toBe('Telematics')
         ->and($mapped['category_uuid'])->toBe('cat_3a9uznxr8s')
         ->and($mapped['current_bundle_version'])->toBe('1.0.0')
-        ->and($mapped['current_bundle_id'])->toBe('rel_gjrc6mixp0')
+        ->and($mapped['meta']['latest_release']['id'])->toBe('rel_gjrc6mixp0')
         ->and($mapped['payment_required'])->toBeTrue()
         ->and($mapped['price'])->toBe(4900)
         ->and($mapped['currency'])->toBe('USD')
         ->and($mapped['languages'])->toBe(['en'])
-        ->and($mapped['self_managed'])->toBeFalse()
         ->and($mapped['source'])->toBe('registry-service')
         ->and($mapped['meta']['package_names'])->toBe(['npm' => '@registry-demo/pro-engine', 'composer' => 'registry-demo/pro-api'])
         ->and($mapped['meta']['registry_host'])->toBe(RegistryServiceFake::SERVICE_URL)
@@ -55,13 +56,68 @@ function registeredState(): array
 });
 
 test('every recorded listing maps with the keys the console reads', function () {
-    $keys = array_keys(Fleetbase\RegistryBridge\Support\CentralCatalog::transform(['id' => 'x', 'name' => 'x']));
+    $keys = [
+        'id', 'public_id', 'name', 'subtitle', 'description', 'promotional_text', 'icon_url', 'slug', 'status', 'tags', 'languages',
+        'website_url', 'repo_url', 'support_url', 'privacy_policy_url', 'tos_url', 'copyright', 'payment_required', 'price', 'sale_price',
+        'on_sale', 'currency', 'category', 'category_name', 'publisher_name', 'current_bundle_version', 'screenshots', 'is_installed',
+        'is_purchased', 'is_author', 'is_installable', 'installed_version', 'latest_version', 'update_available', 'source', 'meta',
+        'core_extension', 'installs_count', 'updated_at',
+    ];
 
     foreach (RegistryServiceFake::body('catalog-extensions')['data'] as $listing) {
         expect(array_keys(ServiceCatalog::transform($listing)))->toContain(...$keys);
     }
 });
 
+test('install mode: runtime only for a prebuilt dist this console can load, otherwise a rebuild', function () {
+    $dist    = ['sha256' => str_repeat('a', 64), 'built_against' => ['@fleetbase/ember-ui' => '0.4.6', '@fleetbase/ember-core' => '0.3.26']];
+    $console = ['host_versions' => ['@fleetbase/ember-ui' => '0.4.9', '@fleetbase/ember-core' => '0.3.30'], 'built_in' => ['@fleetbase/ember-core']];
+
+    expect(ServiceCatalog::installMode('@acme/a-engine', $dist, $console))->toBe('runtime')
+        ->and(ServiceCatalog::installMode('@acme/a-engine', $dist, null))->toBe('runtime')
+        ->and(ServiceCatalog::installMode(null, null, $console))->toBe('server')
+        ->and(ServiceCatalog::installMode('@acme/a-engine', null, $console))->toBe('build')
+        ->and(ServiceCatalog::installMode('@acme/a-engine', ['sha256' => ''], $console))->toBe('build')
+        ->and(ServiceCatalog::installMode('@acme/a-engine', $dist, ['host_versions' => null, 'built_in' => []]))->toBe('build')
+        ->and(ServiceCatalog::installMode('@acme/a-engine', $dist, [...$console, 'built_in' => ['@acme/a-engine']]))->toBe('build')
+        ->and(ServiceCatalog::installMode('@acme/a-engine', $dist, [...$console, 'host_versions' => ['@fleetbase/ember-ui' => '0.5.0']]))->toBe('build');
+});
+
+test('the console state comes from its host-modules.json and package.json', function () {
+    $root = sys_get_temp_dir() . '/registry-console-state-' . bin2hex(random_bytes(4));
+    Files::write($root . '/package.json', json_encode(['dependencies' => ['@acme/built-engine' => '1.0.0'], 'devDependencies' => ['ember-source' => '5.4.0']]));
+    $config = InstallerConfig::fromArray(['api_path' => $root . '/api', 'console_path' => $root, 'work_path' => $root . '/work']);
+
+    expect(ServiceCatalog::consoleState($config))->toBe(['host_versions' => null, 'built_in' => ['@acme/built-engine', 'ember-source']]);
+
+    Files::write($root . '/dist/host-modules.json', json_encode(['versions' => ['@fleetbase/ember-ui' => '0.4.6'], 'modules' => []]));
+    expect(ServiceCatalog::consoleState($config)['host_versions'])->toBe(['@fleetbase/ember-ui' => '0.4.6']);
+
+    Files::delete($root);
+});
+
+test('listings carry the install mode of the release an install or update would take', function () {
+    $console = ['host_versions' => ['@fleetbase/ember-ui' => '0.4.6', '@fleetbase/ember-core' => '0.3.26'], 'built_in' => []];
+    $dist    = ['sha256' => str_repeat('b', 64), 'built_against' => ['@fleetbase/ember-ui' => '0.4.6']];
+    $listing = serviceListing('registry-demo-hello');
+
+    expect(ServiceCatalog::transform($listing, ['console' => $console])['meta']['install_mode'])->toBe('build');
+
+    $listing['latest_release']['dist'] = $dist;
+    $mapped                            = ServiceCatalog::transform($listing, ['console' => $console]);
+    expect($mapped['meta']['install_mode'])->toBe('runtime')
+        ->and($mapped['meta']['uninstall_mode'])->toBe('runtime')
+        ->and($mapped['meta']['latest_release']['dist'])->toBe($dist);
+
+    // an installed extension: the update's release decides, and an engine built into the console uninstalls by rebuild
+    $state            = registeredState();
+    $state['console'] = [...$console, 'built_in' => [$listing['packages']['npm']]];
+    $mapped           = ServiceCatalog::transform($listing, $state);
+    expect($mapped['update_available'])->toBeTrue()
+        ->and($mapped['meta']['install_mode'])->toBe('build')
+        ->and($mapped['meta']['uninstall_mode'])->toBe('build');
+});
+
 test('an installed free extension shows its update from the instance API', function () {
     $mapped = ServiceCatalog::transform(serviceListing('registry-demo-hello'), registeredState());
 
@@ -134,7 +190,7 @@ function registeredState(): array
     ])->and($categories[0]['meta']['extensions_count'])->toBe(2);
 });
 
-test('Explore passes search, category and hosting to the service and decorates the page', function () {
+test('Explore passes search and category to the service, lists every hosting, and decorates the page', function () {
     $this->service
         ->on('GET', 'v1/catalog/extensions', 'catalog-extensions')
         ->on('GET', 'v1/instances/me', 'instances-me-installed')
@@ -146,7 +202,7 @@ function registeredState(): array
     $url = $this->service->requestsTo('GET', 'v1/catalog/extensions')[0]->url();
     expect($url)->toContain('q=demo')
         ->and($url)->toContain('category=cat_3a9uznxr8s')
-        ->and($url)->toContain('hosting=self_hosted')
+        ->and($url)->not->toContain('hosting=')
         ->and($url)->toContain('limit=10')
         ->and($page->total())->toBe(2)
         ->and($page->items()[0]['is_installed'])->toBeTrue()
@@ -187,7 +243,7 @@ function registeredState(): array
         ->and($installed[1]['current_bundle_version'])->toBe('0.1.0');
 });
 
-test('Purchased lists only active paid licences', function () {
+test('Purchased leaves out free licences', function () {
     $this->service
         ->on('GET', 'v1/catalog/extensions', 'catalog-extensions')
         ->on('GET', 'v1/instances/me', 'instances-me-installed')
@@ -199,6 +255,63 @@ function registeredState(): array
         ->and($purchased[0]['is_purchased'])->toBeTrue();
 });
 
+test('Purchased keeps refunded and revoked paid licences with their state, without entitling installs', function () {
+    $me                                  = RegistryServiceFake::body('instances-me-installed');
+    $me['licences'][1]['status']         = 'revoked';
+    $me['licences'][1]['revoked_reason'] = 'refunded';
+    $me['licences'][]                    = ['id' => 'lic_gone', 'extension' => ['id' => 'ext_delisted', 'slug' => 'delisted-pro', 'name' => 'Delisted Pro'], 'kind' => 'paid', 'status' => 'revoked', 'revoked_reason' => 'disputed', 'max_activations' => 5, 'seats_used' => 1, 'created_at' => '2026-10-01T00:00:00Z'];
+    $this->service
+        ->on('GET', 'v1/catalog/extensions', 'catalog-extensions')
+        ->respondWith('GET', 'v1/instances/me', 200, $me)
+        ->on('GET', 'v1/instances/me/updates', 'instances-me-updates');
+
+    $purchased = ServiceCatalog::purchased(RegistryClient::fromConfig(RegistryServiceFake::config()), RegistryServiceFake::config());
+    $bySlug    = array_column($purchased, null, 'slug');
+
+    expect(array_keys($bySlug))->toBe(['registry-demo-pro', 'delisted-pro'])
+        ->and($bySlug['registry-demo-pro']['is_purchased'])->toBeFalse()
+        ->and($bySlug['registry-demo-pro']['is_installable'])->toBeFalse()
+        ->and($bySlug['registry-demo-pro']['meta']['install_blocked_code'])->toBe('licence_required')
+        ->and($bySlug['registry-demo-pro']['meta']['licence_state'])->toBe('refunded')
+        ->and($bySlug['registry-demo-pro']['meta']['licence']['revoked_reason'])->toBe('refunded')
+        ->and($bySlug['delisted-pro']['meta']['licence_state'])->toBe('revoked')
+        ->and($bySlug['delisted-pro']['is_purchased'])->toBeFalse();
+
+    $state = ServiceCatalog::buildState($me, [], [], true);
+    expect(ServiceCatalog::counts($state)['purchased'])->toBe(0);
+});
+
+test('an active paid licence wins over a revoked one for the same extension, in either order', function () {
+    $active  = ['id' => 'lic_new', 'extension' => ['id' => 'ext_1'], 'kind' => 'paid', 'status' => 'active'];
+    $revoked = ['id' => 'lic_old', 'extension' => ['id' => 'ext_1'], 'kind' => 'paid', 'status' => 'revoked', 'revoked_reason' => 'refunded'];
+    $free    = ['id' => 'lic_free', 'extension' => ['id' => 'ext_1'], 'kind' => 'free', 'status' => 'active'];
+
+    foreach ([[$revoked, $active], [$active, $revoked], [$free, $revoked, $active]] as $licences) {
+        $state = ServiceCatalog::buildState(['licences' => $licences], [], [], true);
+        expect($state['licences']['ext_1']['id'])->toBe('lic_new')
+            ->and(ServiceCatalog::counts($state)['purchased'])->toBe(1);
+    }
+
+    expect(ServiceCatalog::buildState(['licences' => [$free, $revoked]], [], [], true)['licences']['ext_1']['id'])->toBe('lic_old');
+});
+
+test('licence states the console shows', function () {
+    expect(ServiceCatalog::licenceState(null))->toBeNull()
+        ->and(ServiceCatalog::licenceState(['kind' => 'paid', 'status' => 'active']))->toBe('active')
+        ->and(ServiceCatalog::licenceState(['kind' => 'paid', 'status' => 'revoked', 'revoked_reason' => 'refunded']))->toBe('refunded')
+        ->and(ServiceCatalog::licenceState(['kind' => 'paid', 'status' => 'revoked', 'revoked_reason' => 'staff']))->toBe('revoked')
+        ->and(ServiceCatalog::licenceState(['kind' => 'paid', 'status' => 'revoked']))->toBe('revoked')
+        ->and(ServiceCatalog::isPaidLicence(['kind' => 'paid', 'status' => 'revoked', 'revoked_reason' => 'refunded']))->toBeFalse();
+});
+
+test('the registry organization comes from the registration, not the console company', function () {
+    $config = RegistryServiceFake::config(['instance' => ['id' => 'inst_1', 'organization' => ['id' => 'org_9sz9sh8ivz', 'slug' => 'registry-demo-buyer', 'name' => 'Registry Demo Buyer']]]);
+
+    expect($config->organization())->toBe(['id' => 'org_9sz9sh8ivz', 'slug' => 'registry-demo-buyer', 'name' => 'Registry Demo Buyer'])
+        ->and(RegistryServiceFake::config()->organization())->toBeNull()
+        ->and(RegistryServiceFake::config(['instance' => ['organization' => ['name' => '']]])->organization())->toBeNull();
+});
+
 test('lookup resolves npm and Composer names, slugs and ids from the catalog', function () {
     $this->service->on('GET', 'v1/catalog/extensions', 'catalog-extensions');
     $client = RegistryClient::fromConfig(RegistryServiceFake::config());
diff --git a/server/tests/Unit/ServiceCheckoutContractTest.php b/server/tests/Unit/ServiceCheckoutContractTest.php
new file mode 100644
index 0000000..610369a
--- /dev/null
+++ b/server/tests/Unit/ServiceCheckoutContractTest.php
@@ -0,0 +1,130 @@
+<?php
+
+use Fleetbase\RegistryBridge\Exceptions\RegistryServiceException;
+use Fleetbase\RegistryBridge\Support\RegistryClient;
+use Fleetbase\RegistryBridge\Support\ServiceCatalog;
+use Fleetbase\RegistryBridge\Support\ServiceCheckout;
+use Fleetbase\RegistryBridge\Support\ServiceReceipts;
+use Fleetbase\RegistryBridge\Tests\Support\RegistryServiceFake;
+use Illuminate\Http\Request;
+
+/*
+ * The instance checkout contract ("Instance checkout" in the Registry Service README), against responses
+ * recorded from the Phase 4 service (`record_phase4.py`).
+ */
+
+const CHECKOUT_PATH = 'v1/instances/me/purchases/checkout';
+
+function checkoutFixtureStatus(string $name): array
+{
+    $fixture = RegistryServiceFake::fixture($name);
+
+    return [$fixture['status'], $fixture['body']];
+}
+
+beforeEach(function () {
+    $this->service = new RegistryServiceFake();
+    $this->config  = RegistryServiceFake::config();
+    $this->client  = RegistryClient::fromConfig($this->config);
+});
+
+test('a started checkout returns the hosted URL and hand-off, sending the contract fields', function () {
+    $open = RegistryServiceFake::body('purchases-handoff-open');
+    $this->service->respondWith('POST', CHECKOUT_PATH, 201, $open);
+
+    $checkout = ServiceCheckout::start($this->client, $this->config, 'acme-route-planner', 'https://fleet.example.test/extensions?purchase_return=1', null, 'ops@example.test');
+
+    $body = $this->service->requestsTo('POST', CHECKOUT_PATH)[0]->data();
+    expect($checkout)->toMatchArray(['url' => $open['url'], 'handoff' => $open['handoff'], 'status' => 'open', 'amount' => 2900, 'currency' => 'USD'])
+        ->and($body)->toBe(['extension' => 'acme-route-planner', 'return_url' => 'https://fleet.example.test/extensions?purchase_return=1', 'email' => 'ops@example.test']);
+});
+
+test('the service refusals pass through with their status and message', function (string $fixture, int $status, string $message) {
+    $this->service->on('POST', CHECKOUT_PATH, $fixture);
+
+    try {
+        ServiceCheckout::start($this->client, $this->config, 'acme-route-planner', 'https://fleet.example.test/extensions');
+        $this->fail('expected a refusal');
+    } catch (RegistryServiceException $e) {
+        expect($e->status())->toBe($status)
+            ->and($e->getMessage())->toContain($message)
+            ->and(ServiceCheckout::available($this->config))->toBeTrue('a refusal does not turn checkout off');
+    }
+})->with([
+    'already licensed'        => ['checkout-already-licensed', 409, 'already holds a licence'],
+    'publisher not onboarded' => ['checkout-no-stripe', 422, 'has not finished setting up payouts'],
+    'hosting mismatch'        => ['checkout-hosting-mismatch', 422, 'only available for cloud instances'],
+    'unknown extension'       => ['checkout-unknown-extension', 404, 'Extension not found'],
+    'validation'              => ['checkout-validation', 422, 'return url field is required'],
+]);
+
+test('a service without the checkout route turns checkout off for a while', function () {
+    $this->service->respondWith('POST', CHECKOUT_PATH, 404, ['errors' => ['Resource not found.']]);
+
+    expect(fn () => ServiceCheckout::start($this->client, $this->config, 'acme-route-planner', 'https://fleet.example.test/extensions'))
+        ->toThrow(RegistryServiceException::class, ServiceCheckout::unavailableReason());
+    expect(ServiceCheckout::available($this->config))->toBeFalse()
+        ->and(ServiceCheckout::available(RegistryServiceFake::config(['checkout' => true])))->toBeTrue('forcing it on still works');
+});
+
+test('recorded hand-offs map onto pending, completed and failed', function () {
+    $open     = ServiceCheckout::describe(RegistryServiceFake::body('purchases-handoff-open'));
+    $expired  = ServiceCheckout::describe(RegistryServiceFake::body('purchases-handoff-expired'));
+    $complete = ServiceCheckout::describe(RegistryServiceFake::body('purchases-handoff-complete'));
+
+    expect($open)->toMatchArray(['status' => 'pending', 'service_status' => 'open', 'receipt_url' => null])
+        ->and($expired)->toMatchArray(['status' => 'failed', 'service_status' => 'expired'])
+        ->and($complete)->toMatchArray(['status' => 'completed', 'service_status' => 'complete', 'receipt_url' => 'https://pay.stripe.com/receipts/payment/bridge_test'])
+        ->and($complete['extension']['slug'])->toBe('acme-route-planner')
+        ->and($complete['purchase']['licence']['max_activations'])->toBe(5);
+});
+
+test('a completed hand-off keeps its receipt for Purchased', function () {
+    $this->service
+        ->on('GET', 'v1/instances/me/purchases/chk_3tampcinhk', 'purchases-handoff-complete')
+        ->on('GET', 'v1/instances/me', 'instances-me-purchased')
+        ->on('GET', 'v1/instances/me/updates', 'instances-me-updates')
+        ->on('GET', 'v1/catalog/extensions', 'catalog-extensions-every-hosting');
+
+    ServiceReceipts::remember($this->config, ServiceCheckout::describe($this->client->purchase('chk_3tampcinhk')));
+    $purchased = ServiceCatalog::purchased($this->client, $this->config);
+    $route     = collect($purchased)->firstWhere('slug', 'acme-route-planner');
+
+    expect($route['meta']['licence']['receipt_url'])->toBe('https://pay.stripe.com/receipts/payment/bridge_test')
+        ->and($route['meta']['licence']['purchase'])->toMatchArray(['id' => 'pur_rqcusnwvoh', 'amount_total' => 3190, 'currency' => 'USD'])
+        ->and($route['meta']['licence']['max_activations'])->toBe(5)
+        ->and(collect($purchased)->firstWhere('slug', 'registry-demo-pro')['meta']['licence']['receipt_url'])->toBeNull();
+});
+
+test('a hand-off that is not complete keeps no receipt', function () {
+    ServiceReceipts::remember($this->config, ServiceCheckout::describe(RegistryServiceFake::body('purchases-handoff-open')));
+
+    expect(ServiceReceipts::all($this->config))->toBe([]);
+});
+
+test('Explore lists every hosting and explains the ones this instance cannot install', function () {
+    $this->service
+        ->on('GET', 'v1/catalog/extensions', 'catalog-extensions-every-hosting')
+        ->on('GET', 'v1/instances/me', 'instances-me-purchased')
+        ->on('GET', 'v1/instances/me/updates', 'instances-me-updates');
+
+    $items = collect(ServiceCatalog::query(Request::create('/', 'GET', ['explore' => 1]), $this->client, $this->config)->items())->keyBy('slug');
+
+    expect($items->keys()->sort()->values()->all())->toBe(['acme-fleet-insights', 'acme-route-planner', 'registry-demo-hello', 'registry-demo-pro'])
+        ->and($items['acme-fleet-insights']['meta']['install_blocked_code'])->toBe('hosting')
+        ->and($items['acme-fleet-insights']['meta']['install_blocked_reason'])->toBe('This extension is only available on Fleetbase Cloud.')
+        ->and($items['acme-fleet-insights']['meta']['purchase_available'])->toBeFalse()
+        ->and($items['registry-demo-pro']['is_purchased'])->toBeTrue();
+});
+
+test('recorded releases map for the Versions tab', function () {
+    $this->service
+        ->on('GET', 'v1/catalog/extensions/registry-demo-hello/releases', 'catalog-releases')
+        ->on('GET', 'v1/catalog/extensions/does-not-exist/releases', 'catalog-releases-not-found');
+
+    $releases = ServiceCatalog::releases('registry-demo-hello', $this->client, '1.0.0');
+
+    expect($releases['latest'])->toBe('1.0.0')
+        ->and($releases['releases'][0])->toMatchArray(['version' => '1.0.0', 'is_latest' => true, 'is_installed' => true, 'channel' => 'stable'])
+        ->and(ServiceCatalog::releases('does-not-exist', $this->client))->toBeNull();
+});
diff --git a/server/tests/Unit/ServiceConsoleTest.php b/server/tests/Unit/ServiceConsoleTest.php
new file mode 100644
index 0000000..634d04b
--- /dev/null
+++ b/server/tests/Unit/ServiceConsoleTest.php
@@ -0,0 +1,172 @@
+<?php
+
+use Fleetbase\RegistryBridge\Support\RegistryClient;
+use Fleetbase\RegistryBridge\Support\RegistryConfig;
+use Fleetbase\RegistryBridge\Support\ServiceCatalog;
+use Fleetbase\RegistryBridge\Tests\Support\RegistryServiceFake;
+use Illuminate\Http\Request;
+
+/*
+ * What the redesigned console reads from the service: Explore facets, the purchase CTA, versions and the
+ * checkout hand-off.
+ */
+
+function consoleListing(string $slug): array
+{
+    foreach (RegistryServiceFake::body('catalog-extensions')['data'] as $listing) {
+        if ($listing['slug'] === $slug) {
+            return $listing;
+        }
+    }
+
+    throw new RuntimeException('No recorded listing ' . $slug);
+}
+
+function releasesPayload(): array
+{
+    return [
+        'extension' => 'registry-demo-hello',
+        'latest'    => '1.1.0',
+        'channels'  => ['stable' => '1.1.0', 'beta' => '1.2.0-beta.1'],
+        'releases'  => [
+            ['id' => 'rel_3', 'version' => '1.2.0-beta.1', 'channel' => 'beta', 'status' => 'published', 'compat' => ['fleetbase' => '>=0.7'], 'size_bytes' => 2048, 'notes' => 'Beta', 'published_at' => '2026-10-20T00:00:00Z', 'yanked_at' => null],
+            ['id' => 'rel_2', 'version' => '1.1.0', 'channel' => 'stable', 'status' => 'published', 'compat' => [], 'size_bytes' => 1024, 'notes' => null, 'published_at' => '2026-10-10T00:00:00Z', 'yanked_at' => null],
+            ['id' => 'rel_1', 'version' => '1.0.0', 'channel' => 'stable', 'status' => 'yanked', 'compat' => [], 'size_bytes' => 900, 'notes' => null, 'published_at' => '2026-10-01T00:00:00Z', 'yanked_at' => '2026-10-02T00:00:00Z'],
+            'not a release',
+        ],
+    ];
+}
+
+beforeEach(function () {
+    $this->service = new RegistryServiceFake();
+});
+
+test('Explore passes pricing, sort and the hosting facet to the service and ignores unknown values', function () {
+    $this->service
+        ->on('GET', 'v1/catalog/extensions', 'catalog-extensions')
+        ->on('GET', 'v1/instances/me', 'instances-me-installed')
+        ->on('GET', 'v1/instances/me/updates', 'instances-me-updates');
+    $client = RegistryClient::fromConfig(RegistryServiceFake::config());
+
+    ServiceCatalog::query(Request::create('/registry-extensions', 'GET', ['explore' => 1, 'pricing' => 'paid', 'hosting' => 'both', 'sort' => 'newest']), $client, RegistryServiceFake::config());
+    ServiceCatalog::query(Request::create('/registry-extensions', 'GET', ['explore' => 1, 'pricing' => 'gratis', 'hosting' => 'cloud', 'sort' => 'random']), $client, RegistryServiceFake::config());
+    ServiceCatalog::query(Request::create('/registry-extensions', 'GET', ['explore' => 1, 'hosting' => 'moon']), $client, RegistryServiceFake::config());
+
+    [$first, $second, $third] = $this->service->requestsTo('GET', 'v1/catalog/extensions');
+    expect($first->url())->toContain('pricing=paid')
+        ->and($first->url())->toContain('hosting=both')
+        ->and($first->url())->toContain('sort=newest')
+        ->and($second->url())->not->toContain('pricing=')
+        ->and($second->url())->toContain('hosting=cloud')
+        ->and($second->url())->not->toContain('sort=')
+        ->and($third->url())->not->toContain('hosting=');
+});
+
+test('hiding installed extensions filters the whole catalog and pages the rest', function () {
+    $this->service
+        ->on('GET', 'v1/catalog/extensions', 'catalog-extensions')
+        ->on('GET', 'v1/instances/me', 'instances-me-installed')
+        ->on('GET', 'v1/instances/me/updates', 'instances-me-updates');
+    $client = RegistryClient::fromConfig(RegistryServiceFake::config());
+
+    $page = ServiceCatalog::query(Request::create('/registry-extensions', 'GET', ['explore' => 1, 'hide_installed' => 'true', 'limit' => 10]), $client, RegistryServiceFake::config());
+
+    expect($page->total())->toBe(1)
+        ->and($page->items()[0]['slug'])->toBe('registry-demo-pro')
+        ->and($page->items()[0]['is_installed'])->toBeFalse();
+});
+
+test('install blocks carry a code the console branches on', function () {
+    expect(ServiceCatalog::installBlock(false, 'both', 'self_hosted', false, false, ['a'], '1.0.0')['code'])->toBe('not_registered')
+        ->and(ServiceCatalog::installBlock(true, 'cloud', 'self_hosted', false, false, ['a'], '1.0.0')['code'])->toBe('hosting')
+        ->and(ServiceCatalog::installBlock(true, 'both', 'self_hosted', true, false, ['a'], '1.0.0')['code'])->toBe('licence_required')
+        ->and(ServiceCatalog::installBlock(true, 'both', 'self_hosted', false, false, [], ''))->toMatchArray(['code' => 'no_release'])
+        ->and(ServiceCatalog::installBlock(true, 'both', 'self_hosted', true, true, ['a'], '1.0.0'))->toBeNull();
+});
+
+test('a paid listing offers purchase only when the service checkout is available', function () {
+    $listing             = consoleListing('registry-demo-pro');
+    $without             = ServiceCatalog::buildState(RegistryServiceFake::body('instances-me'), [], [], true);
+    $with                = ServiceCatalog::buildState(RegistryServiceFake::body('instances-me'), [], [], true, 'self_hosted', true);
+    $without['licences'] = $with['licences'] = [];
+
+    $blocked   = ServiceCatalog::transform($listing, $without);
+    $available = ServiceCatalog::transform($listing, $with);
+
+    expect($blocked['meta']['purchase_available'])->toBeFalse()
+        ->and($blocked['meta']['install_blocked_code'])->toBe('licence_required')
+        ->and($blocked['meta']['install_blocked_reason'])->toContain('not available yet')
+        ->and($available['meta']['purchase_available'])->toBeTrue()
+        ->and($available['meta']['install_blocked_reason'])->toBe('Purchase a licence for your organization to install this extension.')
+        ->and($available['is_installable'])->toBeFalse();
+});
+
+test('checkout is on for a registered instance unless the service has none, and can be forced', function () {
+    $auto = RegistryServiceFake::config();
+
+    expect($auto->checkoutEnabled())->toBeTrue()
+        ->and($auto->checkoutEnabled(false))->toBeFalse()
+        ->and(RegistryServiceFake::config(['checkout' => 'false'])->checkoutEnabled())->toBeFalse()
+        ->and(RegistryServiceFake::config(['checkout' => true])->checkoutEnabled(false))->toBeTrue()
+        ->and(RegistryServiceFake::config(['instance_token' => null, 'checkout' => true])->checkoutEnabled())->toBeFalse()
+        ->and((new RegistryConfig(['service_url' => '', 'checkout' => true]))->checkoutEnabled())->toBeFalse();
+});
+
+test('the publisher portal defaults to the service URL', function () {
+    expect(RegistryServiceFake::config()->publisherUrl())->toBe(RegistryServiceFake::SERVICE_URL)
+        ->and(RegistryServiceFake::config(['publisher_url' => 'publish.example.test/'])->publisherUrl())->toBe('https://publish.example.test')
+        ->and((new RegistryConfig(['service_url' => '']))->publisherUrl())->toBeNull();
+});
+
+test('releases map with latest, installed and yanked flags', function () {
+    $mapped = ServiceCatalog::transformReleases(releasesPayload(), '1.0.0');
+
+    expect($mapped['latest'])->toBe('1.1.0')
+        ->and($mapped['channels'])->toBe(['stable' => '1.1.0', 'beta' => '1.2.0-beta.1'])
+        ->and($mapped['releases'])->toHaveCount(3)
+        ->and($mapped['releases'][0])->toMatchArray(['version' => '1.2.0-beta.1', 'channel' => 'beta', 'is_latest' => false, 'size_bytes' => 2048])
+        ->and($mapped['releases'][1])->toMatchArray(['version' => '1.1.0', 'is_latest' => true, 'is_installed' => false, 'is_yanked' => false])
+        ->and($mapped['releases'][2])->toMatchArray(['version' => '1.0.0', 'is_installed' => true, 'is_yanked' => true]);
+});
+
+test('releases are read from the catalog releases endpoint and a missing listing is null', function () {
+    $this->service
+        ->respondWith('GET', 'v1/catalog/extensions/registry-demo-hello/releases', 200, releasesPayload())
+        ->on('GET', 'v1/catalog/extensions/nope/releases', 'catalog-extension-not-found');
+    $client = RegistryClient::fromConfig(RegistryServiceFake::config());
+
+    expect(ServiceCatalog::releases('registry-demo-hello', $client)['releases'])->toHaveCount(3)
+        ->and(ServiceCatalog::releases('nope', $client))->toBeNull();
+});
+
+test('a hosting mismatch is listed with its reason instead of being hidden', function () {
+    $listing            = consoleListing('registry-demo-hello');
+    $listing['hosting'] = 'cloud';
+    $mapped             = ServiceCatalog::transform($listing, ServiceCatalog::buildState([], [], [], true));
+
+    expect($mapped['is_installable'])->toBeFalse()
+        ->and($mapped['meta']['hosting'])->toBe('cloud')
+        ->and($mapped['meta']['install_blocked_code'])->toBe('hosting')
+        ->and($mapped['meta']['install_blocked_reason'])->toBe('This extension is only available on Fleetbase Cloud.');
+});
+
+test('sidebar counts come from the instance state and local installs', function () {
+    $state = ServiceCatalog::buildState(RegistryServiceFake::body('instances-me-installed'), RegistryServiceFake::body('instances-me-updates'), [], true);
+
+    $counts = ServiceCatalog::counts($state, ['ext_local_only']);
+
+    expect($counts['installed'])->toBe(count($state['installed']) + 1)
+        ->and($counts['updates'])->toBe(count(array_filter($state['installed'], fn ($entry) => $entry['update_available'] ?? false)))
+        ->and($counts['purchased'])->toBe(1);
+});
+
+test('a receipt on the licence wins over the one kept from the checkout', function () {
+    $licence = ['id' => 'lic_1', 'kind' => 'paid', 'status' => 'active'];
+    $stored  = ['receipt_url' => 'https://pay.stripe.test/r/kept', 'purchase' => 'pur_1', 'amount_total' => 4900, 'currency' => 'USD'];
+
+    expect(ServiceCatalog::withReceipt($licence, $stored)['receipt_url'])->toBe('https://pay.stripe.test/r/kept')
+        ->and(ServiceCatalog::withReceipt($licence, $stored)['purchase'])->toMatchArray(['id' => 'pur_1', 'amount_total' => 4900])
+        ->and(ServiceCatalog::withReceipt([...$licence, 'receipt_url' => 'https://pay.stripe.test/r/service'], $stored)['receipt_url'])->toBe('https://pay.stripe.test/r/service')
+        ->and(ServiceCatalog::withReceipt([...$licence, 'purchase' => ['receipt_url' => 'https://pay.stripe.test/r/nested']], $stored)['receipt_url'])->toBe('https://pay.stripe.test/r/nested')
+        ->and(ServiceCatalog::withReceipt($licence)['receipt_url'])->toBeNull();
+});
diff --git a/tests/helpers/index.js b/tests/helpers/index.js
index 8af690f..39bcbb7 100644
--- a/tests/helpers/index.js
+++ b/tests/helpers/index.js
@@ -109,6 +109,150 @@ export function stubStoreQuery(owner, resolver = []) {
     return calls;
 }
 
+/**
+ * Stand-in for the `abilities` service: everything is allowed unless a test
+ * lists what is denied in `denied`.
+ */
+export class AbilitiesStub extends Service {
+    denied = new Set();
+
+    can(permission) {
+        return !this.denied.has(permission);
+    }
+
+    cannot(permission) {
+        return !this.can(permission);
+    }
+}
+
+/**
+ * Stand-in for `notifications`: records every message by type.
+ */
+export class NotificationsStub extends Service {
+    messages = [];
+
+    record(type, message) {
+        this.messages.push({ type, message });
+    }
+
+    info(message) {
+        this.record('info', message);
+    }
+
+    success(message) {
+        this.record('success', message);
+    }
+
+    warning(message) {
+        this.record('warning', message);
+    }
+
+    error(message) {
+        this.record('error', message);
+    }
+
+    serverError(error) {
+        this.record('serverError', error);
+    }
+}
+
+/**
+ * Stand-in for `currentUser`.
+ */
+export class CurrentUserStub extends Service {
+    companyId = 'company_1';
+    isAdmin = false;
+    company = { name: 'Acme Fleet' };
+    user = {};
+    permissions = [];
+}
+
+/**
+ * Stand-in for `socket`: records listeners and lets a test emit events.
+ */
+export class SocketStub extends Service {
+    listeners = {};
+
+    listen(channel, callback) {
+        this.listeners[channel] = callback;
+    }
+
+    emit(channel, event) {
+        this.listeners[channel]?.(event);
+    }
+}
+
+/**
+ * Stand-in for `modalsManager` with one modal at a time: `show` keeps the
+ * component name and options, and the option helpers act on them.
+ */
+export class ModalsManagerStub extends Service {
+    shown = [];
+    current = null;
+    closed = 0;
+
+    show(component, options = {}) {
+        this.current = { component, options: { ...options } };
+        this.shown.push(this.current);
+        return Promise.resolve(this);
+    }
+
+    get modals() {
+        return this.current ? [this.current] : [];
+    }
+
+    getModalZIndex() {
+        return 1060;
+    }
+
+    get options() {
+        return this.current?.options ?? {};
+    }
+
+    getOption(key, defaultValue = null) {
+        return this.options[key] ?? defaultValue;
+    }
+
+    setOption(key, value) {
+        if (this.current) {
+            this.current.options[key] = value;
+        }
+    }
+
+    setOptions(options = {}) {
+        if (this.current) {
+            Object.assign(this.current.options, options);
+        }
+    }
+
+    startLoading() {
+        this.setOption('isLoading', true);
+    }
+
+    stopLoading() {
+        this.setOption('isLoading', false);
+    }
+
+    invoke(fn, ...params) {
+        const callable = this.options[fn];
+        return typeof callable === 'function' ? callable(...params) : null;
+    }
+
+    confirm() {
+        return this.options.confirm?.(this);
+    }
+
+    decline() {
+        return this.options.decline?.(this);
+    }
+
+    done() {
+        this.closed++;
+        this.current = null;
+        return Promise.resolve(true);
+    }
+}
+
 /**
  * Register services the engine expects from the host console unless a test
  * already registered its own stub.
diff --git a/tests/integration/components/cell/extension-identity-test.js b/tests/integration/components/cell/extension-identity-test.js
new file mode 100644
index 0000000..d612d7a
--- /dev/null
+++ b/tests/integration/components/cell/extension-identity-test.js
@@ -0,0 +1,49 @@
+import { module, test } from 'qunit';
+import { setupRenderingTest } from 'dummy/tests/helpers';
+import { click, render } from '@ember/test-helpers';
+import { hbs } from 'ember-cli-htmlbars';
+import Service from '@ember/service';
+import { resolveResourceKey } from '@fleetbase/ember-ui/utils/resource-registry';
+
+module('Integration | Component | cell/extension-identity', function (hooks) {
+    setupRenderingTest(hooks);
+
+    hooks.beforeEach(function () {
+        // The console builds the resource registry index at boot; build it here before the first render
+        resolveResourceKey(this.owner, 'registry-extension');
+    });
+
+    test('shows the name with version and update badges and opens the panel', async function (assert) {
+        const opened = [];
+        this.owner.register(
+            'service:extension-panel',
+            class extends Service {
+                open(extension) {
+                    opened.push(extension.id);
+                }
+            }
+        );
+        this.set('row', {
+            id: 'ext_1',
+            name: 'Flespi Connector',
+            icon_url: 'https://example.test/icon.png',
+            installed_version: '1.8.0',
+            latest_version: '2.0.0',
+            update_available: true,
+            self_managed: true,
+        });
+
+        await render(hbs`<Cell::ExtensionIdentity @row={{this.row}} />`);
+
+        assert.dom('[data-test-identity-label]').hasText('Flespi Connector');
+        assert.dom('[data-badge-key="version"]').hasText('v1.8.0');
+        assert.dom('[data-badge-key="update"]').hasText('Update v2.0.0');
+
+        this.set('row', { id: 'ext_2', name: 'Fleet Insights', meta: { install_blocked_code: 'hosting', install_blocked_reason: 'Cloud only.' } });
+        assert.dom('[data-badge-key="unavailable"]').hasText('Not available here');
+        this.set('row', { ...this.row, id: 'ext_1', name: 'Flespi Connector', installed_version: '1.8.0', latest_version: '2.0.0', update_available: true, meta: {} });
+
+        await click('[data-test-identity-button]');
+        assert.deepEqual(opened, ['ext_1']);
+    });
+});
diff --git a/tests/integration/components/cell/purchased-cells-test.js b/tests/integration/components/cell/purchased-cells-test.js
new file mode 100644
index 0000000..2ae4019
--- /dev/null
+++ b/tests/integration/components/cell/purchased-cells-test.js
@@ -0,0 +1,51 @@
+import { module, test } from 'qunit';
+import { setupRenderingTest } from 'dummy/tests/helpers';
+import { render } from '@ember/test-helpers';
+import { hbs } from 'ember-cli-htmlbars';
+
+module('Integration | Component | cell/purchase-price and cell/licence-state', function (hooks) {
+    setupRenderingTest(hooks);
+
+    test('the price column shows the amount paid, not status chips', async function (assert) {
+        this.set('row', {
+            payment_required: true,
+            price: 2900,
+            currency: 'USD',
+            is_installed: false,
+            is_purchased: true,
+            meta: { licence_state: 'active', licence: { kind: 'paid', status: 'active', purchase: { amount_total: 3190, currency: 'USD' } } },
+        });
+        await render(hbs`<Cell::PurchasePrice @row={{this.row}} />`);
+
+        assert.dom('[data-test-purchase-price]').includesText('31.90', 'the receipt total, tax included');
+        assert.dom('[data-test-purchase-price]').doesNotHaveClass('line-through');
+
+        this.set('row', { payment_required: true, price: 4900, currency: 'USD', meta: { licence_state: 'refunded', licence: { kind: 'paid', status: 'revoked', purchase: 'pur_1' } } });
+        assert.dom('[data-test-purchase-price]').includesText('49.00', 'the listing price without a recorded receipt');
+        assert.dom('[data-test-purchase-price]').hasClass('line-through', 'struck through once refunded');
+
+        this.set('row', { payment_required: false, price: 0, meta: {} });
+        assert.dom('[data-test-purchase-price]').hasText('-');
+    });
+
+    test('the licence column shows Active, Refunded or Revoked with the service reason', async function (assert) {
+        this.set('row', { meta: { licence_state: 'active', licence: { kind: 'paid', status: 'active' } } });
+        await render(hbs`<Cell::LicenceState @row={{this.row}} />`);
+        assert.dom('[data-test-licence-state="active"]').includesText('Active');
+        assert.dom('[data-test-licence-state]').doesNotHaveAttribute('data-test-licence-reason');
+
+        this.set('row', { meta: { licence_state: 'refunded', licence: { kind: 'paid', status: 'revoked', revoked_reason: 'refunded' } } });
+        assert.dom('[data-test-licence-state="refunded"]').includesText('Refunded');
+        assert.dom('[data-test-licence-state]').hasAttribute('data-test-licence-reason', 'refunded');
+
+        this.set('row', { meta: { licence_state: 'revoked', licence: { kind: 'paid', status: 'revoked', revoked_reason: 'disputed' } } });
+        assert.dom('[data-test-licence-state="revoked"]').includesText('Revoked');
+        assert.dom('[data-test-licence-state]').hasAttribute('data-test-licence-reason', 'disputed');
+
+        this.set('row', { meta: { licence_state: 'revoked', licence: { kind: 'paid', status: 'revoked', revoked_reason: 'chargeback-v2' } } });
+        assert.dom('[data-test-licence-state]').hasAttribute('data-test-licence-reason', 'other', 'an unknown reason reads as a plain revoke');
+
+        this.set('row', { meta: {} });
+        assert.dom('[data-test-licence-state]').doesNotExist();
+    });
+});
diff --git a/tests/integration/components/explore-catalog-test.js b/tests/integration/components/explore-catalog-test.js
new file mode 100644
index 0000000..79d47a1
--- /dev/null
+++ b/tests/integration/components/explore-catalog-test.js
@@ -0,0 +1,139 @@
+import { module, test } from 'qunit';
+import { setupRenderingTest, AbilitiesStub, CurrentUserStub, stubStoreQuery } from 'dummy/tests/helpers';
+import { click, render, settled } from '@ember/test-helpers';
+import { hbs } from 'ember-cli-htmlbars';
+
+const listings = [
+    { id: 'ext_1', public_id: 'ext_1', name: 'Samsara Telematics', publisher_name: 'Fleetbase', category_name: 'Telematics', payment_required: false, is_installed: true },
+    { id: 'ext_2', public_id: 'ext_2', name: 'Pallet WMS', publisher_name: 'Fleetbase', category_name: 'Warehouse', payment_required: true, price: 14900, currency: 'USD' },
+];
+
+function page(records, total = records.length) {
+    const result = [...records];
+    result.meta = { total, current_page: 1, last_page: 1, per_page: 24 };
+    return result;
+}
+
+module('Integration | Component | explore-catalog', function (hooks) {
+    setupRenderingTest(hooks);
+
+    hooks.beforeEach(function () {
+        this.owner.register('service:abilities', AbilitiesStub);
+        this.owner.register('service:current-user', CurrentUserStub);
+        this.catalog = this.owner.lookup('controller:explore/index');
+    });
+
+    test('shows skeletons while the catalog loads, then the cards', async function (assert) {
+        let resolve;
+        stubStoreQuery(this.owner, () => new Promise((done) => (resolve = done)));
+        this.catalog.load.perform();
+
+        await render(hbs`<ExploreCatalog @catalog={{this.catalog}} />`);
+        assert.dom('[data-test-explore-loading]').exists();
+
+        resolve(page(listings));
+        await settled();
+        assert.dom('[data-test-explore-loading]').doesNotExist();
+        assert.dom('[data-test-extension-card]').exists({ count: 2 });
+        assert.dom('[data-test-explore-header]').includesText('2 extensions');
+    });
+
+    test('switches between the grid and the table', async function (assert) {
+        stubStoreQuery(this.owner, page(listings));
+        await this.catalog.load.perform();
+        await render(hbs`<ExploreCatalog @catalog={{this.catalog}} />`);
+
+        await click('[data-test-explore-layout="table"]');
+        assert.dom('[data-test-explore-table]').exists();
+        assert.dom('[data-test-explore-table] [data-test-identity-label]').exists({ count: 2 });
+        assert.dom('[data-test-explore-table] [data-test-extension-status]').exists({ count: 2 });
+
+        await click('[data-test-explore-layout="grid"]');
+        assert.dom('[data-test-explore-grid]').exists();
+    });
+
+    test('an empty registry explains where extensions come from', async function (assert) {
+        stubStoreQuery(this.owner, page([]));
+        await this.catalog.load.perform();
+        await render(hbs`<ExploreCatalog @catalog={{this.catalog}} />`);
+
+        assert.dom('[data-test-explore-empty]').includesText('No extensions are published to this registry yet');
+        assert.dom('[data-test-explore-empty]').doesNotIncludeText('Check registry config', 'only admins get the config shortcut');
+    });
+
+    test('no results for a search or facet offers to clear them', async function (assert) {
+        stubStoreQuery(this.owner, page([]));
+        this.catalog.query = 'geofence';
+        this.catalog.pricing = 'paid';
+        await this.catalog.load.perform();
+        await render(hbs`<ExploreCatalog @catalog={{this.catalog}} />`);
+
+        assert.dom('[data-test-explore-no-results]').includesText('No extensions match “geofence”');
+        assert.dom('[data-test-explore-facet="pricing"]').includesText('Paid');
+
+        await click('[data-test-explore-no-results] .next-table-empty-state-primary-action');
+        assert.strictEqual(this.catalog.query, null);
+        assert.strictEqual(this.catalog.pricing, null);
+    });
+
+    test('a registry error stays on screen with Retry', async function (assert) {
+        let calls = 0;
+        stubStoreQuery(this.owner, () => {
+            calls++;
+            return calls === 1 ? Promise.reject(new Error('timeout')) : Promise.resolve(page(listings));
+        });
+        await this.catalog.load.perform();
+        await render(hbs`<ExploreCatalog @catalog={{this.catalog}} />`);
+
+        assert.dom('[data-test-explore-error]').includesText('The registry did not respond');
+        await click('[data-test-explore-retry]');
+        assert.dom('[data-test-extension-card]').exists({ count: 2 });
+    });
+
+    test('facets and sort become registry request parameters', function (assert) {
+        Object.assign(this.catalog, { query: 'route', category: 'cat_1', pricing: 'free', hosting: 'both', hide_installed: true, sort: 'newest', page: 2 });
+
+        assert.deepEqual(this.catalog.requestParams, {
+            explore: 1,
+            query: 'route',
+            category: 'cat_1',
+            pricing: 'free',
+            hosting: 'both',
+            hide_installed: 1,
+            sort: 'newest',
+            page: 2,
+            limit: 24,
+        });
+
+        this.catalog.setSort('popular');
+        assert.strictEqual(this.catalog.sort, null, 'the default sort is not sent');
+        this.catalog.clearFacet('hosting');
+        assert.strictEqual(this.catalog.hosting, null);
+        assert.strictEqual(this.catalog.page, 1);
+    });
+
+    test('an unregistered instance is told once that it can browse but not install', async function (assert) {
+        stubStoreQuery(this.owner, page(listings));
+        const context = this.owner.lookup('service:registry-context');
+        context.context = { service_url: 'https://registry.example.test', registered: false };
+        context.loaded = true;
+        await this.catalog.load.perform();
+        await render(hbs`<ExploreCatalog @catalog={{this.catalog}} />`);
+
+        assert.dom('[data-test-explore-registration]').includesText('not registered with the registry service');
+        assert.dom('[data-test-explore-registration]').includesText('Ask an admin');
+        assert.dom('[data-test-extension-card]').exists({ count: 2 }, 'the catalog still shows');
+
+        context.context = { ...context.context, registered: true };
+        await settled();
+        assert.dom('[data-test-explore-registration]').doesNotExist();
+    });
+
+    test('the hosting facet offers each kind', function (assert) {
+        const hosting = this.catalog.facetColumns.find((column) => column.filterParam === 'hosting');
+        assert.deepEqual(
+            hosting.filterOptions.map((option) => option.value),
+            ['self_hosted', 'cloud', 'both']
+        );
+    });
+});
diff --git a/tests/integration/components/extension-card-test.js b/tests/integration/components/extension-card-test.js
index bb6e8d2..9f381da 100644
--- a/tests/integration/components/extension-card-test.js
+++ b/tests/integration/components/extension-card-test.js
@@ -1,43 +1,109 @@
 import { module, test } from 'qunit';
-import { setupRenderingTest } from 'dummy/tests/helpers';
-import { render } from '@ember/test-helpers';
+import { setupRenderingTest, AbilitiesStub } from 'dummy/tests/helpers';
+import { click, render } from '@ember/test-helpers';
 import { hbs } from 'ember-cli-htmlbars';
+import Service from '@ember/service';
+
+class PanelStub extends Service {
+    opened = [];
+    open(extension, options) {
+        this.opened.push({ extension, options });
+    }
+}
+
+class InstallerStub extends Service {
+    calls = [];
+    install(extension) {
+        this.calls.push(['install', extension.id]);
+    }
+    update(extension) {
+        this.calls.push(['update', extension.id]);
+    }
+}
+
+const STATES = {
+    free: { record: { payment_required: false }, price: 'Free', action: 'details' },
+    paid: { record: { payment_required: true, price: 14900, currency: 'USD' }, price: '$149.00', action: 'details' },
+    'on-sale': { record: { payment_required: true, price: 9900, sale_price: 7900, on_sale: true, currency: 'USD' }, price: '$79.00', action: 'details', badge: 'On sale' },
+    installed: { record: { is_installed: true }, price: 'Free', action: 'none', badge: 'Installed' },
+    update: { record: { is_installed: true, update_available: true, installed_version: '1.8.0', latest_version: '2.0.0' }, price: 'Free', action: 'update', badge: 'Update v2.0.0' },
+    purchased: { record: { payment_required: true, price: 5900, is_purchased: true }, price: 'Purchased', action: 'install', badge: 'Ready to install' },
+    unavailable: {
+        record: { is_installable: false, meta: { hosting: 'cloud', install_blocked_code: 'hosting', install_blocked_reason: 'This extension is only available on Fleetbase Cloud.' } },
+        price: 'Free',
+        action: 'details',
+        badge: 'Not available here',
+    },
+};
 
 module('Integration | Component | extension-card', function (hooks) {
     setupRenderingTest(hooks);
 
-    test('it renders the extension name and price badge', async function (assert) {
-        this.set('extension', {
-            id: 'extension_test',
-            public_id: 'extension_test',
-            name: 'Fleet-Ops',
-            description: 'Fleet & Transport Management',
-            payment_required: false,
-            is_installed: false,
-            updatedAt: 'January, 01 2026',
+    hooks.beforeEach(function () {
+        this.owner.register('service:abilities', AbilitiesStub);
+        this.owner.register('service:extension-panel', PanelStub);
+        this.owner.register('service:extension-installer', InstallerStub);
+    });
+
+    for (const [state, expected] of Object.entries(STATES)) {
+        test(`renders the ${state} state`, async function (assert) {
+            this.set('extension', {
+                id: 'ext_1',
+                public_id: 'ext_1',
+                name: 'Pallet WMS',
+                publisher_name: 'Fleetbase',
+                category_name: 'Warehouse',
+                description: 'Receiving and picking.',
+                ...expected.record,
+            });
+
+            await render(hbs`<ExtensionCard @resource={{this.extension}} />`);
+
+            assert.dom('[data-test-extension-card]').hasAttribute('data-state', state);
+            assert.dom('[data-test-extension-card-price]').includesText(expected.price);
+            assert.dom('[data-test-extension-card-action]').hasAttribute('data-test-extension-card-action', expected.action);
+            if (expected.badge) {
+                assert.dom('[data-test-extension-card-badges]').includesText(expected.badge);
+            }
         });
+    }
+
+    test('the struck list price shows on sale', async function (assert) {
+        this.set('extension', { id: 'ext_1', name: 'Customer Portal', ...STATES['on-sale'].record });
+        await render(hbs`<ExtensionCard @resource={{this.extension}} />`);
+        assert.dom('[data-test-extension-card-price-original]').hasText('$99.00');
+    });
 
+    test('the name opens the detail panel and the footer runs the state action', async function (assert) {
+        this.set('extension', { id: 'ext_1', name: 'Flespi', ...STATES.update.record });
         await render(hbs`<ExtensionCard @resource={{this.extension}} />`);
 
-        assert.dom(this.element).containsText('Fleet-Ops');
-        assert.dom(this.element).containsText('Free');
+        await click('[data-test-extension-card-name]');
+        assert.strictEqual(this.owner.lookup('service:extension-panel').opened.length, 1);
+
+        await click('[data-test-extension-card-action]');
+        assert.deepEqual(this.owner.lookup('service:extension-installer').calls, [['update', 'ext_1']]);
     });
 
-    test('it flags an available update from the registry service', async function (assert) {
-        this.set('extension', {
-            id: 'ext_lx52k33erf',
-            public_id: 'ext_lx52k33erf',
-            name: 'Registry Demo Hello',
-            payment_required: false,
-            is_installed: true,
-            installed_version: '1.0.0',
-            latest_version: '1.1.0',
-            update_available: true,
-            source: 'registry-service',
-        });
+    test('the update action is disabled without the install permission', async function (assert) {
+        this.owner.lookup('service:abilities').denied.add('registry-bridge install extension');
+        this.set('extension', { id: 'ext_1', name: 'Flespi', ...STATES.update.record });
+        await render(hbs`<ExtensionCard @resource={{this.extension}} />`);
 
+        assert.dom('[data-test-extension-card-action]').isDisabled();
+    });
+
+    test('an unavailable listing shows why on the card', async function (assert) {
+        this.set('extension', { id: 'ext_1', name: 'Fleet Insights', ...STATES.unavailable.record });
         await render(hbs`<ExtensionCard @resource={{this.extension}} />`);
 
-        assert.dom('[data-test-update-available]').containsText('Update 1.1.0');
+        assert.dom('[data-test-extension-card-reason]').hasText('This extension is only available on Fleetbase Cloud.');
+        assert.dom('[data-test-extension-card-badges]').includesText('Cloud only');
+    });
+
+    test('the description falls back to the subtitle', async function (assert) {
+        this.set('extension', { id: 'ext_1', name: 'Hello', subtitle: 'A short subtitle' });
+        await render(hbs`<ExtensionCard @resource={{this.extension}} />`);
+        assert.dom('[data-test-extension-card-description]').hasText('A short subtitle');
     });
 });
diff --git a/tests/integration/components/extension-form-test.js b/tests/integration/components/extension-form-test.js
deleted file mode 100644
index 230d7c7..0000000
--- a/tests/integration/components/extension-form-test.js
+++ /dev/null
@@ -1,24 +0,0 @@
-import { module, test } from 'qunit';
-import { setupRenderingTest, StubFetchService, stubStoreQuery } from 'dummy/tests/helpers';
-import { render } from '@ember/test-helpers';
-import { hbs } from 'ember-cli-htmlbars';
-
-module('Integration | Component | extension-form', function (hooks) {
-    setupRenderingTest(hooks);
-
-    hooks.beforeEach(function () {
-        this.owner.register('service:fetch', StubFetchService);
-        stubStoreQuery(this.owner, []);
-    });
-
-    test('it renders the extension fields with the extension values', async function (assert) {
-        this.set('extension', { name: 'Fleet-Ops', subtitle: 'Fleet management', tags: [], languages: [] });
-
-        await render(hbs`<ExtensionForm @extension={{this.extension}} />`);
-
-        const values = [...this.element.querySelectorAll('input')].map((input) => input.value);
-        assert.ok(values.includes('Fleet-Ops'), 'the name input is bound to the extension');
-        assert.dom(this.element).containsText('Extension Name');
-        assert.dom(this.element).containsText('Upload Icon');
-    });
-});
diff --git a/tests/integration/components/extension-modal-title-test.js b/tests/integration/components/extension-modal-title-test.js
deleted file mode 100644
index 3c3b5a5..0000000
--- a/tests/integration/components/extension-modal-title-test.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'dummy/tests/helpers';
-import { render } from '@ember/test-helpers';
-import { hbs } from 'ember-cli-htmlbars';
-
-module('Integration | Component | extension-modal-title', function (hooks) {
-    setupRenderingTest(hooks);
-
-    test('it renders the extension name, subtitle and publisher', async function (assert) {
-        this.set('extension', { name: 'Fleet-Ops', subtitle: 'Fleet management', publisher_name: 'Fleetbase' });
-
-        await render(hbs`<ExtensionModalTitle @extension={{this.extension}} />`);
-
-        assert.dom('h1').hasText('Fleet-Ops');
-        assert.dom(this.element).containsText('Fleet management');
-        assert.dom(this.element).containsText('Published by Fleetbase');
-    });
-
-    test('it reads the extension from modal options when given', async function (assert) {
-        this.set('options', { extension: { name: 'Storefront', subtitle: 'Commerce', publisher_name: 'Fleetbase' } });
-
-        await render(hbs`<ExtensionModalTitle @options={{this.options}} />`);
-
-        assert.dom('h1').hasText('Storefront');
-    });
-});
diff --git a/tests/integration/components/extension-monetize-form-test.js b/tests/integration/components/extension-monetize-form-test.js
deleted file mode 100644
index f8fcfa8..0000000
--- a/tests/integration/components/extension-monetize-form-test.js
+++ /dev/null
@@ -1,36 +0,0 @@
-import { module, test } from 'qunit';
-import { setupRenderingTest, StubFetchService } from 'dummy/tests/helpers';
-import { render } from '@ember/test-helpers';
-import { hbs } from 'ember-cli-htmlbars';
-
-module('Integration | Component | extension-monetize-form', function (hooks) {
-    setupRenderingTest(hooks);
-
-    hooks.beforeEach(function () {
-        this.owner.register('service:fetch', StubFetchService);
-        this.fetch = this.owner.lookup('service:fetch');
-    });
-
-    test('it looks up the Stripe Connect account and shows the payment toggle when one exists', async function (assert) {
-        this.fetch.responses['payments/has-stripe-connect-account'] = { hasStripeConnectAccount: true };
-        this.set('extension', { payment_required: false });
-
-        await render(hbs`<ExtensionMonetizeForm @extension={{this.extension}} />`);
-
-        assert.strictEqual(this.fetch.calls.length, 1, 'one lookup request');
-        assert.strictEqual(this.fetch.calls[0].path, 'payments/has-stripe-connect-account');
-        assert.dom(this.element).containsText('Payment Details');
-        assert.dom(this.element).containsText('Payment Required');
-        assert.dom('[role="checkbox"]').exists('the payment toggle renders');
-    });
-
-    test('it hides the payment settings without a Stripe Connect account', async function (assert) {
-        this.fetch.responses['payments/has-stripe-connect-account'] = { hasStripeConnectAccount: false };
-        this.set('extension', { payment_required: false });
-
-        await render(hbs`<ExtensionMonetizeForm @extension={{this.extension}} />`);
-
-        assert.dom('[role="checkbox"]').doesNotExist('no payment toggle without an account');
-        assert.dom(this.element).doesNotContainText('Payment Required');
-    });
-});
diff --git a/tests/integration/components/extension-panel/header-test.js b/tests/integration/components/extension-panel/header-test.js
new file mode 100644
index 0000000..3bd92fa
--- /dev/null
+++ b/tests/integration/components/extension-panel/header-test.js
@@ -0,0 +1,156 @@
+import { module, test } from 'qunit';
+import { setupRenderingTest, AbilitiesStub, CurrentUserStub } from 'dummy/tests/helpers';
+import { click, render } from '@ember/test-helpers';
+import { hbs } from 'ember-cli-htmlbars';
+import Service from '@ember/service';
+import { tracked } from '@glimmer/tracking';
+import { DEFAULT_EXTENSION_ICON } from '@fleetbase/registry-bridge-engine/models/registry-extension';
+
+class InstallerStub extends Service {
+    calls = [];
+    install(extension) {
+        this.calls.push(['install', extension.id]);
+    }
+    update(extension) {
+        this.calls.push(['update', extension.id]);
+    }
+    uninstall(extension) {
+        this.calls.push(['uninstall', extension.id]);
+    }
+}
+
+class PurchaseStub extends Service {
+    calls = [];
+    @tracked lastError = null;
+    isStarting = false;
+    purchase(extension) {
+        this.calls.push(extension.id);
+        this.lastError = { extension: extension.public_id, message: 'Acme Route Planner cannot be bought right now: its publisher has not finished setting up payouts.' };
+    }
+}
+
+const base = {
+    id: 'ext_1',
+    public_id: 'ext_1',
+    name: 'Pallet WMS',
+    source: 'registry-service',
+    publisher_name: 'Fleetbase',
+    category_name: 'Warehouse',
+    latest_version: '0.9.1',
+    is_installable: true,
+};
+const meta = (extra = {}) => ({ source: 'registry-service', ...extra });
+
+module('Integration | Component | extension-panel/header', function (hooks) {
+    setupRenderingTest(hooks);
+
+    hooks.beforeEach(function () {
+        this.owner.register('service:abilities', AbilitiesStub);
+        this.owner.register('service:current-user', CurrentUserStub);
+        this.owner.register('service:extension-installer', InstallerStub);
+        this.owner.register('service:extension-purchase', PurchaseStub);
+        this.renderHeader = async (extension) => {
+            this.set('extension', { ...base, ...extension });
+            await render(hbs`<ExtensionPanel::Header @resource={{this.extension}} />`);
+        };
+    });
+
+    test('a listing without an icon image shows the default icon', async function (assert) {
+        await this.renderHeader({ icon_url: null, meta: meta() });
+        assert.dom('img.extension-panel-icon').hasAttribute('src', DEFAULT_EXTENSION_ICON);
+    });
+
+    test('install', async function (assert) {
+        await this.renderHeader({ meta: meta({ install_mode: 'runtime' }) });
+        assert.dom('[data-test-cta]').hasAttribute('data-test-cta', 'install');
+        assert.dom('[data-test-cta-note]').includesText('without a console rebuild (about 2 minutes)');
+        await click('[data-test-cta-button]');
+        assert.deepEqual(this.owner.lookup('service:extension-installer').calls, [['install', 'ext_1']]);
+    });
+
+    test('an install that rebuilds the console says it takes much longer', async function (assert) {
+        await this.renderHeader({ meta: meta({ install_mode: 'build' }) });
+        assert.dom('[data-test-cta-note]').includesText('rebuilds the console, which can take 15 to 40 minutes');
+        assert.dom('[data-test-cta-note]').doesNotIncludeText('about 2 minutes');
+    });
+
+    test('purchase when the service offers checkout', async function (assert) {
+        await this.renderHeader({
+            payment_required: true,
+            price: 14900,
+            currency: 'USD',
+            is_installable: false,
+            meta: meta({ install_blocked_code: 'licence_required', purchase_available: true }),
+        });
+        assert.dom('[data-test-cta]').hasAttribute('data-test-cta', 'purchase');
+        assert.dom('[data-test-cta-button]').hasText('Purchase for $149.00');
+        await click('[data-test-cta-button]');
+        assert.deepEqual(this.owner.lookup('service:extension-purchase').calls, ['ext_1']);
+        assert
+            .dom('[data-test-cta-purchase-error]')
+            .hasText('Acme Route Planner cannot be bought right now: its publisher has not finished setting up payouts.', 'a refusal is shown on the panel');
+    });
+
+    test('paid without checkout is blocked with the service reason', async function (assert) {
+        await this.renderHeader({
+            payment_required: true,
+            price: 14900,
+            is_installable: false,
+            meta: meta({ install_blocked_code: 'licence_required', install_blocked_reason: 'Purchasing through the registry service is not available yet.' }),
+        });
+        assert.dom('[data-test-cta]').hasAttribute('data-test-cta', 'blocked');
+        assert.dom('[data-test-cta-button]').isDisabled();
+        assert.dom('[data-test-cta-reason]').hasText('Purchasing through the registry service is not available yet.');
+    });
+
+    test('installed, with uninstall for users who may', async function (assert) {
+        await this.renderHeader({ is_installed: true, installed_version: '0.9.1', meta: meta() });
+        assert.dom('[data-test-cta]').hasAttribute('data-test-cta', 'installed');
+        assert.dom('[data-test-cta-installed]').includesText('Installed v0.9.1');
+        await click('[data-test-cta-uninstall]');
+        assert.deepEqual(this.owner.lookup('service:extension-installer').calls, [['uninstall', 'ext_1']]);
+    });
+
+    test('update', async function (assert) {
+        await this.renderHeader({ is_installed: true, update_available: true, installed_version: '0.8.4', meta: meta() });
+        assert.dom('[data-test-cta]').hasAttribute('data-test-cta', 'update');
+        assert.dom('[data-test-cta-button]').hasText('Update to v0.9.1');
+        assert.dom('[data-test-cta]').includesText('Installed v0.8.4. Updating rebuilds the console.');
+    });
+
+    test('unauthorized names the permission', async function (assert) {
+        this.owner.lookup('service:abilities').denied.add('registry-bridge install extension');
+        await this.renderHeader({ meta: meta() });
+        assert.dom('[data-test-cta]').hasAttribute('data-test-cta', 'unauthorized');
+        assert.dom('[data-test-cta-permission]').hasText('You need “registry-bridge install extension”. Ask an organisation admin.');
+        assert.dom('[data-test-cta-uninstall]').doesNotExist();
+    });
+
+    test('author view', async function (assert) {
+        await this.renderHeader({ is_author: true, meta: meta() });
+        assert.dom('[data-test-cta]').hasAttribute('data-test-cta', 'author');
+        assert.dom('[data-test-cta]').includesText('You publish this extension');
+    });
+
+    test('registration required, with the shortcut for admins only', async function (assert) {
+        await this.renderHeader({
+            is_installable: false,
+            meta: meta({ install_blocked_code: 'not_registered', install_blocked_reason: 'Register this instance with the registry service to install extensions.' }),
+        });
+        assert.dom('[data-test-cta]').hasAttribute('data-test-cta', 'registration-required');
+        assert.dom('[data-test-cta-button]').isDisabled();
+        assert.dom('[data-test-cta-reason]').includesText('Ask an admin');
+
+        this.owner.lookup('service:current-user').isAdmin = true;
+        await this.renderHeader({ is_installable: false, meta: meta({ install_blocked_code: 'not_registered' }) });
+        assert.dom('[data-test-cta-button]').isNotDisabled();
+        await click('[data-test-cta-button]');
+        assert.deepEqual(this.owner.lookup('service:host-router').transitions.at(-1), ['console.admin.virtual', 'extension-registry', { queryParams: { view: 'registry-config' } }]);
+    });
+
+    test('blocked by hosting', async function (assert) {
+        await this.renderHeader({ is_installable: false, meta: meta({ install_blocked_code: 'hosting', install_blocked_reason: 'This extension is only available on Fleetbase Cloud.' }) });
+        assert.dom('[data-test-cta]').hasAttribute('data-test-cta', 'blocked');
+        assert.dom('[data-test-cta-reason]').hasText('This extension is only available on Fleetbase Cloud.');
+    });
+});
diff --git a/tests/integration/components/extension-panel/versions-test.js b/tests/integration/components/extension-panel/versions-test.js
new file mode 100644
index 0000000..24298a7
--- /dev/null
+++ b/tests/integration/components/extension-panel/versions-test.js
@@ -0,0 +1,107 @@
+import { module, test } from 'qunit';
+import { setupRenderingTest, AbilitiesStub, StubFetchService } from 'dummy/tests/helpers';
+import { click, render } from '@ember/test-helpers';
+import { hbs } from 'ember-cli-htmlbars';
+import Service from '@ember/service';
+
+class InstallerStub extends Service {
+    calls = [];
+    install(extension, options) {
+        this.calls.push(['install', options.version]);
+    }
+    update(extension, options) {
+        this.calls.push(['update', options.version]);
+    }
+}
+
+const releases = {
+    supported: true,
+    latest: '0.9.1',
+    releases: [
+        {
+            id: 'rel_3',
+            version: '0.9.1',
+            channel: 'stable',
+            status: 'published',
+            size_bytes: 2202009,
+            notes: 'Pack verification',
+            published_at: '2026-09-12T00:00:00Z',
+            is_latest: true,
+            is_installed: false,
+            is_yanked: false,
+        },
+        {
+            id: 'rel_2',
+            version: '0.9.0',
+            channel: 'stable',
+            status: 'published',
+            size_bytes: 2097152,
+            notes: 'Wave picking',
+            published_at: '2026-08-20T00:00:00Z',
+            is_latest: false,
+            is_installed: true,
+            is_yanked: false,
+        },
+        {
+            id: 'rel_1',
+            version: '0.8.4',
+            channel: 'stable',
+            status: 'yanked',
+            size_bytes: 1887436,
+            notes: null,
+            published_at: '2026-07-02T00:00:00Z',
+            is_latest: false,
+            is_installed: false,
+            is_yanked: true,
+        },
+    ],
+};
+
+module('Integration | Component | extension-panel/versions', function (hooks) {
+    setupRenderingTest(hooks);
+
+    hooks.beforeEach(function () {
+        this.owner.register('service:abilities', AbilitiesStub);
+        this.owner.register('service:fetch', StubFetchService);
+        this.owner.register('service:extension-installer', InstallerStub);
+        this.fetch = this.owner.lookup('service:fetch');
+    });
+
+    test('lists releases with their flags and switches an installed extension to one', async function (assert) {
+        this.fetch.responses['registry-extensions/ext_1/releases'] = releases;
+        this.set('extension', { id: 'ext_1', public_id: 'ext_1', is_installed: true, installed_version: '0.9.0' });
+
+        await render(hbs`<ExtensionPanel::Versions @extension={{this.extension}} />`);
+
+        assert.deepEqual(this.fetch.calls[0].data, { installed_version: '0.9.0' });
+        assert.dom('[data-test-release-version]').exists({ count: 3 });
+        assert.dom('[data-test-release-version="0.9.1"]').includesText('Latest');
+        assert.dom('[data-test-release-version="0.9.0"]').includesText('Installed');
+        assert.dom('[data-test-release-version="0.8.4"]').includesText('Yanked');
+        assert.dom('[data-test-release-action="0.9.0"]').isDisabled('the installed version');
+        assert.dom('[data-test-release-action="0.8.4"]').isDisabled('a yanked version');
+        assert.dom('[data-test-versions-table]').includesText('2.1 MB');
+
+        await click('[data-test-release-action="0.9.1"]');
+        assert.deepEqual(this.owner.lookup('service:extension-installer').calls, [['update', '0.9.1']]);
+    });
+
+    test('cloud-catalog records say release history is not available', async function (assert) {
+        this.fetch.responses['registry-extensions/ext_2/releases'] = { supported: false, releases: [{ version: '1.0.0', channel: 'stable', is_latest: true }] };
+        this.set('extension', { id: 'ext_2', public_id: 'ext_2' });
+
+        await render(hbs`<ExtensionPanel::Versions @extension={{this.extension}} />`);
+
+        assert.dom('[data-test-versions-unsupported]').exists();
+        assert.dom('[data-test-release-version]').exists({ count: 1 });
+    });
+
+    test('a failed load offers Retry', async function (assert) {
+        this.fetch.responses['registry-extensions/ext_3/releases'] = new Error('offline');
+        this.set('extension', { id: 'ext_3', public_id: 'ext_3' });
+
+        await render(hbs`<ExtensionPanel::Versions @extension={{this.extension}} />`);
+
+        assert.dom('[data-test-versions-error]').exists();
+    });
+});
diff --git a/tests/integration/components/extension-pending-publish-viewer-test.js b/tests/integration/components/extension-pending-publish-viewer-test.js
deleted file mode 100644
index aca0d6e..0000000
--- a/tests/integration/components/extension-pending-publish-viewer-test.js
+++ /dev/null
@@ -1,36 +0,0 @@
-import { module, test } from 'qunit';
-import { setupRenderingTest, StubFetchService, stubStoreQuery } from 'dummy/tests/helpers';
-import { render } from '@ember/test-helpers';
-import { hbs } from 'ember-cli-htmlbars';
-
-module('Integration | Component | extension-pending-publish-viewer', function (hooks) {
-    setupRenderingTest(hooks);
-
-    hooks.beforeEach(function () {
-        this.owner.register('service:fetch', StubFetchService);
-    });
-
-    test('it queries approved extensions and lists them', async function (assert) {
-        const calls = stubStoreQuery(this.owner, [
-            { id: 'ext_1', name: 'Fleet-Ops', description: 'Fleet management', status: 'approved' },
-            { id: 'ext_2', name: 'Storefront', description: 'Commerce', status: 'approved' },
-        ]);
-
-        await render(hbs`<ExtensionPendingPublishViewer />`);
-
-        assert.strictEqual(calls.length, 1, 'one store query');
-        assert.strictEqual(calls[0].modelName, 'registry-extension');
-        assert.deepEqual(calls[0].query, { status: 'approved', admin: 1 });
-        assert.dom(this.element).containsText('Extensions Pending Publish');
-        assert.dom(this.element).containsText('Fleet-Ops');
-        assert.dom(this.element).containsText('Storefront');
-    });
-
-    test('it shows the empty state when nothing is pending', async function (assert) {
-        stubStoreQuery(this.owner, []);
-
-        await render(hbs`<ExtensionPendingPublishViewer />`);
-
-        assert.dom(this.element).containsText('No extensions awaiting publish');
-    });
-});
diff --git a/tests/integration/components/extension-reviewer-control-test.js b/tests/integration/components/extension-reviewer-control-test.js
deleted file mode 100644
index f382241..0000000
--- a/tests/integration/components/extension-reviewer-control-test.js
+++ /dev/null
@@ -1,36 +0,0 @@
-import { module, test } from 'qunit';
-import { setupRenderingTest, StubFetchService, stubStoreQuery } from 'dummy/tests/helpers';
-import { render } from '@ember/test-helpers';
-import { hbs } from 'ember-cli-htmlbars';
-
-module('Integration | Component | extension-reviewer-control', function (hooks) {
-    setupRenderingTest(hooks);
-
-    hooks.beforeEach(function () {
-        this.owner.register('service:fetch', StubFetchService);
-    });
-
-    test('it queries awaiting_review extensions and lists them', async function (assert) {
-        const calls = stubStoreQuery(this.owner, [
-            { id: 'ext_1', name: 'Fleet-Ops', description: 'Fleet management', status: 'awaiting_review' },
-            { id: 'ext_2', name: 'Storefront', description: 'Commerce', status: 'awaiting_review' },
-        ]);
-
-        await render(hbs`<ExtensionReviewerControl />`);
-
-        assert.strictEqual(calls.length, 1, 'one store query');
-        assert.strictEqual(calls[0].modelName, 'registry-extension');
-        assert.deepEqual(calls[0].query, { status: 'awaiting_review', admin: 1 });
-        assert.dom(this.element).containsText('Extensions Awaiting Review');
-        assert.dom(this.element).containsText('Fleet-Ops');
-        assert.dom(this.element).containsText('Storefront');
-    });
-
-    test('it shows the empty state when nothing is pending', async function (assert) {
-        stubStoreQuery(this.owner, []);
-
-        await render(hbs`<ExtensionReviewerControl />`);
-
-        assert.dom(this.element).containsText('No extensions awaiting review');
-    });
-});
diff --git a/tests/integration/components/installer-job-error-test.js b/tests/integration/components/installer-job-error-test.js
deleted file mode 100644
index fff875a..0000000
--- a/tests/integration/components/installer-job-error-test.js
+++ /dev/null
@@ -1,41 +0,0 @@
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'dummy/tests/helpers';
-import { setupIntl } from 'ember-intl/test-support';
-import { render, click } from '@ember/test-helpers';
-import { hbs } from 'ember-cli-htmlbars';
-
-module('Integration | Component | installer-job-error', function (hooks) {
-    setupRenderingTest(hooks);
-    setupIntl(hooks, 'en-us');
-
-    test('it shows the failed step, the message, the rollback outcome and the log', async function (assert) {
-        this.set('error', {
-            step: 'Installing the server package…',
-            message: '`composer require acme/widgets-api:1.0.0` exited with code 2.',
-            log: ['$ composer require acme/widgets-api:1.0.0 --no-interaction', 'Problem 1'],
-            rolledBack: true,
-            rebuildRequired: false,
-        });
-
-        await render(hbs`<InstallerJobError @error={{this.error}} />`);
-
-        assert.dom('[data-test-installer-job-error]').hasAttribute('role', 'alert');
-        assert.dom('[data-test-installer-job-error-step]').hasText('Failed while: Installing the server package…');
-        assert.dom('[data-test-installer-job-error-message]').hasText('`composer require acme/widgets-api:1.0.0` exited with code 2.');
-        assert.dom('[data-test-installer-job-error-rolled-back]').exists();
-        assert.dom('[data-test-installer-job-error-log] .whitespace-pre-wrap').exists({ count: 2 });
-
-        await click('[data-test-installer-job-error-log] summary');
-        assert.dom('[data-test-installer-job-error-log]').hasAttribute('open');
-    });
-
-    test('it omits the log and rollback notes when there are none', async function (assert) {
-        this.set('error', { step: null, message: 'The installer stopped before this job finished.', log: [], rolledBack: false });
-
-        await render(hbs`<InstallerJobError @error={{this.error}} />`);
-
-        assert.dom('[data-test-installer-job-error-step]').hasText('The job failed.');
-        assert.dom('[data-test-installer-job-error-rolled-back]').doesNotExist();
-        assert.dom('[data-test-installer-job-error-log]').doesNotExist();
-    });
-});
diff --git a/tests/integration/components/modals/confirm-extension-purchase-test.js b/tests/integration/components/modals/confirm-extension-purchase-test.js
deleted file mode 100644
index da47fa6..0000000
--- a/tests/integration/components/modals/confirm-extension-purchase-test.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'dummy/tests/helpers';
-import { render } from '@ember/test-helpers';
-import { hbs } from 'ember-cli-htmlbars';
-
-module('Integration | Component | modals/confirm-extension-purchase', function (hooks) {
-    setupRenderingTest(hooks);
-
-    test('it renders the loading message from the modal options', async function (assert) {
-        this.set('options', { title: 'Finalizing Purchase', loadingMessage: 'Completing purchase do not refresh or exit window...' });
-
-        await render(hbs`<Modals::ConfirmExtensionPurchase @modalIsOpened={{true}} @options={{this.options}} />`);
-
-        assert.dom(document.body).containsText('Completing purchase do not refresh or exit window...');
-    });
-});
diff --git a/tests/integration/components/modals/create-registry-credentials-test.js b/tests/integration/components/modals/create-registry-credentials-test.js
deleted file mode 100644
index 67c8378..0000000
--- a/tests/integration/components/modals/create-registry-credentials-test.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'dummy/tests/helpers';
-import { render } from '@ember/test-helpers';
-import { hbs } from 'ember-cli-htmlbars';
-
-module('Integration | Component | modals/create-registry-credentials', function (hooks) {
-    setupRenderingTest(hooks);
-
-    test('it renders a password field', async function (assert) {
-        this.set('options', { title: 'Create registry credentials', password: '' });
-
-        await render(hbs`<Modals::CreateRegistryCredentials @modalIsOpened={{true}} @options={{this.options}} />`);
-
-        assert.dom('input[type="password"]', document.body).exists('password input renders');
-        assert.dom(document.body).containsText('You must authenticate using your password.');
-    });
-});
diff --git a/tests/integration/components/modals/extension-details-test.js b/tests/integration/components/modals/extension-details-test.js
deleted file mode 100644
index 005d2fd..0000000
--- a/tests/integration/components/modals/extension-details-test.js
+++ /dev/null
@@ -1,38 +0,0 @@
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'dummy/tests/helpers';
-import { render } from '@ember/test-helpers';
-import { hbs } from 'ember-cli-htmlbars';
-import ExtensionDetailsModal from '@fleetbase/registry-bridge-engine/components/modals/extension-details';
-
-module('Integration | Component | modals/extension-details', function (hooks) {
-    setupRenderingTest(hooks);
-
-    // @fleetbase/ember-ui ships a placeholder `modals/extension-details` component whose
-    // `app/` re-export shadows the engine's in the dummy app (the console resolves engine
-    // components from the engine's own namespace, so this only bites the test build).
-    hooks.beforeEach(function () {
-        this.owner.register('component:modals/extension-details', ExtensionDetailsModal);
-    });
-
-    test('it renders the extension details from the modal options', async function (assert) {
-        this.set('options', {
-            title: 'Fleet-Ops',
-            extension: {
-                name: 'Fleet-Ops',
-                category_name: 'Logistics',
-                description: 'Fleet & Transport Management',
-                promotional_text: '<p>Promo</p>',
-                current_bundle_version: '0.6.73',
-                publisher_name: 'Fleetbase',
-                screenshots: [],
-            },
-        });
-
-        await render(hbs`<Modals::ExtensionDetails @modalIsOpened={{true}} @options={{this.options}} />`);
-
-        assert.dom(document.body).containsText('Logistics');
-        assert.dom(document.body).containsText('Fleet & Transport Management');
-        assert.dom(document.body).containsText('0.6.73');
-        assert.dom(document.body).containsText('Fleetbase');
-    });
-});
diff --git a/tests/integration/components/modals/extension-installer-test.js b/tests/integration/components/modals/extension-installer-test.js
new file mode 100644
index 0000000..f6f0738
--- /dev/null
+++ b/tests/integration/components/modals/extension-installer-test.js
@@ -0,0 +1,103 @@
+import { module, test } from 'qunit';
+import { setupRenderingTest, ModalsManagerStub } from 'dummy/tests/helpers';
+import { fillIn, render, settled } from '@ember/test-helpers';
+import { hbs } from 'ember-cli-htmlbars';
+
+const extension = { id: 'ext_1', slug: 'pallet', name: 'Pallet WMS', meta: { package_names: { npm: '@acme/pallet-engine', composer: 'acme/pallet-api' } } };
+const steps = (...statuses) => ['server', 'engine', 'build'].map((key, index) => ({ key, status: statuses[index] }));
+
+module('Integration | Component | modals/extension-installer', function (hooks) {
+    setupRenderingTest(hooks);
+
+    test('confirm names what will be installed and the three steps', async function (assert) {
+        this.set('options', { jobAction: 'install', phase: 'confirm', extension, companyName: 'Acme Fleet', steps: steps('pending', 'pending', 'pending') });
+        await render(hbs`<Modals::ExtensionInstaller @modalIsOpened={{true}} @options={{this.options}} />`);
+
+        assert.dom('[data-test-installer-intro]').includesText('for Acme Fleet');
+        assert.dom('[data-test-installer-step]').exists({ count: 3 });
+        assert.dom('[data-test-installer-step="server"]').includesText('Install server package');
+        assert.dom('[data-test-installer-step="server"]').includesText('acme/pallet-api');
+        assert.dom('[data-test-installer-step="engine"]').includesText('@acme/pallet-engine');
+        assert.dom('[data-test-installer-time]').includesText('about 2 minutes');
+    });
+
+    test('confirm says a console rebuild takes much longer, for installs and uninstalls', async function (assert) {
+        const rebuilding = { ...extension, meta: { ...extension.meta, install_mode: 'build', uninstall_mode: 'build' } };
+        this.set('options', { jobAction: 'update', phase: 'confirm', extension: rebuilding, steps: steps('pending', 'pending', 'pending') });
+        await render(hbs`<Modals::ExtensionInstaller @modalIsOpened={{true}} @options={{this.options}} />`);
+
+        assert.dom('[data-test-installer-time]').includesText('needs a console rebuild, which can take 15 to 40 minutes');
+        assert.dom('[data-test-installer-time]').doesNotIncludeText('about 2 minutes');
+
+        this.set('options', { jobAction: 'uninstall', phase: 'confirm', extension: rebuilding, steps: steps('pending', 'pending', 'pending') });
+        await settled();
+        assert.dom('[data-test-installer-time]').includesText('Uninstalling also rebuilds the console');
+
+        this.set('options', { jobAction: 'uninstall', phase: 'confirm', extension, steps: steps('pending', 'pending', 'pending') });
+        await settled();
+        assert.dom('[data-test-installer-time]').hasText('Uninstalling reloads the console (about 1 minute).');
+    });
+
+    test('progress marks the steps and shows the live step', async function (assert) {
+        this.set('options', {
+            jobAction: 'install',
+            phase: 'progress',
+            extension,
+            steps: steps('done', 'active', 'pending'),
+            stepDescription: 'Installing the console engine…',
+            progress: 40,
+        });
+        await render(hbs`<Modals::ExtensionInstaller @modalIsOpened={{true}} @options={{this.options}} />`);
+
+        assert.dom('[data-test-installer-progress-title]').hasText('Installing Pallet WMS…');
+        assert.dom('[data-test-installer-progress-title]').hasAttribute('aria-live', 'polite');
+        assert.dom('[data-test-installer-step="server"]').hasAttribute('data-status', 'done');
+        assert.dom('[data-test-installer-step="engine"] [data-test-installer-step-description]').hasText('Installing the console engine…');
+    });
+
+    test('success counts down to the reload', async function (assert) {
+        this.set('options', { jobAction: 'install', phase: 'success', extension, version: '0.9.1', steps: steps('done', 'done', 'done'), secondsLeft: 6 });
+        await render(hbs`<Modals::ExtensionInstaller @modalIsOpened={{true}} @options={{this.options}} />`);
+
+        assert.dom('[data-test-installer-success]').includesText('Pallet WMS v0.9.1 is installed');
+        assert.dom('[data-test-installer-countdown]').hasText('Reloading the console in 6 s so the new section appears.');
+    });
+
+    test('failure shows the stage, message, rollback and the CLI fallback', async function (assert) {
+        this.set('options', {
+            jobAction: 'install',
+            phase: 'failure',
+            extension,
+            steps: steps('done', 'failed', 'pending'),
+            installerError: { step: 'Installing the console engine…', message: 'npm install exited with code 1', log: ['ERR peer dep'], rolledBack: true },
+        });
+        await render(hbs`<Modals::ExtensionInstaller @modalIsOpened={{true}} @options={{this.options}} />`);
+
+        assert.dom('[data-test-installer-failure]').hasAttribute('role', 'alert');
+        assert.dom('[data-test-installer-step="engine"]').hasAttribute('data-status', 'failed');
+        assert.dom('[data-test-installer-job-error-step]').includesText('Installing the console engine…');
+        assert.dom('[data-test-installer-job-error-message]').hasText('npm install exited with code 1');
+        assert.dom('[data-test-installer-job-error-rolled-back]').exists();
+        assert.dom('[data-test-installer-job-error-log]').includesText('ERR peer dep');
+        assert.dom('[data-test-extension-installer]').includesText('flb install pallet');
+    });
+
+    test('uninstall warns and enables Uninstall once the name is typed', async function (assert) {
+        this.owner.register('service:modals-manager', ModalsManagerStub);
+        const modals = this.owner.lookup('service:modals-manager');
+        modals.current = {
+            component: 'modals/extension-installer',
+            options: { jobAction: 'uninstall', phase: 'confirm', extension, steps: steps('pending', 'pending', 'pending'), acceptButtonDisabled: false },
+        };
+        this.set('options', modals.current.options);
+        await render(hbs`<Modals::ExtensionInstaller @modalIsOpened={{true}} @options={{this.options}} />`);
+
+        assert.dom('[data-test-extension-installer]').includesText('permanently deletes its settings and data');
+        assert.dom('[data-test-installer-step="server"]').includesText('Remove server package');
+
+        await fillIn('[data-test-installer-confirm-name]', 'Pallet');
+        assert.true(modals.options.acceptButtonDisabled);
+        await fillIn('[data-test-installer-confirm-name]', 'Pallet WMS');
+        assert.false(modals.options.acceptButtonDisabled);
+    });
+});
diff --git a/tests/integration/components/modals/extension-purchase-form-test.js b/tests/integration/components/modals/extension-purchase-form-test.js
deleted file mode 100644
index e74d3a9..0000000
--- a/tests/integration/components/modals/extension-purchase-form-test.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'dummy/tests/helpers';
-import { render } from '@ember/test-helpers';
-import { hbs } from 'ember-cli-htmlbars';
-
-module('Integration | Component | modals/extension-purchase-form', function (hooks) {
-    setupRenderingTest(hooks);
-
-    test('it hands the checkout container to the options callback', async function (assert) {
-        let inserted;
-        this.set('options', { title: 'Purchase', checkoutElementInserted: (el) => (inserted = el) });
-
-        await render(hbs`<Modals::ExtensionPurchaseForm @modalIsOpened={{true}} @options={{this.options}} />`);
-
-        assert.ok(inserted, 'callback called with the element');
-        assert.strictEqual(inserted.id, 'checkout', 'the checkout mount point is passed');
-    });
-});
diff --git a/tests/integration/components/modals/extension-purchase-status-test.js b/tests/integration/components/modals/extension-purchase-status-test.js
new file mode 100644
index 0000000..330ee87
--- /dev/null
+++ b/tests/integration/components/modals/extension-purchase-status-test.js
@@ -0,0 +1,29 @@
+import { module, test } from 'qunit';
+import { setupRenderingTest } from 'dummy/tests/helpers';
+import { render } from '@ember/test-helpers';
+import { hbs } from 'ember-cli-htmlbars';
+
+module('Integration | Component | modals/extension-purchase-status', function (hooks) {
+    setupRenderingTest(hooks);
+
+    test('each phase after the checkout redirect', async function (assert) {
+        this.set('options', { phase: 'finalizing', organizationName: 'Registry Demo Buyer', extension: { name: 'Pallet WMS' } });
+        await render(hbs`<Modals::ExtensionPurchaseStatus @modalIsOpened={{true}} @options={{this.options}} />`);
+        assert.dom('[data-test-purchase-status]').includesText('Finalizing purchase…');
+        assert.dom('[data-test-purchase-status]').includesText('Registry Demo Buyer');
+
+        this.set('options', { phase: 'success', organizationName: 'Registry Demo Buyer', extension: { name: 'Pallet WMS' }, receiptUrl: 'https://pay.stripe.test/r/1' });
+        assert.dom('[data-test-purchase-success]').includesText('Pallet WMS is yours');
+        assert.dom('[data-test-purchase-success]').includesText('The licence belongs to Registry Demo Buyer', 'the registry organization owns the licence, not the console company');
+
+        this.set('options', { phase: 'success', extension: { name: 'Pallet WMS' } });
+        assert.dom('[data-test-purchase-success]').includesText('The licence belongs to your registry organization');
+        assert.dom('[data-test-purchase-success] a').hasAttribute('href', 'https://pay.stripe.test/r/1');
+
+        this.set('options', { phase: 'failed', serviceStatus: 'expired' });
+        assert.dom('[data-test-purchase-failed]').includesText('Stripe reported the checkout session as expired');
+
+        this.set('options', { phase: 'processing' });
+        assert.dom('[data-test-purchase-processing]').includesText('Payment is still being confirmed');
+    });
+});
diff --git a/tests/integration/components/modals/extension-uninstall-test.js b/tests/integration/components/modals/extension-uninstall-test.js
deleted file mode 100644
index f12b7a7..0000000
--- a/tests/integration/components/modals/extension-uninstall-test.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'dummy/tests/helpers';
-import { render } from '@ember/test-helpers';
-import { hbs } from 'ember-cli-htmlbars';
-
-module('Integration | Component | modals/extension-uninstall', function (hooks) {
-    setupRenderingTest(hooks);
-
-    test('it names the extension being uninstalled', async function (assert) {
-        this.set('options', { title: 'Uninstall', extension: { name: 'Fleet-Ops' } });
-
-        await render(hbs`<Modals::ExtensionUninstall @modalIsOpened={{true}} @options={{this.options}} />`);
-
-        assert.dom(document.body).containsText('Proceed with Uninstall?');
-        assert.dom(document.body).containsText('Do you really want to uninstall the Fleet-Ops?');
-    });
-});
diff --git a/tests/integration/components/modals/select-extension-bundle-test.js b/tests/integration/components/modals/select-extension-bundle-test.js
deleted file mode 100644
index 38f1f60..0000000
--- a/tests/integration/components/modals/select-extension-bundle-test.js
+++ /dev/null
@@ -1,24 +0,0 @@
-import { module, test } from 'qunit';
-import { setupRenderingTest, StubFetchService, stubStoreQuery } from 'dummy/tests/helpers';
-import { render } from '@ember/test-helpers';
-import { hbs } from 'ember-cli-htmlbars';
-
-module('Integration | Component | modals/select-extension-bundle', function (hooks) {
-    setupRenderingTest(hooks);
-
-    hooks.beforeEach(function () {
-        this.owner.register('service:fetch', StubFetchService);
-    });
-
-    test('it loads the pending bundles for the extension and lists them', async function (assert) {
-        const calls = stubStoreQuery(this.owner, [{ id: 'bundle_1', public_id: 'bundle_1', bundle_number: 3, version: '1.2.0', status: 'pending' }]);
-        this.set('options', { title: 'Select bundle', extension: { id: 'ext_1', name: 'Fleet-Ops' } });
-
-        await render(hbs`<Modals::SelectExtensionBundle @modalIsOpened={{true}} @options={{this.options}} />`);
-
-        assert.strictEqual(calls.length, 1, 'one bundle query');
-        assert.strictEqual(calls[0].modelName, 'registry-extension-bundle');
-        assert.deepEqual(calls[0].query, { extension_uuid: 'ext_1', status: 'pending' });
-        assert.dom(document.body).containsText('1.2.0');
-    });
-});
diff --git a/tests/integration/components/modals/self-managed-install-instructions-test.js b/tests/integration/components/modals/self-managed-install-instructions-test.js
deleted file mode 100644
index 9f89054..0000000
--- a/tests/integration/components/modals/self-managed-install-instructions-test.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'dummy/tests/helpers';
-import { render } from '@ember/test-helpers';
-import { hbs } from 'ember-cli-htmlbars';
-
-module('Integration | Component | modals/self-managed-install-instructions', function (hooks) {
-    setupRenderingTest(hooks);
-
-    test('it renders the CLI instructions', async function (assert) {
-        this.set('options', { title: 'Install Extension to Self-Hosted Instance' });
-
-        await render(hbs`<Modals::SelfManagedInstallInstructions @modalIsOpened={{true}} @options={{this.options}} />`);
-
-        assert.dom(document.body).containsText('Begin the installation from the base directory of your Fleetbase instance');
-        assert.dom('ol.self-managed-install-instructions', document.body).exists();
-    });
-});
diff --git a/tests/integration/components/registry-admin-config-test.js b/tests/integration/components/registry-admin-config-test.js
index 473ced6..a353f25 100644
--- a/tests/integration/components/registry-admin-config-test.js
+++ b/tests/integration/components/registry-admin-config-test.js
@@ -1,5 +1,5 @@
 import { module, test } from 'qunit';
-import { setupRenderingTest, StubFetchService } from 'dummy/tests/helpers';
+import { setupRenderingTest, StubFetchService, NotificationsStub } from 'dummy/tests/helpers';
 import { render, click, fillIn, findAll, waitFor } from '@ember/test-helpers';
 import Service from '@ember/service';
 import { hbs } from 'ember-cli-htmlbars';
@@ -16,10 +16,8 @@ function buttonLabelled(text) {
 }
 
 const UNREGISTERED = {
-    host: 'https://registry.fleetbase.io',
-    token: 'secret-token',
     service_url: 'https://registry.example.test',
-    api_version: 'v2',
+    publisher_url: 'https://registry.example.test',
     instance_kind: 'self_hosted',
     instance: { registered: false, id: null, name: null, organization: null, token_hint: null, registered_at: null },
 };
@@ -42,56 +40,44 @@ module('Integration | Component | registry-admin-config', function (hooks) {
     hooks.beforeEach(function () {
         this.owner.register('service:fetch', StubFetchService);
         this.fetch = this.owner.lookup('service:fetch');
-        this.fetch.responses['registry-extensions/config'] = { host: 'https://registry.fleetbase.io', token: 'secret-token' };
+        this.fetch.responses['registry-extensions/config'] = UNREGISTERED;
     });
 
-    test('it loads the saved registry host and keeps the token masked', async function (assert) {
+    test('it loads the saved service URL with the actions', async function (assert) {
         await render(TEMPLATE);
 
         assert.strictEqual(this.fetch.calls[0].path, 'registry-extensions/config', 'loads the saved config');
-        const values = [...this.element.querySelectorAll('input')].map((input) => input.value);
-        assert.true(
-            values.some((value) => value === 'https://registry.fleetbase.io'),
-            'host is editable'
-        );
-        assert.notOk(values.includes('secret-token'), 'token is not shown in an input');
-        assert.dom(this.element).containsText('Reveal token');
+        assert.dom('[data-test-service-url]').hasValue('https://registry.example.test');
+        assert.dom(this.element).doesNotContainText('Registry Token', 'no v1 registry token any more');
         assert.ok(buttonLabelled('Test Connection'), 'test connection action renders');
         assert.ok(buttonLabelled('Save Changes'), 'save action renders');
     });
 
-    test('it tests the connection against the registry and shows the result', async function (assert) {
-        this.fetch.responses['registry-extensions/config/test'] = { ok: true, latency_ms: 42, status: 200, extension_count: 7, host: 'https://registry.fleetbase.io', error: null };
-
+    test('it saves the service URL only', async function (assert) {
         await render(TEMPLATE);
-        await click(buttonLabelled('Test Connection'));
-        await waitFor('dl');
+        await fillIn('[data-test-service-url]', 'https://registry.other.test');
+        await click(buttonLabelled('Save Changes'));
 
-        const testCall = this.fetch.calls.find((call) => call.path === 'registry-extensions/config/test');
-        assert.ok(testCall, 'posts to the test endpoint');
-        assert.strictEqual(testCall.method, 'POST');
-        assert.deepEqual(testCall.data, { host: 'https://registry.fleetbase.io', token: 'secret-token' }, 'sends the current form values');
-        assert.dom(this.element).containsText('Connected to the registry');
-        assert.dom(this.element).containsText('42 ms');
-        assert.dom(this.element).containsText('7');
+        const call = this.fetch.calls.find((call) => call.path === 'registry-extensions/config' && call.method === 'POST');
+        assert.deepEqual(call.data, { service_url: 'https://registry.other.test' });
     });
 
     test('it reports a failed connection', async function (assert) {
         this.fetch.responses['registry-extensions/config/test'] = {
             ok: false,
             latency_ms: 8,
-            status: 401,
+            status: 503,
             extension_count: null,
-            host: 'https://registry.fleetbase.io',
-            error: 'Registry responded with HTTP 401.',
+            host: 'https://registry.example.test',
+            error: 'Registry responded with HTTP 503.',
         };
 
         await render(TEMPLATE);
         await click(buttonLabelled('Test Connection'));
-        await waitFor('dl');
+        await waitFor('[data-test-connection-result]');
 
-        assert.dom(this.element).containsText('Unable to connect to the registry');
-        assert.dom(this.element).containsText('Registry responded with HTTP 401.');
+        assert.dom('[data-test-connection-result]').containsText('Unable to connect to the registry');
+        assert.dom('[data-test-connection-result]').containsText('Registry responded with HTTP 503.');
     });
 
     test('it shows the registry service registration with a masked token only', async function (assert) {
@@ -104,7 +90,6 @@ module('Integration | Component | registry-admin-config', function (hooks) {
             values.some((value) => value === 'https://registry.example.test'),
             'service URL is editable'
         );
-        assert.dom('[data-test-registry-mode]').containsText('use the Registry Service');
         assert.dom('[data-test-registration-status]').containsText('Acme Fleet (self-hosted)');
         assert.dom('[data-test-registration-status]').containsText('Registry Demo Buyer');
         assert.dom('[data-test-token-hint]').hasText('flbi_…0000');
@@ -125,10 +110,55 @@ module('Integration | Component | registry-admin-config', function (hooks) {
 
         const call = this.fetch.calls.find((call) => call.path === 'registry-extensions/instance/register');
         assert.strictEqual(call.method, 'POST');
-        assert.deepEqual(call.data, { code: 'w9qa-sc8r-37jt-9pa8', service_url: 'https://registry.example.test' }, 'sends the trimmed code and service URL');
+        assert.deepEqual(
+            call.data,
+            { code: 'w9qa-sc8r-37jt-9pa8', service_url: 'https://registry.example.test', host: window.location.origin },
+            'sends the trimmed code, service URL and the console origin'
+        );
         assert.dom('[data-test-token-hint]').hasText('flbi_…0000');
     });
 
+    test('it registers again with a new code and says the same instance was rotated', async function (assert) {
+        this.owner.register('service:notifications', NotificationsStub);
+        this.fetch.responses['registry-extensions/config'] = REGISTERED;
+        this.fetch.responses['registry-extensions/instance/register'] = {
+            ...REGISTERED,
+            instance: { ...REGISTERED.instance, token_hint: 'flbi_…ated', registered_at: '2026-10-24T09:10:00+00:00', rotated: true },
+        };
+
+        await render(TEMPLATE);
+        assert.notOk(this.element.querySelector('[data-test-reregister]'), 'no code field until asked');
+
+        await click(buttonLabelled('Register again'));
+        assert.dom('[data-test-reregister]').containsText('only its token is replaced');
+        assert.true(buttonLabelled('Register again').disabled, 'registering again needs a code');
+        assert.notOk(buttonLabelled('Unregister'), 'unregister is hidden while registering again');
+
+        await fillIn('input[placeholder="XXXX-XXXX-XXXX-XXXX"]', 'k2pq-7tzm-4hwd-x9cv');
+        await click(buttonLabelled('Register again'));
+        await waitFor('[data-test-token-hint]');
+
+        const call = this.fetch.calls.find((call) => call.path === 'registry-extensions/instance/register');
+        assert.deepEqual(call.data, { code: 'k2pq-7tzm-4hwd-x9cv', service_url: 'https://registry.example.test', host: window.location.origin });
+        assert.dom('[data-test-token-hint]').hasText('flbi_…ated');
+        assert.notOk(this.element.querySelector('[data-test-reregister]'), 'the code field closes');
+        const [toast] = this.owner.lookup('service:notifications').messages;
+        assert.strictEqual(toast.type, 'success');
+        assert.true(toast.message.includes('Re-registered Acme Fleet (self-hosted) (inst_rsmdtgevid)'), toast.message);
+        assert.true(toast.message.includes('licence seats are kept'), toast.message);
+    });
+
+    test('registering again can be cancelled', async function (assert) {
+        this.fetch.responses['registry-extensions/config'] = REGISTERED;
+
+        await render(TEMPLATE);
+        await click(buttonLabelled('Register again'));
+        await click(buttonLabelled('Cancel'));
+
+        assert.notOk(this.element.querySelector('[data-test-reregister]'));
+        assert.ok(buttonLabelled('Unregister'));
+    });
+
     test('it unregisters after confirmation', async function (assert) {
         this.fetch.responses['registry-extensions/config'] = REGISTERED;
         this.fetch.responses['registry-extensions/instance'] = UNREGISTERED;
@@ -169,7 +199,6 @@ module('Integration | Component | registry-admin-config', function (hooks) {
 
         const testCall = this.fetch.calls.find((call) => call.path === 'registry-extensions/config/test');
         assert.deepEqual(testCall.data, { service_url: 'https://registry.example.test' }, 'tests the service URL');
-        assert.dom(this.element).containsText('Registry Service (v2)');
         assert.dom('[data-test-instance-check]').containsText('Accepted (Acme Fleet (self-hosted), Registry Demo Buyer)');
     });
 });
diff --git a/tests/unit/adapters/registry-extension-bundle-test.js b/tests/unit/adapters/registry-extension-bundle-test.js
deleted file mode 100644
index 054215d..0000000
--- a/tests/unit/adapters/registry-extension-bundle-test.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import { module, test } from 'qunit';
-
-import { setupTest } from 'dummy/tests/helpers';
-
-module('Unit | Adapter | registry extension bundle', function (hooks) {
-    setupTest(hooks);
-
-    // Replace this with your real tests.
-    test('it exists', function (assert) {
-        let adapter = this.owner.lookup('adapter:registry-extension-bundle');
-        assert.ok(adapter);
-    });
-});
diff --git a/tests/unit/controllers/application-test.js b/tests/unit/controllers/application-test.js
index 9f4f63b..57100a3 100644
--- a/tests/unit/controllers/application-test.js
+++ b/tests/unit/controllers/application-test.js
@@ -4,9 +4,43 @@ import { setupTest } from 'dummy/tests/helpers';
 module('Unit | Controller | application', function (hooks) {
     setupTest(hooks);
 
-    // TODO: Replace this with your real tests.
-    test('it exists', function (assert) {
-        let controller = this.owner.lookup('controller:application');
-        assert.ok(controller);
+    test('Installed shows the updates waiting next to its count', function (assert) {
+        const controller = this.owner.lookup('controller:application');
+        const context = this.owner.lookup('service:registry-context');
+
+        assert.strictEqual(controller.installedCount, null, 'no count before it loads');
+        context.counts = { installed: 7, updates: 2, purchased: 3 };
+        assert.strictEqual(controller.installedCount, '7 · 2↑');
+        assert.strictEqual(controller.purchasedCount, '3');
+        context.counts = { installed: 4, updates: 0, purchased: 0 };
+        assert.strictEqual(controller.installedCount, '4');
+        assert.strictEqual(controller.purchasedCount, '0');
+    });
+
+    test('sidebar categories carry their count and a slug model', function (assert) {
+        const controller = this.owner.lookup('controller:application');
+        controller.model = [
+            { name: 'Telematics', slug: 'telematics', icon: 'satellite-dish', meta: { extensions_count: 6 } },
+            { name: 'Finance', slug: 'finance', meta: { extensions_count: 0 } },
+            { name: 'Warehouse', slug: 'warehouse' },
+        ];
+
+        assert.deepEqual(controller.sidebarCategories, [
+            { name: 'Telematics', slug: 'telematics', icon: 'satellite-dish', model: { slug: 'telematics' }, count: '6' },
+            { name: 'Finance', slug: 'finance', icon: undefined, model: { slug: 'finance' }, count: '0' },
+            { name: 'Warehouse', slug: 'warehouse', icon: undefined, model: { slug: 'warehouse' }, count: null },
+        ]);
+    });
+
+    test('category counts survive an embedded category without its count', function (assert) {
+        const controller = this.owner.lookup('controller:application');
+        const fleet = { name: 'Fleet', slug: 'fleet', meta: { extensions_count: 3 } };
+        controller.model = [fleet];
+        controller.rememberCategoryCounts(controller.model);
+
+        // What ember-data does when an Explore result embeds the same category.
+        fleet.meta = { source: 'registry-service', extensions_count: null };
+
+        assert.strictEqual(controller.sidebarCategories[0].count, '3');
     });
 });
diff --git a/tests/unit/controllers/developers/analytics-test.js b/tests/unit/controllers/developers/analytics-test.js
deleted file mode 100644
index 207bd86..0000000
--- a/tests/unit/controllers/developers/analytics-test.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import { module, test } from 'qunit';
-import { setupTest } from 'dummy/tests/helpers';
-
-module('Unit | Controller | developers/analytics', function (hooks) {
-    setupTest(hooks);
-
-    // TODO: Replace this with your real tests.
-    test('it exists', function (assert) {
-        let controller = this.owner.lookup('controller:developers/analytics');
-        assert.ok(controller);
-    });
-});
diff --git a/tests/unit/controllers/developers/credentials-test.js b/tests/unit/controllers/developers/credentials-test.js
deleted file mode 100644
index f14a7ba..0000000
--- a/tests/unit/controllers/developers/credentials-test.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import { module, test } from 'qunit';
-import { setupTest } from 'dummy/tests/helpers';
-
-module('Unit | Controller | developers/credentials', function (hooks) {
-    setupTest(hooks);
-
-    // TODO: Replace this with your real tests.
-    test('it exists', function (assert) {
-        let controller = this.owner.lookup('controller:developers/credentials');
-        assert.ok(controller);
-    });
-});
diff --git a/tests/unit/controllers/developers/extensions/edit-test.js b/tests/unit/controllers/developers/extensions/edit-test.js
deleted file mode 100644
index b491ed3..0000000
--- a/tests/unit/controllers/developers/extensions/edit-test.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import { module, test } from 'qunit';
-import { setupTest } from 'dummy/tests/helpers';
-
-module('Unit | Controller | developers/extensions/edit', function (hooks) {
-    setupTest(hooks);
-
-    // TODO: Replace this with your real tests.
-    test('it exists', function (assert) {
-        let controller = this.owner.lookup('controller:developers/extensions/edit');
-        assert.ok(controller);
-    });
-});
diff --git a/tests/unit/controllers/developers/extensions/edit/bundles-test.js b/tests/unit/controllers/developers/extensions/edit/bundles-test.js
deleted file mode 100644
index 9faa88b..0000000
--- a/tests/unit/controllers/developers/extensions/edit/bundles-test.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import { module, test } from 'qunit';
-import { setupTest } from 'dummy/tests/helpers';
-
-module('Unit | Controller | developers/extensions/edit/bundles', function (hooks) {
-    setupTest(hooks);
-
-    // TODO: Replace this with your real tests.
-    test('it exists', function (assert) {
-        let controller = this.owner.lookup('controller:developers/extensions/edit/bundles');
-        assert.ok(controller);
-    });
-});
diff --git a/tests/unit/controllers/developers/extensions/edit/index-test.js b/tests/unit/controllers/developers/extensions/edit/index-test.js
deleted file mode 100644
index 5f1bc44..0000000
--- a/tests/unit/controllers/developers/extensions/edit/index-test.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import { module, test } from 'qunit';
-import { setupTest } from 'dummy/tests/helpers';
-
-module('Unit | Controller | developers/extensions/edit/index', function (hooks) {
-    setupTest(hooks);
-
-    // TODO: Replace this with your real tests.
-    test('it exists', function (assert) {
-        let controller = this.owner.lookup('controller:developers/extensions/edit/index');
-        assert.ok(controller);
-    });
-});
diff --git a/tests/unit/controllers/developers/extensions/edit/monetize-test.js b/tests/unit/controllers/developers/extensions/edit/monetize-test.js
deleted file mode 100644
index 3b66a4e..0000000
--- a/tests/unit/controllers/developers/extensions/edit/monetize-test.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import { module, test } from 'qunit';
-import { setupTest } from 'dummy/tests/helpers';
-
-module('Unit | Controller | developers/extensions/edit/monetize', function (hooks) {
-    setupTest(hooks);
-
-    // TODO: Replace this with your real tests.
-    test('it exists', function (assert) {
-        let controller = this.owner.lookup('controller:developers/extensions/edit/monetize');
-        assert.ok(controller);
-    });
-});
diff --git a/tests/unit/controllers/developers/extensions/index-test.js b/tests/unit/controllers/developers/extensions/index-test.js
deleted file mode 100644
index a9d3a34..0000000
--- a/tests/unit/controllers/developers/extensions/index-test.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import { module, test } from 'qunit';
-import { setupTest } from 'dummy/tests/helpers';
-
-module('Unit | Controller | developers/extensions/index', function (hooks) {
-    setupTest(hooks);
-
-    // TODO: Replace this with your real tests.
-    test('it exists', function (assert) {
-        let controller = this.owner.lookup('controller:developers/extensions/index');
-        assert.ok(controller);
-    });
-});
diff --git a/tests/unit/controllers/developers/extensions/new-test.js b/tests/unit/controllers/developers/extensions/new-test.js
deleted file mode 100644
index 98037f7..0000000
--- a/tests/unit/controllers/developers/extensions/new-test.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import { module, test } from 'qunit';
-import { setupTest } from 'dummy/tests/helpers';
-
-module('Unit | Controller | developers/extensions/new', function (hooks) {
-    setupTest(hooks);
-
-    // TODO: Replace this with your real tests.
-    test('it exists', function (assert) {
-        let controller = this.owner.lookup('controller:developers/extensions/new');
-        assert.ok(controller);
-    });
-});
diff --git a/tests/unit/controllers/developers/payments/index-test.js b/tests/unit/controllers/developers/payments/index-test.js
deleted file mode 100644
index e704ab4..0000000
--- a/tests/unit/controllers/developers/payments/index-test.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import { module, test } from 'qunit';
-import { setupTest } from 'dummy/tests/helpers';
-
-module('Unit | Controller | developers/payments/index', function (hooks) {
-    setupTest(hooks);
-
-    // TODO: Replace this with your real tests.
-    test('it exists', function (assert) {
-        let controller = this.owner.lookup('controller:developers/payments/index');
-        assert.ok(controller);
-    });
-});
diff --git a/tests/unit/controllers/developers/payments/onboard-test.js b/tests/unit/controllers/developers/payments/onboard-test.js
deleted file mode 100644
index 77d7c26..0000000
--- a/tests/unit/controllers/developers/payments/onboard-test.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import { module, test } from 'qunit';
-import { setupTest } from 'dummy/tests/helpers';
-
-module('Unit | Controller | developers/payments/onboard', function (hooks) {
-    setupTest(hooks);
-
-    // TODO: Replace this with your real tests.
-    test('it exists', function (assert) {
-        let controller = this.owner.lookup('controller:developers/payments/onboard');
-        assert.ok(controller);
-    });
-});
diff --git a/tests/unit/controllers/explore/index-test.js b/tests/unit/controllers/explore/index-test.js
index 2201f22..7a35cb9 100644
--- a/tests/unit/controllers/explore/index-test.js
+++ b/tests/unit/controllers/explore/index-test.js
@@ -4,9 +4,19 @@ import { setupTest } from 'dummy/tests/helpers';
 module('Unit | Controller | explore/index', function (hooks) {
     setupTest(hooks);
 
-    // TODO: Replace this with your real tests.
     test('it exists', function (assert) {
         let controller = this.owner.lookup('controller:explore/index');
         assert.ok(controller);
     });
+
+    test('registryHost names the configured service, never a default host', function (assert) {
+        const controller = this.owner.lookup('controller:explore/index');
+        const registryContext = this.owner.lookup('service:registry-context');
+
+        registryContext.context = {};
+        assert.strictEqual(controller.registryHost, 'The extensions registry', 'unknown until the context arrives');
+
+        registryContext.context = { service_url: 'https://registry.example.test' };
+        assert.strictEqual(controller.registryHost, 'https://registry.example.test');
+    });
 });
diff --git a/tests/unit/controllers/installed-test.js b/tests/unit/controllers/installed-test.js
index 1aa608c..a3d11ae 100644
--- a/tests/unit/controllers/installed-test.js
+++ b/tests/unit/controllers/installed-test.js
@@ -1,12 +1,39 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'dummy/tests/helpers';
+import { matchesQuery } from '@fleetbase/registry-bridge-engine/controllers/installed';
 
 module('Unit | Controller | installed', function (hooks) {
     setupTest(hooks);
 
-    // TODO: Replace this with your real tests.
-    test('it exists', function (assert) {
-        let controller = this.owner.lookup('controller:installed');
-        assert.ok(controller);
+    test('search matches name, publisher, category and slug', function (assert) {
+        const extension = { name: 'Flespi Connector', publisher_name: 'Fleetbase', category_name: 'Telematics', slug: 'flespi' };
+        assert.true(matchesQuery(extension, ''));
+        assert.true(matchesQuery(extension, 'flespi'));
+        assert.true(matchesQuery(extension, 'TELEMATICS'));
+        assert.false(matchesQuery(extension, 'warehouse'));
+    });
+
+    test('loads rows, filters them and counts updates', async function (assert) {
+        const controller = this.owner.lookup('controller:installed');
+        controller.model = { load: async () => [{ name: 'A', update_available: true }, { name: 'B' }] };
+
+        await controller.load.perform();
+        assert.strictEqual(controller.rows.length, 2);
+        assert.strictEqual(controller.updatesAvailable, 1);
+
+        controller.query = 'b';
+        assert.deepEqual(
+            controller.rows.map((row) => row.name),
+            ['B']
+        );
+    });
+
+    test('a failed load keeps the error for the page', async function (assert) {
+        const controller = this.owner.lookup('controller:installed');
+        controller.model = { load: async () => Promise.reject(new Error('503')) };
+
+        await controller.load.perform();
+        assert.strictEqual(controller.error.message, '503');
+        assert.deepEqual(controller.extensions, []);
     });
 });
diff --git a/tests/unit/controllers/purchased-test.js b/tests/unit/controllers/purchased-test.js
index 4bad376..59eed36 100644
--- a/tests/unit/controllers/purchased-test.js
+++ b/tests/unit/controllers/purchased-test.js
@@ -1,12 +1,70 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'dummy/tests/helpers';
+import Service from '@ember/service';
+
+class ContextStub extends Service {
+    countLoads = 0;
+    organizationName = 'Registry Demo Buyer';
+    loadCounts() {
+        this.countLoads++;
+    }
+}
+
+const ACTIVE = { name: 'Registry Demo Pro', is_installed: false, is_purchased: true, meta: { licence_state: 'active' } };
+const REFUNDED = { name: 'Acme Route Planner', is_installed: true, is_purchased: false, meta: { licence_state: 'refunded', licence: { status: 'revoked', revoked_reason: 'refunded' } } };
+const REVOKED = { name: 'Delisted Pro', is_installed: false, is_purchased: false, is_installable: false, meta: { licence_state: 'revoked' } };
 
 module('Unit | Controller | purchased', function (hooks) {
     setupTest(hooks);
 
-    // TODO: Replace this with your real tests.
-    test('it exists', function (assert) {
-        let controller = this.owner.lookup('controller:purchased');
-        assert.ok(controller);
+    hooks.beforeEach(function () {
+        this.owner.register('service:registry-context', ContextStub);
+    });
+
+    test('the price column shows the amount and status stays in the install status column', function (assert) {
+        const controller = this.owner.lookup('controller:purchased');
+        const byLabel = Object.fromEntries(controller.columns.map((column) => [column.label, column]));
+
+        assert.strictEqual(byLabel.Price.cellComponent, 'cell/purchase-price', 'no status chips under Price');
+        assert.strictEqual(byLabel.Licence.cellComponent, 'cell/licence-state');
+        assert.strictEqual(byLabel['Install status'].cellComponent, 'cell/extension-status');
+        assert.strictEqual(byLabel['Install status'].variant, 'purchased');
+    });
+
+    test('refunded and revoked licences stay listed but are not ready to install, and the sidebar counts refresh', async function (assert) {
+        const controller = this.owner.lookup('controller:purchased');
+        controller.model = { load: async () => [ACTIVE, REFUNDED, REVOKED] };
+
+        await controller.load.perform();
+
+        assert.deepEqual(
+            controller.rows.map((row) => row.name),
+            ['Registry Demo Pro', 'Acme Route Planner', 'Delisted Pro']
+        );
+        assert.strictEqual(controller.readyToInstall, 1, 'only the active licence counts as ready');
+        assert.strictEqual(controller.blockedCount, 2, 'the refunded and the revoked licence say updates are blocked');
+        assert.strictEqual(this.owner.lookup('service:registry-context').countLoads, 1);
+
+        const install = controller.columns.at(-1).actions.find((action) => action.icon === 'download');
+        assert.true(install.isVisible(ACTIVE));
+        assert.false(install.isVisible(REVOKED), 'a revoked licence offers no Install');
+    });
+
+    test('the empty state names the registry organization', function (assert) {
+        const controller = this.owner.lookup('controller:purchased');
+        assert.strictEqual(controller.organizationName, 'Registry Demo Buyer');
+
+        this.owner.lookup('service:registry-context').organizationName = null;
+        assert.strictEqual(controller.organizationName, 'your registry organization');
+    });
+
+    test('a failed load keeps the error and leaves the counts alone', async function (assert) {
+        const controller = this.owner.lookup('controller:purchased');
+        controller.model = { load: async () => Promise.reject(new Error('503')) };
+
+        await controller.load.perform();
+
+        assert.strictEqual(controller.error.message, '503');
+        assert.strictEqual(this.owner.lookup('service:registry-context').countLoads, 0);
     });
 });
diff --git a/tests/unit/models/registry-extension-bundle-test.js b/tests/unit/models/registry-extension-bundle-test.js
deleted file mode 100644
index abd099b..0000000
--- a/tests/unit/models/registry-extension-bundle-test.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import { module, test } from 'qunit';
-
-import { setupTest } from 'dummy/tests/helpers';
-
-module('Unit | Model | registry extension bundle', function (hooks) {
-    setupTest(hooks);
-
-    // Replace this with your real tests.
-    test('it exists', function (assert) {
-        let store = this.owner.lookup('service:store');
-        let model = store.createRecord('registry-extension-bundle', {});
-        assert.ok(model);
-    });
-});
diff --git a/tests/unit/routes/developers-test.js b/tests/unit/routes/developers-test.js
deleted file mode 100644
index 8cd5a11..0000000
--- a/tests/unit/routes/developers-test.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import { module, test } from 'qunit';
-import { setupTest } from 'dummy/tests/helpers';
-
-module('Unit | Route | developers', function (hooks) {
-    setupTest(hooks);
-
-    test('it exists', function (assert) {
-        let route = this.owner.lookup('route:developers');
-        assert.ok(route);
-    });
-});
diff --git a/tests/unit/routes/developers/analytics-test.js b/tests/unit/routes/developers/analytics-test.js
deleted file mode 100644
index a9e9cd7..0000000
--- a/tests/unit/routes/developers/analytics-test.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import { module, test } from 'qunit';
-import { setupTest } from 'dummy/tests/helpers';
-
-module('Unit | Route | developers/analytics', function (hooks) {
-    setupTest(hooks);
-
-    test('it exists', function (assert) {
-        let route = this.owner.lookup('route:developers/analytics');
-        assert.ok(route);
-    });
-});
diff --git a/tests/unit/routes/developers/credentials-test.js b/tests/unit/routes/developers/credentials-test.js
deleted file mode 100644
index 815ead5..0000000
--- a/tests/unit/routes/developers/credentials-test.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import { module, test } from 'qunit';
-import { setupTest } from 'dummy/tests/helpers';
-
-module('Unit | Route | developers/credentials', function (hooks) {
-    setupTest(hooks);
-
-    test('it exists', function (assert) {
-        let route = this.owner.lookup('route:developers/credentials');
-        assert.ok(route);
-    });
-});
diff --git a/tests/unit/routes/developers/extensions-test.js b/tests/unit/routes/developers/extensions-test.js
deleted file mode 100644
index 805497f..0000000
--- a/tests/unit/routes/developers/extensions-test.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import { module, test } from 'qunit';
-import { setupTest } from 'dummy/tests/helpers';
-
-module('Unit | Route | developers/extensions', function (hooks) {
-    setupTest(hooks);
-
-    test('it exists', function (assert) {
-        let route = this.owner.lookup('route:developers/extensions');
-        assert.ok(route);
-    });
-});
diff --git a/tests/unit/routes/developers/extensions/edit-test.js b/tests/unit/routes/developers/extensions/edit-test.js
deleted file mode 100644
index 7536450..0000000
--- a/tests/unit/routes/developers/extensions/edit-test.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import { module, test } from 'qunit';
-import { setupTest } from 'dummy/tests/helpers';
-
-module('Unit | Route | developers/extensions/edit', function (hooks) {
-    setupTest(hooks);
-
-    test('it exists', function (assert) {
-        let route = this.owner.lookup('route:developers/extensions/edit');
-        assert.ok(route);
-    });
-});
diff --git a/tests/unit/routes/developers/extensions/edit/bundles-test.js b/tests/unit/routes/developers/extensions/edit/bundles-test.js
deleted file mode 100644
index c5cc1dc..0000000
--- a/tests/unit/routes/developers/extensions/edit/bundles-test.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import { module, test } from 'qunit';
-import { setupTest } from 'dummy/tests/helpers';
-
-module('Unit | Route | developers/extensions/edit/bundles', function (hooks) {
-    setupTest(hooks);
-
-    test('it exists', function (assert) {
-        let route = this.owner.lookup('route:developers/extensions/edit/bundles');
-        assert.ok(route);
-    });
-});
diff --git a/tests/unit/routes/developers/extensions/edit/details-test.js b/tests/unit/routes/developers/extensions/edit/details-test.js
deleted file mode 100644
index dd92e9d..0000000
--- a/tests/unit/routes/developers/extensions/edit/details-test.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import { module, test } from 'qunit';
-import { setupTest } from 'dummy/tests/helpers';
-
-module('Unit | Route | developers/extensions/edit/details', function (hooks) {
-    setupTest(hooks);
-
-    test('it exists', function (assert) {
-        let route = this.owner.lookup('route:developers/extensions/edit/details');
-        assert.ok(route);
-    });
-});
diff --git a/tests/unit/routes/developers/extensions/edit/index-test.js b/tests/unit/routes/developers/extensions/edit/index-test.js
deleted file mode 100644
index 264c961..0000000
--- a/tests/unit/routes/developers/extensions/edit/index-test.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import { module, test } from 'qunit';
-import { setupTest } from 'dummy/tests/helpers';
-
-module('Unit | Route | developers/extensions/edit/index', function (hooks) {
-    setupTest(hooks);
-
-    test('it exists', function (assert) {
-        let route = this.owner.lookup('route:developers/extensions/edit/index');
-        assert.ok(route);
-    });
-});
diff --git a/tests/unit/routes/developers/extensions/edit/monetize-test.js b/tests/unit/routes/developers/extensions/edit/monetize-test.js
deleted file mode 100644
index 9ed8d01..0000000
--- a/tests/unit/routes/developers/extensions/edit/monetize-test.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import { module, test } from 'qunit';
-import { setupTest } from 'dummy/tests/helpers';
-
-module('Unit | Route | developers/extensions/edit/monetize', function (hooks) {
-    setupTest(hooks);
-
-    test('it exists', function (assert) {
-        let route = this.owner.lookup('route:developers/extensions/edit/monetize');
-        assert.ok(route);
-    });
-});
diff --git a/tests/unit/routes/developers/extensions/index-test.js b/tests/unit/routes/developers/extensions/index-test.js
deleted file mode 100644
index 8853d57..0000000
--- a/tests/unit/routes/developers/extensions/index-test.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import { module, test } from 'qunit';
-import { setupTest } from 'dummy/tests/helpers';
-
-module('Unit | Route | developers/extensions/index', function (hooks) {
-    setupTest(hooks);
-
-    test('it exists', function (assert) {
-        let route = this.owner.lookup('route:developers/extensions/index');
-        assert.ok(route);
-    });
-});
diff --git a/tests/unit/routes/developers/extensions/new-test.js b/tests/unit/routes/developers/extensions/new-test.js
deleted file mode 100644
index 93087cd..0000000
--- a/tests/unit/routes/developers/extensions/new-test.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import { module, test } from 'qunit';
-import { setupTest } from 'dummy/tests/helpers';
-
-module('Unit | Route | developers/extensions/new', function (hooks) {
-    setupTest(hooks);
-
-    test('it exists', function (assert) {
-        let route = this.owner.lookup('route:developers/extensions/new');
-        assert.ok(route);
-    });
-});
diff --git a/tests/unit/routes/developers/payments-test.js b/tests/unit/routes/developers/payments-test.js
deleted file mode 100644
index 2b4792b..0000000
--- a/tests/unit/routes/developers/payments-test.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import { module, test } from 'qunit';
-import { setupTest } from 'dummy/tests/helpers';
-
-module('Unit | Route | developers/payments', function (hooks) {
-    setupTest(hooks);
-
-    test('it exists', function (assert) {
-        let route = this.owner.lookup('route:developers/payments');
-        assert.ok(route);
-    });
-});
diff --git a/tests/unit/routes/developers/payments/index-test.js b/tests/unit/routes/developers/payments/index-test.js
deleted file mode 100644
index 66653cd..0000000
--- a/tests/unit/routes/developers/payments/index-test.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import { module, test } from 'qunit';
-import { setupTest } from 'dummy/tests/helpers';
-
-module('Unit | Route | developers/payments/index', function (hooks) {
-    setupTest(hooks);
-
-    test('it exists', function (assert) {
-        let route = this.owner.lookup('route:developers/payments/index');
-        assert.ok(route);
-    });
-});
diff --git a/tests/unit/routes/developers/payments/onboard-test.js b/tests/unit/routes/developers/payments/onboard-test.js
deleted file mode 100644
index 29d4e3f..0000000
--- a/tests/unit/routes/developers/payments/onboard-test.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import { module, test } from 'qunit';
-import { setupTest } from 'dummy/tests/helpers';
-
-module('Unit | Route | developers/payments/onboard', function (hooks) {
-    setupTest(hooks);
-
-    test('it exists', function (assert) {
-        let route = this.owner.lookup('route:developers/payments/onboard');
-        assert.ok(route);
-    });
-});
diff --git a/tests/unit/serializers/registry-extension-bundle-test.js b/tests/unit/serializers/registry-extension-bundle-test.js
deleted file mode 100644
index 61e6e57..0000000
--- a/tests/unit/serializers/registry-extension-bundle-test.js
+++ /dev/null
@@ -1,24 +0,0 @@
-import { module, test } from 'qunit';
-
-import { setupTest } from 'dummy/tests/helpers';
-
-module('Unit | Serializer | registry extension bundle', function (hooks) {
-    setupTest(hooks);
-
-    // Replace this with your real tests.
-    test('it exists', function (assert) {
-        let store = this.owner.lookup('service:store');
-        let serializer = store.serializerFor('registry-extension-bundle');
-
-        assert.ok(serializer);
-    });
-
-    test('it serializes records', function (assert) {
-        let store = this.owner.lookup('service:store');
-        let record = store.createRecord('registry-extension-bundle', {});
-
-        let serializedRecord = record.serialize();
-
-        assert.ok(serializedRecord);
-    });
-});
diff --git a/tests/unit/services/extension-installer-test.js b/tests/unit/services/extension-installer-test.js
new file mode 100644
index 0000000..70e3694
--- /dev/null
+++ b/tests/unit/services/extension-installer-test.js
@@ -0,0 +1,128 @@
+import { module, test } from 'qunit';
+import { setupTest, AbilitiesStub, CurrentUserStub, ModalsManagerStub, NotificationsStub, SocketStub, StubFetchService } from 'dummy/tests/helpers';
+import { installerButtons } from '@fleetbase/registry-bridge-engine/services/extension-installer';
+
+const settle = () => new Promise((resolve) => setTimeout(resolve, 0));
+
+module('Unit | Service | extension-installer', function (hooks) {
+    setupTest(hooks);
+
+    hooks.beforeEach(function () {
+        this.owner.register('service:modals-manager', ModalsManagerStub);
+        this.owner.register('service:abilities', AbilitiesStub);
+        this.owner.register('service:current-user', CurrentUserStub);
+        this.owner.register('service:socket', SocketStub);
+        this.owner.register('service:fetch', StubFetchService);
+        this.owner.register('service:notifications', NotificationsStub);
+        this.service = this.owner.lookup('service:extension-installer');
+        this.modals = this.owner.lookup('service:modals-manager');
+        this.fetch = this.owner.lookup('service:fetch');
+        this.socket = this.owner.lookup('service:socket');
+        this.reloads = 0;
+        this.service.reload = () => this.reloads++;
+        this.service.reloadAfter = 1;
+        this.extension = {
+            id: 'ext_1',
+            public_id: 'ext_1',
+            slug: 'pallet',
+            name: 'Pallet WMS',
+            latest_version: '0.9.1',
+            meta: { package_names: { npm: '@acme/pallet-engine', composer: 'acme/pallet-api' } },
+        };
+    });
+
+    test('the footer buttons follow the phase', function (assert) {
+        const intl = { t: (key) => key };
+
+        assert.strictEqual(installerButtons(intl, 'install', 'confirm').acceptButtonText, 'registry-bridge.install.confirm.accept');
+        assert.strictEqual(installerButtons(intl, 'update', 'confirm').acceptButtonText, 'registry-bridge.update.confirm.accept');
+        assert.strictEqual(installerButtons(intl, 'uninstall', 'confirm').acceptButtonScheme, 'danger');
+        assert.true(installerButtons(intl, 'install', 'progress').hideDeclineButton);
+        assert.deepEqual(
+            [installerButtons(intl, 'install', 'success').acceptButtonText, installerButtons(intl, 'install', 'success').declineButtonText],
+            ['registry-bridge.install.success.reload-now', 'registry-bridge.install.success.stay']
+        );
+        assert.strictEqual(installerButtons(intl, 'uninstall', 'failure').acceptButtonText, 'registry-bridge.uninstall.failed.retry');
+    });
+
+    test('install confirms, queues the job with the release and finishes with a reload countdown', async function (assert) {
+        this.fetch.responses['installer/install'] = { status: 'queued', job: { id: 'j1', status: 'queued' } };
+        this.fetch.responses['installer/jobs/j1'] = { job: { id: 'j1', status: 'completed' } };
+        let completed = null;
+
+        this.service.install(this.extension, { onCompleted: (job) => (completed = job) });
+        assert.strictEqual(this.modals.current.component, 'modals/extension-installer');
+        assert.strictEqual(this.modals.options.phase, 'confirm');
+        assert.strictEqual(this.modals.options.version, '0.9.1');
+        assert.deepEqual(
+            this.modals.options.steps.map((step) => step.key),
+            ['server', 'engine', 'build']
+        );
+
+        const running = this.modals.confirm();
+        await settle();
+        assert.deepEqual(this.fetch.calls[0], { path: 'installer/install', method: 'POST', data: { extension: 'ext_1', version: '0.9.1' }, options: { namespace: '~registry/v1' } });
+        assert.strictEqual(this.modals.options.phase, 'progress');
+        assert.true(this.modals.options.hideDeclineButton, 'no Cancel while the job runs');
+        assert.ok(this.socket.listeners['install.company_1.ext_1'], 'follows the install channel');
+
+        this.socket.emit('install.company_1.ext_1', { job: 'j1', status: 'completed' });
+        await running;
+
+        assert.strictEqual(this.modals.options.phase, 'success');
+        assert.strictEqual(this.modals.options.acceptButtonText, 'Reload now');
+        assert.false(this.modals.options.isLoading, 'Reload now and Wait can be pressed');
+        assert.strictEqual(completed.status, 'completed');
+
+        await this.modals.confirm();
+        assert.strictEqual(this.reloads, 1, 'Reload now reloads');
+    });
+
+    test('uninstall needs the typed name before it runs', async function (assert) {
+        this.service.uninstall({ ...this.extension, installed_version: '0.9.0' });
+        assert.strictEqual(this.modals.options.version, '0.9.0');
+
+        await this.modals.confirm();
+        assert.strictEqual(this.fetch.calls.length, 0, 'nothing is sent without the name');
+
+        this.fetch.responses['installer/uninstall'] = { status: 'ok' };
+        this.modals.setOption('confirmName', 'Pallet WMS');
+        await this.modals.confirm();
+        assert.deepEqual(this.fetch.calls[0].data, { extension: 'ext_1' }, 'uninstall sends no version');
+        assert.ok(this.socket.listeners['uninstall.company_1.ext_1']);
+    });
+
+    test('Wait, stay here cancels the reload and closes', async function (assert) {
+        this.fetch.responses['installer/update'] = { status: 'ok', job: { id: 'j2', status: 'completed' } };
+        this.service.update(this.extension, { version: '1.0.0' });
+        await this.modals.confirm();
+        assert.strictEqual(this.fetch.calls[0].data.version, '1.0.0');
+        assert.strictEqual(this.modals.options.phase, 'success');
+
+        const options = this.modals.options;
+        await this.modals.decline();
+        assert.true(options.reloadCancelled);
+        assert.strictEqual(this.modals.closed, 1);
+        await new Promise((resolve) => setTimeout(resolve, 1100));
+        assert.strictEqual(this.reloads, 0);
+    });
+
+    test('a failed job shows Retry, and retrying sends the request again', async function (assert) {
+        this.fetch.responses['installer/install'] = { job: { id: 'j3', status: 'failed', step: 'server.install', message: 'composer failed' } };
+        this.service.install(this.extension);
+        await this.modals.confirm();
+
+        assert.strictEqual(this.modals.options.phase, 'failure');
+        assert.strictEqual(this.modals.options.acceptButtonText, 'Retry install');
+        assert.strictEqual(this.modals.options.installerError.message, 'composer failed');
+
+        await this.modals.confirm();
+        assert.strictEqual(this.fetch.calls.filter((call) => call.path === 'installer/install').length, 2);
+    });
+
+    test('install is disabled without the permission', function (assert) {
+        this.owner.lookup('service:abilities').denied.add('registry-bridge install extension');
+        this.service.install(this.extension);
+        assert.true(this.modals.options.acceptButtonDisabled);
+    });
+});
diff --git a/tests/unit/services/extension-panel-test.js b/tests/unit/services/extension-panel-test.js
new file mode 100644
index 0000000..3ae4068
--- /dev/null
+++ b/tests/unit/services/extension-panel-test.js
@@ -0,0 +1,42 @@
+import { module, test } from 'qunit';
+import { setupTest, StubFetchService } from 'dummy/tests/helpers';
+
+module('Unit | Service | extension-panel', function (hooks) {
+    setupTest(hooks);
+
+    hooks.beforeEach(function () {
+        this.owner.register('service:fetch', StubFetchService);
+        this.panel = this.owner.lookup('service:extension-panel');
+        this.originalUrl = window.location.href;
+    });
+
+    hooks.afterEach(function () {
+        window.history.replaceState({}, '', this.originalUrl);
+    });
+
+    test('opening keeps the extension in the URL and closing removes it', function (assert) {
+        this.panel.open({ id: 'ext_1', public_id: 'ext_1', name: 'Pallet' }, { tab: 'versions' });
+
+        assert.true(this.panel.isOpen);
+        assert.strictEqual(this.panel.tab, 'versions');
+        assert.strictEqual(new URL(window.location.href).searchParams.get('extension_id'), 'ext_1');
+
+        this.panel.close();
+        assert.false(this.panel.isOpen);
+        assert.strictEqual(new URL(window.location.href).searchParams.get('extension_id'), null);
+    });
+
+    test('openById loads the record, and a failure keeps the panel open with the error', async function (assert) {
+        const fetch = this.owner.lookup('service:fetch');
+        fetch.responses['registry-extensions/ext_2'] = { id: 'ext_2', public_id: 'ext_2', name: 'Loconav' };
+
+        const extension = await this.panel.openById('ext_2');
+        assert.strictEqual(extension.name, 'Loconav');
+        assert.strictEqual(this.panel.extension.public_id, 'ext_2');
+
+        fetch.responses['registry-extensions/ext_3'] = new Error('Extension not found.');
+        await this.panel.openById('ext_3');
+        assert.true(this.panel.isOpen);
+        assert.strictEqual(this.panel.error.message, 'Extension not found.');
+    });
+});
diff --git a/tests/unit/services/extension-purchase-test.js b/tests/unit/services/extension-purchase-test.js
new file mode 100644
index 0000000..89124c6
--- /dev/null
+++ b/tests/unit/services/extension-purchase-test.js
@@ -0,0 +1,176 @@
+import { module, test } from 'qunit';
+import { setupTest, CurrentUserStub, ModalsManagerStub, NotificationsStub, StubFetchService } from 'dummy/tests/helpers';
+import Service from '@ember/service';
+import { HANDOFF_STORAGE_KEY, checkoutReturnUrl } from '@fleetbase/registry-bridge-engine/services/extension-purchase';
+
+class UrlSearchParamsStub extends Service {
+    params = {};
+    get(name) {
+        return this.params[name] ?? null;
+    }
+}
+
+class PanelStub extends Service {
+    opened = [];
+    reloads = 0;
+    async openById(id) {
+        this.opened.push(id);
+        return { id, public_id: id, name: 'Acme Route Planner' };
+    }
+    async reload() {
+        this.reloads++;
+        return { id: 'ext_1', public_id: 'ext_1', name: 'Acme Route Planner', is_purchased: true };
+    }
+}
+
+class ContextStub extends Service {
+    countLoads = 0;
+    organizationName = 'Registry Demo Buyer';
+    async load() {}
+    loadCounts() {
+        this.countLoads++;
+    }
+}
+
+// The hand-off as the bridge describes it (ServiceCheckout::describe) for the recorded `complete` response
+const COMPLETED = {
+    status: 'completed',
+    service_status: 'complete',
+    handoff: 'chk_3tampcinhk',
+    extension: { id: 'ext_qo76q0el02', slug: 'acme-route-planner', name: 'Acme Route Planner' },
+    purchase: { id: 'pur_rqcusnwvoh', amount_total: 3190, currency: 'USD', receipt_url: 'https://pay.stripe.com/receipts/payment/bridge_test' },
+    receipt_url: 'https://pay.stripe.com/receipts/payment/bridge_test',
+    amount: 2900,
+    currency: 'USD',
+};
+
+module('Unit | Service | extension-purchase', function (hooks) {
+    setupTest(hooks);
+
+    hooks.beforeEach(function () {
+        this.owner.register('service:modals-manager', ModalsManagerStub);
+        this.owner.register('service:notifications', NotificationsStub);
+        this.owner.register('service:current-user', CurrentUserStub);
+        this.owner.register('service:fetch', StubFetchService);
+        this.owner.register('service:url-search-params', UrlSearchParamsStub);
+        this.owner.register('service:extension-panel', PanelStub);
+        this.owner.register('service:registry-context', ContextStub);
+        this.service = this.owner.lookup('service:extension-purchase');
+        this.service.pollInterval = 1;
+        this.service.schedule = (fn) => setTimeout(fn, 0);
+        this.redirects = [];
+        this.service.redirect = (url) => this.redirects.push(url);
+        this.fetch = this.owner.lookup('service:fetch');
+        this.modals = this.owner.lookup('service:modals-manager');
+        this.params = this.owner.lookup('service:url-search-params').params;
+        window.sessionStorage.removeItem(HANDOFF_STORAGE_KEY);
+    });
+
+    hooks.afterEach(function () {
+        window.sessionStorage.removeItem(HANDOFF_STORAGE_KEY);
+    });
+
+    test('the return URL keeps the page and adds the panel extension and a return marker', function (assert) {
+        const url = new URL(checkoutReturnUrl('https://fleet.example.test/extensions/telematics?pricing=paid&handoff=old&cancelled=1', 'ext_1'));
+
+        assert.strictEqual(url.pathname, '/extensions/telematics');
+        assert.strictEqual(url.searchParams.get('pricing'), 'paid');
+        assert.strictEqual(url.searchParams.get('extension_id'), 'ext_1');
+        assert.strictEqual(url.searchParams.get('purchase_return'), '1');
+        assert.strictEqual(url.searchParams.get('handoff'), null, 'a stale hand-off is dropped');
+        assert.strictEqual(url.searchParams.get('cancelled'), null);
+    });
+
+    test('a purchase starts a hosted checkout with return and cancel URLs and redirects to it', async function (assert) {
+        this.fetch.responses['purchases/checkout'] = { url: 'https://checkout.stripe.com/c/pay/cs_test', handoff: 'chk_1', status: 'open' };
+
+        await this.service.purchase({ id: 'ext_1', public_id: 'ext_1' });
+
+        const { data } = this.fetch.calls[0];
+        assert.strictEqual(this.fetch.calls[0].path, 'purchases/checkout');
+        assert.strictEqual(data.extension, 'ext_1');
+        assert.true(data.return_url.includes('purchase_return=1'));
+        assert.strictEqual(data.cancel_url, data.return_url);
+        assert.deepEqual(this.redirects, ['https://checkout.stripe.com/c/pay/cs_test']);
+        assert.strictEqual(JSON.parse(window.sessionStorage.getItem(HANDOFF_STORAGE_KEY)).handoff, 'chk_1');
+        assert.strictEqual(this.service.lastError, null);
+    });
+
+    test('a refused checkout keeps the service message for the panel and does not redirect', async function (assert) {
+        this.fetch.responses['purchases/checkout'] = new Error('Acme Route Planner cannot be bought right now: its publisher has not finished setting up payouts.');
+
+        const result = await this.service.purchase({ id: 'ext_1', public_id: 'ext_1' });
+
+        assert.strictEqual(result, null);
+        assert.deepEqual(this.redirects, []);
+        assert.deepEqual(this.service.lastError, { extension: 'ext_1', message: 'Acme Route Planner cannot be bought right now: its publisher has not finished setting up payouts.' });
+        assert.false(this.service.isStarting);
+    });
+
+    test('returning from Stripe shows Finalizing and polls the hand-off until it completes', async function (assert) {
+        this.params.extension_id = 'ext_1';
+        this.params.purchase_return = '1';
+        this.params.handoff = 'chk_3tampcinhk';
+        const statuses = [{ status: 'pending', service_status: 'open' }, { status: 'pending', service_status: 'open' }, COMPLETED];
+        this.fetch.responses['purchases/chk_3tampcinhk'] = () => statuses.shift();
+
+        const status = await this.service.resume();
+
+        assert.strictEqual(status, 'completed');
+        assert.strictEqual(this.fetch.calls.filter((call) => call.path === 'purchases/chk_3tampcinhk').length, 3);
+        assert.strictEqual(this.modals.current.component, 'modals/extension-purchase-status');
+        assert.strictEqual(this.modals.options.phase, 'success');
+        assert.strictEqual(this.modals.options.receiptUrl, 'https://pay.stripe.com/receipts/payment/bridge_test');
+        assert.strictEqual(this.modals.options.amount, 3190, 'the amount paid, tax included');
+        assert.true(this.modals.options.extension.is_purchased, 'the panel extension is reloaded');
+        assert.strictEqual(this.owner.lookup('service:registry-context').countLoads, 1, 'the sidebar counts refresh');
+        assert.strictEqual(this.modals.options.organizationName, 'Registry Demo Buyer', 'the licence belongs to the registry organization');
+        assert.strictEqual(this.modals.options.companyName, undefined, 'not the console company');
+    });
+
+    test('the hand-off falls back to session storage when Stripe drops it', async function (assert) {
+        this.params.extension_id = 'ext_1';
+        this.params.purchase_return = '1';
+        window.sessionStorage.setItem(HANDOFF_STORAGE_KEY, JSON.stringify({ handoff: 'chk_stored', extension: 'ext_1' }));
+        this.fetch.responses['purchases/chk_stored'] = COMPLETED;
+
+        assert.strictEqual(await this.service.resume(), 'completed');
+        assert.strictEqual(window.sessionStorage.getItem(HANDOFF_STORAGE_KEY), null);
+    });
+
+    test('an expired hand-off offers Try again', async function (assert) {
+        this.params.purchase_return = '1';
+        this.params.handoff = 'chk_2';
+        this.fetch.responses['purchases/chk_2'] = { status: 'failed', service_status: 'expired' };
+
+        assert.strictEqual(await this.service.resume(), 'failed');
+        assert.strictEqual(this.modals.options.phase, 'failed');
+        assert.strictEqual(this.modals.options.serviceStatus, 'expired');
+        assert.strictEqual(this.modals.options.acceptButtonText, 'Try again');
+    });
+
+    test('a cancelled checkout says so without polling', async function (assert) {
+        this.params.extension_id = 'ext_1';
+        this.params.purchase_return = '1';
+        this.params.handoff = 'chk_4';
+        this.params.cancelled = '1';
+
+        assert.strictEqual(await this.service.resume(), 'cancelled');
+        assert.strictEqual(this.modals.options.phase, 'cancelled');
+        assert.strictEqual(this.fetch.calls.length, 0);
+    });
+
+    test('a webhook that has not landed in time leaves the purchase processing', async function (assert) {
+        this.service.pollTimeout = 5;
+        this.params.handoff = 'chk_3';
+        this.fetch.responses['purchases/chk_3'] = { status: 'pending', service_status: 'open' };
+
+        assert.strictEqual(await this.service.resume(), 'pending');
+        assert.strictEqual(this.modals.options.phase, 'processing');
+    });
+
+    test('nothing to resume without a return marker', async function (assert) {
+        assert.strictEqual(await this.service.resume(), null);
+        assert.strictEqual(this.modals.current, null);
+    });
+});
diff --git a/tests/unit/services/registry-context-test.js b/tests/unit/services/registry-context-test.js
new file mode 100644
index 0000000..fa16f78
--- /dev/null
+++ b/tests/unit/services/registry-context-test.js
@@ -0,0 +1,112 @@
+import { module, test } from 'qunit';
+import { setupTest, StubFetchService } from 'dummy/tests/helpers';
+import { settled } from '@ember/test-helpers';
+
+module('Unit | Service | registry-context', function (hooks) {
+    setupTest(hooks);
+
+    test('loads the context once and exposes the publisher portal and checkout flag', async function (assert) {
+        this.owner.register('service:fetch', StubFetchService);
+        const fetch = this.owner.lookup('service:fetch');
+        fetch.responses['registry-extensions/context'] = {
+            service_url: 'https://registry.example.test',
+            registered: true,
+            publisher_url: 'https://registry.example.test',
+            checkout_available: false,
+            instance_kind: 'cloud',
+            organization: { id: 'org_9sz9sh8ivz', slug: 'registry-demo-buyer', name: 'Registry Demo Buyer' },
+        };
+        const context = this.owner.lookup('service:registry-context');
+
+        await Promise.all([context.load(), context.load()]);
+        await context.load();
+
+        assert.strictEqual(fetch.calls.length, 1);
+        assert.strictEqual(context.publisherUrl, 'https://registry.example.test');
+        assert.true(context.usesService);
+        assert.true(context.registered);
+        assert.false(context.checkoutAvailable);
+        assert.strictEqual(context.instanceKind, 'cloud');
+        assert.strictEqual(context.organizationName, 'Registry Demo Buyer');
+    });
+
+    test('sidebar counts load separately and a failure keeps the last ones', async function (assert) {
+        this.owner.register('service:fetch', StubFetchService);
+        const fetch = this.owner.lookup('service:fetch');
+        fetch.responses['registry-extensions/counts'] = { installed: 7, updates: 2, purchased: 3 };
+        const context = this.owner.lookup('service:registry-context');
+
+        await context.loadCounts();
+        assert.deepEqual([context.countOf('installed'), context.countOf('updates'), context.countOf('purchased'), context.countOf('other')], [7, 2, 3, null]);
+
+        fetch.responses['registry-extensions/counts'] = new Error('offline');
+        await context.loadCounts();
+        assert.strictEqual(context.countOf('installed'), 7);
+    });
+
+    test('the sidebar counts refresh when the tab is visible again and on extensions navigation, at most once per interval', async function (assert) {
+        this.owner.register('service:fetch', StubFetchService);
+        const fetch = this.owner.lookup('service:fetch');
+        fetch.responses['registry-extensions/counts'] = { purchased: 1 };
+        const context = this.owner.lookup('service:registry-context');
+
+        const doc = new EventTarget();
+        doc.visibilityState = 'visible';
+        const listeners = {};
+        const router = {
+            on: (name, fn) => (listeners[name] = fn),
+            off: (name) => delete listeners[name],
+        };
+        const countCalls = () => fetch.calls.filter((call) => call.path === 'registry-extensions/counts').length;
+
+        context.watchCounts(router, { doc, minInterval: 0 });
+        context.watchCounts(router, { doc, minInterval: 0 });
+
+        // The refund lands on the service while the user is elsewhere
+        fetch.responses['registry-extensions/counts'] = { purchased: 0 };
+        doc.dispatchEvent(new Event('visibilitychange'));
+        await Promise.resolve();
+        assert.strictEqual(countCalls(), 1, 'one refresh per event even after watching twice');
+
+        listeners.routeDidChange({ to: { name: 'console.extensions.installed' } });
+        listeners.routeDidChange({ to: { name: 'console.fleet-ops.home' } });
+        doc.visibilityState = 'hidden';
+        doc.dispatchEvent(new Event('visibilitychange'));
+        assert.strictEqual(countCalls(), 2, 'extensions navigation refreshes; other routes and a hidden tab do not');
+
+        await context.loadCounts();
+        assert.strictEqual(context.countOf('purchased'), 0);
+
+        context.destroy();
+        await settled();
+        assert.notOk(listeners.routeDidChange, 'stops watching when destroyed');
+    });
+
+    test('watching respects the minimum interval between refreshes', async function (assert) {
+        this.owner.register('service:fetch', StubFetchService);
+        const fetch = this.owner.lookup('service:fetch');
+        fetch.responses['registry-extensions/counts'] = { purchased: 1 };
+        const context = this.owner.lookup('service:registry-context');
+        const doc = new EventTarget();
+        doc.visibilityState = 'visible';
+
+        await context.loadCounts();
+        context.watchCounts(null, { doc, minInterval: 60000 });
+        doc.dispatchEvent(new Event('visibilitychange'));
+
+        assert.strictEqual(fetch.calls.filter((call) => call.path === 'registry-extensions/counts').length, 1, 'no second request inside the interval');
+    });
+
+    test('a failed load keeps the defaults', async function (assert) {
+        this.owner.register('service:fetch', StubFetchService);
+        this.owner.lookup('service:fetch').response = new Error('offline');
+        const context = this.owner.lookup('service:registry-context');
+
+        await context.load();
+
+        assert.false(context.loaded);
+        assert.strictEqual(context.publisherUrl, null);
+        assert.false(context.usesService);
+        assert.strictEqual(context.organizationName, null);
+    });
+});
diff --git a/tests/unit/services/stripe-test.js b/tests/unit/services/stripe-test.js
deleted file mode 100644
index 703eddb..0000000
--- a/tests/unit/services/stripe-test.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import { module, test } from 'qunit';
-import { setupTest } from 'dummy/tests/helpers';
-
-module('Unit | Service | stripe', function (hooks) {
-    setupTest(hooks);
-
-    // TODO: Replace this with your real tests.
-    test('it exists', function (assert) {
-        let service = this.owner.lookup('service:stripe');
-        assert.ok(service);
-    });
-});
diff --git a/tests/unit/utils/extension-state-test.js b/tests/unit/utils/extension-state-test.js
new file mode 100644
index 0000000..3c76f03
--- /dev/null
+++ b/tests/unit/utils/extension-state-test.js
@@ -0,0 +1,114 @@
+import { module, test } from 'qunit';
+import { CARD_STATES, CTA, PERMISSIONS, cardModel, cardState, detailCta, priceOf, unavailableReason } from '@fleetbase/registry-bridge-engine/utils/extension-state';
+
+const listing = (attrs = {}, meta = {}) => ({ source: 'registry-service', is_installable: true, ...attrs, meta: { source: 'registry-service', ...meta } });
+const cloudOnly = (attrs = {}) =>
+    listing({ is_installable: false, ...attrs }, { hosting: 'cloud', install_blocked_code: 'hosting', install_blocked_reason: 'This extension is only available on Fleetbase Cloud.' });
+
+module('Unit | Utility | extension-state', function () {
+    test('every card state is reachable from the record fields', function (assert) {
+        const records = {
+            free: listing({ payment_required: false }),
+            paid: listing({ payment_required: true, price: 14900 }),
+            'on-sale': listing({ payment_required: true, price: 9900, sale_price: 7900, on_sale: true }),
+            installed: listing({ is_installed: true }),
+            update: listing({ is_installed: true, update_available: true, installed_version: '1.8.0', latest_version: '2.0.0' }),
+            purchased: listing({ payment_required: true, price: 5900, is_purchased: true }),
+            unavailable: cloudOnly(),
+        };
+
+        assert.deepEqual(Object.keys(records).sort(), [...CARD_STATES].sort());
+        for (const [state, record] of Object.entries(records)) {
+            assert.strictEqual(cardState(record), state, state);
+        }
+    });
+
+    test('a sale price only counts when it is lower than the list price', function (assert) {
+        assert.deepEqual(priceOf({ payment_required: true, price: 9900, sale_price: 7900, on_sale: true, currency: 'EUR' }), { free: false, amount: 7900, original: 9900, currency: 'EUR' });
+        assert.strictEqual(priceOf({ payment_required: true, price: 9900, sale_price: 12000, on_sale: true }).original, null);
+        assert.strictEqual(cardState({ payment_required: true, price: 9900, sale_price: 9900, on_sale: true }), 'paid');
+        assert.true(priceOf({ payment_required: false, price: 9900 }).free);
+    });
+
+    test('a listing this instance cannot run says why, on the card and its badge', function (assert) {
+        const model = cardModel(cloudOnly({ payment_required: true, price: 1900 }));
+
+        assert.strictEqual(model.state, 'unavailable');
+        assert.strictEqual(model.unavailableReason, 'This extension is only available on Fleetbase Cloud.');
+        assert.deepEqual(model.badges[0], {
+            label: { key: 'registry-bridge.card.unavailable', params: {} },
+            status: 'warning',
+            help: 'This extension is only available on Fleetbase Cloud.',
+        });
+        assert.true(
+            model.badges.some((badge) => badge.label.key === 'registry-bridge.card.cloud-only'),
+            'the hosting badge stays'
+        );
+        assert.strictEqual(model.action.kind, 'details', 'the details still open');
+        assert.strictEqual(unavailableReason(cloudOnly({ is_installed: true })), null, 'an installed extension is never unavailable');
+        assert.strictEqual(unavailableReason(listing({}, { install_blocked_code: 'not_registered', install_blocked_reason: 'Register.' })), null, 'registration is a page-level message');
+        assert.strictEqual(cardState(listing({ is_installable: false }, { install_blocked_code: 'no_release', install_blocked_reason: 'No release.' })), 'unavailable');
+    });
+
+    test('card models carry the price badge, state badges and the footer action', function (assert) {
+        const update = cardModel(listing({ is_installed: true, update_available: true, installed_version: '1.8.0', latest_version: '2.0.0' }));
+        assert.deepEqual(
+            update.badges.map((badge) => badge.label.key),
+            ['registry-bridge.card.update', 'registry-bridge.card.installed-version']
+        );
+        assert.deepEqual(update.action, { kind: 'update', label: { key: 'registry-bridge.card.update-to', params: { version: '2.0.0' } }, type: 'primary', permission: PERMISSIONS.install });
+
+        const purchased = cardModel(listing({ payment_required: true, price: 5900, is_purchased: true }));
+        assert.strictEqual(purchased.priceBadge.label.key, 'registry-bridge.card.purchased');
+        assert.strictEqual(purchased.action.kind, 'install');
+        assert.strictEqual(
+            cardModel(listing({ payment_required: true, price: 5900, is_purchased: true, is_installable: false })).action.kind,
+            'details',
+            'a purchased but blocked listing opens the details'
+        );
+
+        const onSale = cardModel(listing({ payment_required: true, price: 9900, sale_price: 7900, on_sale: true }));
+        assert.deepEqual([onSale.priceBadge.amount, onSale.priceBadge.original], [7900, 9900]);
+        assert.true(cardModel(listing({ is_installed: true })).action.disabled);
+        assert.strictEqual(cardModel(listing()).action.kind, 'details');
+    });
+
+    test('trust and hosting badges follow the listing meta', function (assert) {
+        const model = cardModel(listing({}, { hosting: 'self_hosted', publisher: { is_verified: true } }));
+        assert.deepEqual(
+            model.badges.map((badge) => badge.label.key),
+            ['registry-bridge.card.verified', 'registry-bridge.card.self-hosted-only']
+        );
+    });
+
+    test('the detail CTA matrix', function (assert) {
+        assert.deepEqual(detailCta(listing({ latest_version: '1.2.0' })), { kind: CTA.INSTALL, version: '1.2.0' });
+        assert.deepEqual(detailCta(listing(), { canInstall: false }), { kind: CTA.UNAUTHORIZED, permission: PERMISSIONS.install });
+        assert.deepEqual(detailCta(listing({ is_installed: true, installed_version: '1.0.0' })), { kind: CTA.INSTALLED, version: '1.0.0' });
+        assert.deepEqual(detailCta(listing({ is_installed: true, update_available: true, installed_version: '1.0.0', latest_version: '1.1.0' })), {
+            kind: CTA.UPDATE,
+            version: '1.1.0',
+            installedVersion: '1.0.0',
+        });
+        assert.strictEqual(detailCta(listing({ is_installed: true, update_available: true }), { canInstall: false }).kind, CTA.UNAUTHORIZED);
+        assert.deepEqual(detailCta(listing({ is_author: true, is_installed: true })), { kind: CTA.AUTHOR });
+
+        const notRegistered = listing({ is_installable: false }, { install_blocked_code: 'not_registered', install_blocked_reason: 'Register this instance.' });
+        assert.deepEqual(detailCta(notRegistered), { kind: CTA.REGISTRATION, reason: 'Register this instance.', code: 'not_registered' });
+        assert.deepEqual(detailCta(cloudOnly()), { kind: CTA.BLOCKED, reason: 'This extension is only available on Fleetbase Cloud.', code: 'hosting' });
+    });
+
+    test('a paid listing is bought once the service offers checkout, with the purchase permission', function (assert) {
+        const meta = { install_blocked_code: 'licence_required', install_blocked_reason: 'Purchasing through the registry service is not available yet.' };
+        const paid = listing({ payment_required: true, price: 4900, is_installable: false }, meta);
+
+        assert.deepEqual(detailCta(paid), { kind: CTA.BLOCKED, reason: meta.install_blocked_reason, code: 'licence_required' }, 'blocked with the service reason');
+        assert.deepEqual(detailCta(listing({ payment_required: true, price: 4900, is_installable: false }, { ...meta, purchase_available: true })), { kind: CTA.PURCHASE });
+        assert.deepEqual(detailCta(listing({ payment_required: true, price: 4900, is_installable: false }, { ...meta, purchase_available: true }), { canPurchase: false }), {
+            kind: CTA.UNAUTHORIZED,
+            permission: PERMISSIONS.purchase,
+        });
+        assert.strictEqual(detailCta(listing({ payment_required: true, price: 4900, is_purchased: true, latest_version: '1.0.0' })).kind, CTA.INSTALL, 'a purchased listing installs');
+        assert.strictEqual(detailCta(cloudOnly({ payment_required: true, price: 1900 })).kind, CTA.BLOCKED, 'another hosting cannot be bought here');
+    });
+});
diff --git a/tests/unit/utils/installer-job-test.js b/tests/unit/utils/installer-job-test.js
index 3602853..d14b323 100644
--- a/tests/unit/utils/installer-job-test.js
+++ b/tests/unit/utils/installer-job-test.js
@@ -1,5 +1,12 @@
 import { module, test } from 'qunit';
-import InstallerJobTracker, { installerChannel, describeInstallerJob, describeInstallerFailure, runInstallerJob, countdown } from '@fleetbase/registry-bridge-engine/utils/installer-job';
+import InstallerJobTracker, {
+    installerChannel,
+    installerStepGroups,
+    describeInstallerJob,
+    describeInstallerFailure,
+    runInstallerJob,
+    countdown,
+} from '@fleetbase/registry-bridge-engine/utils/installer-job';
 
 /**
  * The tracker and the modal runner take their services and timers as
@@ -316,4 +323,92 @@ module('Unit | Utility | installer-job', function () {
         assert.deepEqual(ctx.modal.loading, ['start', 'stop']);
         assert.strictEqual(ctx.polls, 0);
     });
+
+    test('installer steps group into the three named steps of the modal', function (assert) {
+        const statuses = (action, job) => installerStepGroups(action, job).map((group) => `${group.key}:${group.status}`);
+
+        assert.deepEqual(statuses('install', {}), ['server:pending', 'engine:pending', 'build:pending']);
+        assert.deepEqual(statuses('install', { status: 'queued' }), ['server:pending', 'engine:pending', 'build:pending']);
+        assert.deepEqual(statuses('install', { status: 'running' }), ['server:active', 'engine:pending', 'build:pending'], 'a started job is on the first step');
+        assert.deepEqual(statuses('install', { status: 'running', step: 'release.download' }), ['server:active', 'engine:pending', 'build:pending']);
+        assert.deepEqual(statuses('update', { status: 'running', step: 'engine.install' }), ['server:done', 'engine:active', 'build:pending']);
+        assert.deepEqual(statuses('install', { status: 'running', step: 'cache.clear' }), ['server:done', 'engine:done', 'build:active']);
+        assert.deepEqual(statuses('uninstall', { status: 'running', step: 'engine.uninstall' }), ['server:done', 'engine:active', 'build:pending']);
+        assert.deepEqual(statuses('install', { status: 'completed' }), ['server:done', 'engine:done', 'build:done']);
+        assert.deepEqual(statuses('install', { status: 'failed', step: 'engine.install' }), ['server:done', 'engine:failed', 'build:pending']);
+        assert.deepEqual(
+            statuses('install', { status: 'failed', step: 'rollback', result: { step: 'console.build' } }),
+            ['server:done', 'engine:done', 'build:failed'],
+            'a rollback reports the step that failed'
+        );
+    });
+
+    test('runInstallerJob moves the modal through progress and success with named steps and a cancellable reload', async function (assert) {
+        const ctx = setup();
+        let reloaded = false;
+
+        const running = runInstallerJob({
+            ...ctx,
+            action: 'update',
+            channel: 'install.c1.e1',
+            request: async () => ({ status: 'queued', job: { id: 'j1', status: 'queued', position: 0 } }),
+            reload: () => (reloaded = true),
+            reloadAfter: 2,
+        });
+        await settle();
+        assert.strictEqual(ctx.modal.options.phase, 'progress');
+
+        ctx.emit({ job: 'j1', step: 'engine.install', progress: 50, status: 'running' });
+        assert.deepEqual(
+            ctx.modal.options.steps.map((group) => group.status),
+            ['done', 'active', 'pending']
+        );
+
+        ctx.records = [{ id: 'j1', status: 'completed' }];
+        ctx.emit({ job: 'j1', status: 'completed' });
+        await running;
+
+        assert.strictEqual(ctx.modal.options.phase, 'success');
+        assert.strictEqual(ctx.modal.options.secondsLeft, 2);
+        assert.deepEqual(
+            ctx.modal.options.steps.map((group) => group.status),
+            ['done', 'done', 'done']
+        );
+
+        ctx.modal.options.cancelReload();
+        await ctx.fireTimers();
+        await ctx.fireTimers();
+        assert.false(reloaded, 'Wait, stay here stops the reload');
+        assert.true(ctx.modal.options.reloadCancelled);
+        assert.deepEqual(ctx.modal.loading, ['start', 'stop']);
+    });
+
+    test('runInstallerJob reports the failed step on the failure phase', async function (assert) {
+        const ctx = setup();
+        ctx.records = [{ id: 'j1', status: 'failed', step: 'engine.install', message: 'npm install exited with code 1', result: { step: 'engine.install' } }];
+
+        const job = await runInstallerJob({
+            ...ctx,
+            channel: 'install.c1.e1',
+            request: async () => ({ job: { id: 'j1', status: 'failed', step: 'engine.install', message: 'npm install exited with code 1' } }),
+        });
+
+        assert.strictEqual(job.status, 'failed');
+        assert.strictEqual(ctx.modal.options.phase, 'failure');
+        assert.deepEqual(
+            ctx.modal.options.steps.map((group) => group.status),
+            ['done', 'failed', 'pending']
+        );
+        assert.strictEqual(ctx.modal.options.installerError.message, 'npm install exited with code 1');
+    });
+
+    test('a refused request returns the modal to its confirm phase', async function (assert) {
+        const ctx = setup();
+        try {
+            await runInstallerJob({ ...ctx, channel: 'install.c1.e1', request: async () => Promise.reject(new Error('refused')) });
+        } catch {
+            // expected
+        }
+        assert.strictEqual(ctx.modal.options.phase, 'confirm');
+    });
 });
diff --git a/translations/ar-ae.yml b/translations/ar-ae.yml
index 5b74ea5..b55e9fc 100644
--- a/translations/ar-ae.yml
+++ b/translations/ar-ae.yml
@@ -3,133 +3,358 @@ registry-bridge:
   common:
     install: تثبيت
     uninstall: إلغاء التثبيت
-    approve: الموافقة
-    reject: الرفض
-    details: التفاصيل
     about: حول
-    about-extension: حول {extensionName}
-  component:
-    extension-details-modal:
-      extension: الامتداد
-      author: المؤلف
-      description: الوصف
+    retry: إعادة المحاولة
+    close: إغلاق
+    cancel: إلغاء
+    this-organization: هذه المؤسسة
+  installer:
+    starting: جارٍ البدء…
+    queued-next: في قائمة الانتظار، التالي في الدور…
+    queued-behind: "في قائمة الانتظار خلف {count, plural, zero {# مهمة} one {مهمة واحدة} two {مهمتين} few {# مهام} many {# مهمة} other {# مهمة}}…"
+    completed: تم.
+    failed: فشلت المهمة.
+    failed-at: "فشل أثناء: {step}"
+    rolled-back: تم التراجع عن جميع التغييرات؛ عاد المثيل كما كان من قبل.
+    rebuild-required: أُعيد بناء وحدة التحكم أثناء المهمة؛ أعد بناءها مرة أخرى لإزالة الإضافة منها.
+    show-log: عرض السجل
+    retry: إعادة المحاولة
+    reloading: "تم. إعادة تحميل وحدة التحكم خلال {seconds} ث…"
+    installed: "تم تثبيت {extensionName}."
+    uninstalled: "تم إلغاء تثبيت {extensionName}."
+    updated: "تم تحديث {extensionName}."
+    steps:
+      resolve: جارٍ تحديد الإصدار…
+      download: جارٍ تنزيل الإصدار والتحقق منه…
+      snapshot: جارٍ حفظ نقطة استعادة…
+      server-install: جارٍ تثبيت حزمة الخادم…
+      server-uninstall: جارٍ إزالة حزمة الخادم…
+      engine-install: جارٍ تثبيت محرك وحدة التحكم…
+      engine-uninstall: جارٍ إزالة محرك وحدة التحكم…
+      console-build: جارٍ إعادة بناء وحدة التحكم (قد يستغرق ذلك بعض الوقت)…
+      cache-clear: جارٍ مسح ذاكرة التخزين المؤقت…
+      record: جارٍ الإنهاء…
+      rollback: جارٍ التراجع عن التغييرات…
+  sidebar:
+    installed: المثبتة
+    purchased: المشتراة
+    explore: استكشاف
+    explore-all: استكشاف الكل
+    developers: المطورون
+    publisher-portal: بوابة الناشرين
+  explore:
+    title: استكشاف الإضافات
+    count: "{count, plural, zero {لا توجد إضافات} one {إضافة واحدة} two {إضافتان} few {# إضافات} many {# إضافة} other {# إضافة}}"
+    search-placeholder: ابحث في الإضافات والوسوم والناشرين
+    category-title: "{categoryName}"
+    loading: جارٍ تحميل الإضافات
+    this-registry: سجل الإضافات
+    filters:
+      category: الفئة
+      pricing: التسعير
+      hosting: الاستضافة
+      hide-installed: إخفاء المثبتة
+      sort: الترتيب
+      active: عوامل التصفية النشطة
+      remove: "إزالة عامل التصفية {filter}"
+    sort:
+      popular: الأكثر تثبيتاً
+      newest: الأحدث
+      updated: المحدّثة مؤخراً
+      name: الاسم
+    pricing:
+      free: مجانية
+      paid: مدفوعة
+    hosting:
+      self_hosted: استضافة ذاتية
+      cloud: Fleetbase Cloud
+      both: السحابة والاستضافة الذاتية
+    layout:
+      label: طريقة العرض
+      grid: شبكة
+      table: جدول
+    columns:
+      extension: الإضافة
+      category: الفئة
+      publisher: الناشر
+      status: السعر والحالة
+      updated: آخر تحديث
+    empty:
+      title: لم تُنشر أي إضافات في هذا السجل بعد
+      body: "وحدة التحكم هذه متصلة بـ {host}. تظهر الإضافات هنا بعد أن يرسلها ناشر ويوافق عليها فريق السجل."
+      check-config: التحقق من إعدادات السجل
+      publish: نشر إضافة
+    no-results:
+      title: "لا توجد إضافات تطابق “{query}”"
+      filtered-title: لا توجد إضافات تطابق عوامل التصفية هذه
+      body: جرّب مصطلحاً أعم، أو أزل عامل تصفية، أو تصفّح حسب الفئة. يشمل البحث الأسماء والعناوين الفرعية والوسوم والناشرين.
+      clear: مسح البحث وعوامل التصفية
+    error:
+      title: لم يستجب السجل
+      body: "تعذّر الوصول إلى {host} أو رفض الطلب. حاول مرة أخرى بعد قليل؛ وإذا استمر الفشل، يمكن للمسؤول مراجعة الإدارة ← إعدادات السجل."
+    registration:
+      body: هذا المثيل غير مسجّل في خدمة السجل بعد، لذا يمكن تصفّح الإضافات دون تثبيتها أو شرائها.
+      action: تسجيل هذا المثيل
+      ask-admin: اطلب من المسؤول تسجيله من الإدارة ← إعدادات السجل.
+  card:
+    free: مجانية
+    purchased: مشتراة
+    on-sale: عرض خاص
+    installed: مثبتة
+    installed-version: "مثبت الإصدار v{version}"
+    update: "تحديث v{version}"
+    update-to: "التحديث إلى v{version}"
+    ready-to-install: جاهزة للتثبيت
+    self-hosted-only: للاستضافة الذاتية فقط
+    cloud-only: للسحابة فقط
+    verified: ناشر موثّق
+    view-details: عرض التفاصيل
+    install: تثبيت
+    no-description: لا يوجد وصف بعد.
+    unavailable: غير متاحة هنا
+  detail:
+    tabs:
       overview: نظرة عامة
+      screenshots: لقطات الشاشة
       details: التفاصيل
+      versions: الإصدارات
+    publisher: الناشر
+    category: الفئة
+    updated: "حُدّثت {date}"
+    verified-help: تحققت Fleetbase من هوية الناشر وحساب الدفع الخاص به.
+    compat: "متوافقة مع وحدة تحكم Fleetbase {console} و core-api {api}"
+    installs: عمليات التثبيت
+    last-release: آخر إصدار
+    support: الدعم
+    pricing-one-time: "{price} لمرة واحدة · {currency}"
+    error:
+      title: تعذّر تحميل هذه الإضافة
+    cta:
+      install: تثبيت
+      install-note: "يثبّت الإضافة دون إعادة بناء وحدة التحكم (حوالي {minutes} دقائق). تُعاد تحميل وحدة التحكم عند الانتهاء."
+      install-note-rebuild: "يثبّت الإضافة ويعيد بناء وحدة التحكم، وقد يستغرق ذلك من 15 إلى 40 دقيقة أو أكثر. تُعاد تحميل وحدة التحكم عند الانتهاء."
+      purchase: "شراء مقابل {price}"
+      purchase-note: دفعة واحدة عبر Stripe، ثم التثبيت. رسوم الوساطة مشمولة في السعر.
+      installed: "مثبتة {version}"
+      update-note: "مثبت الإصدار v{installedVersion}. يؤدي التحديث إلى إعادة بناء وحدة التحكم."
+      unauthorized: تحتاج إلى صلاحية
+      unauthorized-note: "تحتاج إلى “{permission}”. اطلب ذلك من مسؤول المؤسسة."
+      author: أنت ناشر هذه الإضافة. أدِر القائمة والإصدارات والتسعير من بوابة الناشرين.
+      open-portal: فتح في بوابة الناشرين
+      register: تسجيل هذا المثيل
+      register-note: تتم عمليات التثبيت عبر خدمة السجل. سجّل هذا المثيل مرة واحدة من الإدارة ← إعدادات السجل.
+      register-ask-admin: تتم عمليات التثبيت عبر خدمة السجل. اطلب من المسؤول تسجيل هذا المثيل من الإدارة ← إعدادات السجل.
+      unavailable: غير متاحة
+      not-available: لا يمكن تثبيت هذه الإضافة على هذا المثيل بعد.
+    screenshots:
+      previous: لقطة الشاشة السابقة
+      next: لقطة الشاشة التالية
+      show: "عرض لقطة الشاشة {number}"
+      empty: لا توجد لقطات شاشة بعد
+    hosting:
+      both: السحابة والاستضافة الذاتية
+      cloud: Fleetbase Cloud فقط
+      self-hosted: الاستضافة الذاتية فقط
+    fields:
       version: الإصدار
-      updated: تم التحديث
+      installed-version: المثبت
+      updated: آخر تحديث
+      publisher: الناشر
+      packages: الحزم
       website: الموقع الإلكتروني
-      self-managed: مُدار ذاتيًا
-      self-managed-help-text: الامتداد المُدار ذاتيًا مصمم للمستخدمين الذين يستضيفون Fleetbase على خوادمهم الخاصة، خارج بيئة السحابة/SaaS. تتطلب هذه الامتدادات التثبيت والتكوين اليدوي. إذا كنت تستخدم Fleetbase كنسخة مستضافة ذاتيًا، يمكنك استخدام هذه الامتدادات لإضافة ميزات إضافية. ومع ذلك، فهي غير متاحة لمستخدمي السحابة/SaaS.
-    extension-pending-publish-viewer:
-      content-panel-title: الامتدادات المعلقة للنشر
-      focused-extension-title: >
-        تفاصيل {extensionName}
-      download-bundle: تحميل الحزمة
-      view-details: عرض التفاصيل
-      no-extensions-awaiting-publish: لا توجد امتدادات تنتظر النشر
-    extension-reviewer-control:
-      content-panel-title: الامتدادات التي تنتظر المراجعة
-      focused-extension-title: >
-        تفاصيل {extensionName}
-      approve-confirm-title: هل أنت متأكد أنك تريد الموافقة على هذا الامتداد؟
-      approve-confirm-body: يجب اختبار هذا الامتداد بدقة في بيئة التطوير والاختبار واختباره من حيث الامتثال وكذلك قضايا الأمان. بمجرد الموافقة، سيتعين نشر الامتداد يدويًا في السجل.
-      decline-confirm-title: هل أنت متأكد أنك تريد رفض هذا الامتداد؟
-      decline-confirm-body: سيتم رفض هذا الامتداد، ولكن سيتم منح المؤلف فرصة لإجراء التصحيحات وإعادة التقديم للمراجعة.
-      download-bundle: تحميل الحزمة
-      view-details: عرض التفاصيل
-      approve: الموافقة
-      reject: الرفض
-      no-extensions-awaiting-review: لا توجد امتدادات تنتظر المراجعة
+      repository: المستودع
+      support: الدعم
+      privacy: سياسة الخصوصية
+      terms: الشروط
+      languages: اللغات
+      copyright: حقوق النشر
+      hosting: الاستضافة
+      pricing: التسعير
+    versions:
+      columns:
+        version: الإصدار
+        channel: القناة
+        date: التاريخ
+        size: الحجم
+        notes: الملاحظات
+      install: تثبيت هذا الإصدار
+      switch: التبديل إلى هذا الإصدار
+      latest: الأحدث
+      yanked: مسحوب
+      error: تعذّر تحميل سجل الإصدارات.
+      unsupported: سجل الإصدارات متاح للإضافات من خدمة السجل. هذه القائمة تعرض إصدارها الحالي فقط.
+      empty: لا توجد إصدارات منشورة بعد
+  install:
+    confirm:
+      title: "تثبيت {name} {version}؟"
+      body: "يثبّت هذا حزمة الخادم ومحرك وحدة التحكم لـ {company}، ثم يعيد تحميل وحدة التحكم. سيرى المستخدمون الآخرون الإضافة الجديدة بعد تحميل الصفحة التالي."
+      time: "يستغرق عادةً حوالي {minutes} دقائق. لا يتأثر العمل غير المحفوظ في علامات التبويب الأخرى؛ ستُعاد تحميل علامة التبويب هذه."
+      time-rebuild: "تحتاج هذه الإضافة إلى إعادة بناء وحدة التحكم، وقد يستغرق ذلك من 15 إلى 40 دقيقة أو أكثر على خادم صغير. لا يتأثر العمل غير المحفوظ في علامات التبويب الأخرى؛ ستُعاد تحميل علامة التبويب هذه."
+      accept: التثبيت الآن
+    steps:
+      label: خطوات التثبيت
+      server: تثبيت حزمة الخادم
+      engine: تثبيت محرك وحدة التحكم
+      build: إعادة بناء وحدة التحكم وتحميلها
+    progress:
+      title: "جارٍ تثبيت {name}…"
+      button: جارٍ التثبيت…
+      keep-open: أبقِ علامة التبويب هذه مفتوحة. يمكنك مواصلة العمل في علامات تبويب أخرى؛ يُبث التقدم من الخادم، لذا لن تؤدي إعادة تحميل هذه الصفحة إلى إلغاء التثبيت.
+    success:
+      badge: مثبتة
+      title: "تم تثبيت {name} {version}"
+      reload-in: "إعادة تحميل وحدة التحكم خلال {seconds} ث لإظهار القسم الجديد."
+      reload-cancelled: لم تُعد تحميل وحدة التحكم. أعد تحميلها لرؤية التغيير.
+      reload-now: إعادة التحميل الآن
+      stay: انتظر، ابقَ هنا
+    failed:
+      badge: فشل
+      title: "تعذّر تثبيت {name}"
+      retry: إعادة محاولة التثبيت
+      cli: "أو ثبّتها من الخادم باستخدام سطر الأوامر:"
+  update:
+    confirm:
+      title: "تحديث {name} إلى {version}؟"
+      body: "يحدّث هذا حزمة الخادم ومحرك وحدة التحكم لـ {company} من الإصدار v{installedVersion}، ثم يعيد تحميل وحدة التحكم."
+      accept: التحديث الآن
+  uninstall:
+    confirm:
+      title: "إلغاء تثبيت {name}؟"
+      destructive: إجراء لا رجعة فيه.
+      body: "يزيل هذا الإضافة ويحذف إعداداتها وبياناتها نهائياً لـ {company}. يمكنك إعادة التثبيت لاحقاً، لكن لن يُستعاد شيء."
+      type-to-confirm: "اكتب {name} للتأكيد"
+      time: "يؤدي إلغاء التثبيت إلى إعادة تحميل وحدة التحكم (حوالي {minutes} دقيقة)."
+      time-rebuild: "يؤدي إلغاء التثبيت أيضاً إلى إعادة بناء وحدة التحكم، وقد يستغرق ذلك من 15 إلى 40 دقيقة أو أكثر، ثم إعادة تحميلها."
+      accept: إلغاء التثبيت
+    steps:
+      server: إزالة حزمة الخادم
+      engine: إزالة محرك وحدة التحكم
+      build: إعادة بناء وحدة التحكم وتحميلها
+    progress:
+      title: "جارٍ إلغاء تثبيت {name}…"
+      button: جارٍ إلغاء التثبيت…
+    success:
+      title: "تم إلغاء تثبيت {name}"
+    failed:
+      title: "تعذّر إلغاء تثبيت {name}"
+      retry: إعادة محاولة إلغاء التثبيت
+  purchase:
+    title: "شراء {name}"
+    your-organization: مؤسستك في السجل
+    finalizing:
+      title: جارٍ إتمام الشراء…
+      body: "جارٍ تأكيد الدفع مع Stripe وتسجيل الترخيص لـ {organization}. لا تغلق علامة التبويب هذه."
+    success:
+      badge: مدفوعة
+      title: "{name} أصبحت لك"
+      body: "الترخيص مملوك لـ {organization} التي سُجّل لديها هذا المثيل، ويظهر ضمن المشتراة."
+      receipt: إيصال Stripe
+      install-now: التثبيت الآن
+      later: لاحقاً
+      paid: "تم دفع {amount} شاملاً الضريبة."
+    failed:
+      badge: لم يكتمل
+      title: لم يتم الدفع
+      body: "أفاد Stripe بأن جلسة الدفع {status}. لم يتم تحصيل أي مبلغ ولم يُمنح أي ترخيص."
+      unknown-status: لم تكتمل
+      try-again: حاول مرة أخرى
+    processing:
+      title: لا يزال الدفع قيد التأكيد
+      body: لم يؤكد Stripe الدفع بعد. سيظهر الترخيص ضمن المشتراة فور تأكيده؛ يمكنك إغلاق هذه النافذة.
+    cancelled:
+      badge: أُلغي
+      title: أُلغيت عملية الدفع
+      body: غادرت صفحة الدفع في Stripe قبل الدفع. لم يتم تحصيل أي مبلغ ولم يُمنح أي ترخيص.
   installed:
-    title: الامتدادات المثبتة
+    title: الإضافات المثبتة
+    actions: الإجراءات
+    update: تحديث
+    updates-available: "{count, plural, zero {لا توجد تحديثات} one {تحديث واحد متاح} two {تحديثان متاحان} few {# تحديثات متاحة} many {# تحديثاً متاحاً} other {# تحديث متاح}}"
+    error: تعذّر تحميل الإضافات المثبتة.
+    columns:
+      extension: الإضافة
+      category: الفئة
+      installed: المثبت
+      latest: الأحدث
+      status: الحالة
+    status:
+      up-to-date: محدّثة
+      update-available: يتوفر تحديث
+      core: خدمة أساسية
+    empty:
+      title: لم يُثبّت شيء بعد
+      body: تضيف الإضافات ميزات التتبع والتوجيه والمستودعات والعملاء إلى وحدة التحكم هذه. ثبّت واحدة من الاستكشاف؛ تستغرق معظم عمليات التثبيت حوالي دقيقتين، أما الإضافة التي لا تتضمن محركاً مُعدّاً مسبقاً فتعيد بناء وحدة التحكم وتستغرق وقتاً أطول بكثير.
+      filtered: لا توجد إضافات مثبتة تطابق هذا البحث
+      explore: استكشاف الإضافات
+      purchased: عرض المشتراة
   purchased:
-    title: الامتدادات المشتراة
-  developers:
-    extensions:
-      extensions: الامتدادات
-      create-new-extension: إنشاء امتداد جديد
-      new-extension: امتداد جديد
-      extension: الامتداد
-      submission: التقديم
-      details: التفاصيل
-      bundles: الحزم
-      monetize: تحقيق الدخل
-      explore:
-        explore-extensions: استكشاف الامتدادات
-        explore-category-extensions: >
-          امتدادات {categoryName}
-        no-extensions-published: لم يتم نشر أي امتدادات في هذا السجل بعد
-        no-extensions-published-help: بمجرد نشر امتدادات في السجل المتصل بهذه اللوحة، ستظهر هنا.
-        open-registry-config: فتح إعدادات السجل
-      extension-form:
-        package-name: اسم الحزمة
-        package-json-name: اسم package.json
-        composer-json-name: اسم composer.json
-        submission-success-message: تم تقديم الامتداد وهو في انتظار المراجعة.
-        extension-category: الفئة
-        extension-category-help-text: اختر الفئة التي سيتمكن المستخدمون من العثور على الامتداد فيها.
-        extension-select-category: اختر الفئة
-        extension-name: اسم الامتداد
-        extension-icon: أيقونة الامتداد
-        upload-extension-icon: تحميل الأيقونة
-        extension-description: الوصف
-        extension-tags: العلامات
-        extension-add-tags: إضافة الكلمات الرئيسية والعلامات
-        extension-promotional-text: النص الترويجي
-        details-content-block: تفاصيل الامتداد
-        extension-listing-details: تفاصيل الإدراج
-        extension-subtitle: العنوان الفرعي
-        extension-website-url: عنوان الموقع الإلكتروني
-        extension-repo-url: عنوان المستودع
-        extension-support-url: عنوان الدعم
-        extension-privacy-policy-url: عنوان سياسة الخصوصية
-        extension-tos-url: عنوان شروط الخدمة
-        extension-primary-language: اللغة الأساسية
-        extension-version: الإصدار
-        extension-copyright: حقوق النشر
-        extension-copyright-help-text: أدخل إشعار حقوق النشر للامتداد الخاص بك. يتضمن هذا عادةً السنة واسم مالك حقوق النشر أو الشركة.
-        extension-payment-required: يتطلب الدفع
-        extension-payment-required-help-text: يحدد ما إذا كان الدفع أو الاشتراك مطلوبًا للمستخدمين لتثبيت هذا الامتداد.
-        extension-price: السعر
-        extension-price-help-text: حدد السعر العادي للامتداد. هذا هو التكلفة القياسية للمستخدمين لشراء أو الوصول إلى الامتداد.
-        extension-sale-price: سعر البيع
-        extension-sale-price-help-text: إذا كان الامتداد معروضًا حاليًا بسعر مخفض، أدخل سعر البيع هنا. يجب أن يكون أقل من السعر العادي.
-        extension-subscription-required: يتطلب الاشتراك
-        extension-subscription-required-help-text: يحدد ما إذا كان يجب على المستخدم أن يكون لديه اشتراك لتثبيت واستخدام هذا الامتداد.
-        extension-subscription-billing-period: فترة الفوترة للاشتراك
-        extension-subscription-billing-period-placeholder: اختر فترة الفوترة
-        extension-subscription-billing-period-help-text: حدد فترة الفوترة للاشتراك. تشمل الأمثلة شهريًا، ربع سنويًا، سنويًا، أو فترات مخصصة أخرى.
-        extension-subscription-amount: مبلغ الاشتراك
-        extension-subscription-amount-help-text: أدخل المبلغ القياسي الذي سيتم تحصيله للاشتراك. يجب أن يعكس هذا السعر العادي قبل أي خصومات أو تعديلات في التسعير المتدرج.
-        extension-subscription-model: نموذج الاشتراك
-        extension-subscription-model-help-text: يحدد نوع نموذج تسعير الاشتراك الذي يجب اتباعه. تشمل الخيارات السعر الثابت، المتدرج، والاشتراك القائم على الاستخدام.
-        extension-subscription-tiers: مستويات الاشتراك
-        extension-subscription-tiers-help-text: حدد مستويات التسعير المختلفة للاشتراك، إذا كان ذلك ممكنًا. قم بتضمين تفاصيل مثل مستويات الاشتراك، التسعير لكل مستوى، وأي ميزات أو قيود محددة لكل مستوى.
-        extension-name-help-text: أدخل الاسم الرسمي للامتداد. سيتم عرض هذا كالمعرف الأساسي للمستخدمين.
-        extension-icon-help-text: قم بتحميل أيقونة تمثل الامتداد. سيتم استخدام هذه الأيقونة في القوائم ونتائج البحث.
-        extension-description-help-text: قدم وصفًا تفصيليًا لما يفعله الامتداد وميزاته الرئيسية. تساعد هذه المعلومات المستخدمين على فهم وظيفة الامتداد.
-        extension-tags-help-text: أضف الكلمات الرئيسية والعلامات ذات الصلة التي تصف الامتداد، مما يساعد المستخدمين في العثور عليه من خلال البحث.
-        extension-promotional-text-help-text: اكتب نصًا ترويجيًا لتسليط الضوء على نقاط البيع الفريدة للامتداد. سيتم استخدام هذا النص في التسويق أو الأقسام المميزة.
-        extension-subtitle-help-text: قدم عنوانًا فرعيًا موجزًا يقدم سياقًا إضافيًا أو معلومات حول الامتداد.
-        extension-website-url-help-text: أدخل عنوان URL للموقع الرسمي للامتداد أو صفحة المنتج لمزيد من المعلومات.
-        extension-repo-url-help-text: قدم عنوان URL لمستودع كود الامتداد (مثل GitHub، GitLab)، إذا كان ذلك ممكنًا.
-        extension-support-url-help-text: حدد عنوان URL حيث يمكن للمستخدمين الحصول على الدعم، طرح الأسئلة، أو الإبلاغ عن المشكلات المتعلقة بالامتداد.
-        extension-privacy-policy-url-help-text: رابط إلى وثيقة سياسة الخصوصية التي توضح كيفية التعامل مع بيانات المستخدم وحمايتها.
-        extension-tos-url-help-text: رابط إلى وثيقة شروط الخدمة التي يجب على المستخدمين الموافقة عليها قبل استخدام الامتداد.
-        extension-primary-language-help-text: حدد اللغة الأساسية التي تم تطوير الامتداد بها أو المتاحة بها.
-        extension-version-help-text: حدد الإصدار الحالي للامتداد. هذا مهم لتتبع التحديثات والتوافق.
-        extension-payment-details: تفاصيل الدفع
-        extension-screenshots: لقطات الشاشة
-        upload-screenshots: تحميل لقطات الشاشة
-        submit-for-review: تقديم للمراجعة
-        extension-bundle: حزمة الامتداد
-        extension-upload-bundle: تحميل حزمة الامتداد
-        details: التفاصيل
-        bundle-id: معرف الحزمة
-        bundle-id-help-text: معرف الحزمة المنشورة حاليًا.
-        extension-id: معرف الامتداد
-        extension-id-help-text: المعرف الفريد لهذا الامتداد.
-        bundles: الحزم
-        upload-new-bundle: تحميل حزمة جديدة
-        self-managed: مُدار ذاتيًا
-        self-managed-help-text: قم بتمكين هذا الخيار إذا كان الموديل مخصصًا للحالات المستضافة ذاتيًا فقط. من خلال تحديد هذا، لن يكون الموديل متاحًا للتثبيت على إصدار السحابة/SaaS من Fleetbase ويجب تثبيته يدويًا بواسطة المستخدم على الخادم الخاص به.
+    title: الإضافات المشتراة
+    ready: "{count, plural, zero {لا شيء جاهز للتثبيت} one {واحدة جاهزة للتثبيت} two {اثنتان جاهزتان للتثبيت} few {# جاهزة للتثبيت} many {# جاهزة للتثبيت} other {# جاهزة للتثبيت}}"
+    blocked: "{count, plural, one {ترخيص واحد مسترد أو ملغى: التحديثات محظورة} other {# تراخيص مستردة أو ملغاة: التحديثات محظورة}}"
+    blocked-help: "تبقى الإضافة المستردة أو الملغاة مثبتة وتعمل حيث هي، لكن لا يمكن تثبيتها مجددًا أو تحديثها. يبقى إيصالها مدرجًا هنا."
+    error: تعذّر تحميل الإضافات المشتراة.
+    activations: "{used} من {max} مثيلات"
+    receipt: إيصال Stripe
+    columns:
+      extension: الإضافة
+      price: السعر
+      licence: الترخيص
+      activations: التفعيلات
+      install-status: حالة التثبيت
+      receipt: الإيصال
+    status:
+      installed: "مثبت الإصدار v{version}"
+    licence:
+      active: نشط
+      refunded: مسترد
+      revoked: ملغى
+      inactive: غير نشط
+      reason:
+        refunded: تم استرداد المبلغ. يتوقف التثبيت والتحديثات؛ وتحتفظ المثيلات التي تشغّلها بمقعدها.
+        disputed: الدفعة محل نزاع لدى مُصدر البطاقة. يتوقف التثبيت والتحديثات حتى يعيد السجل تفعيل الترخيص.
+        staff: ألغاه السجل. يتوقف التثبيت والتحديثات؛ وتحتفظ المثيلات التي تشغّلها بمقعدها.
+        other: لم يعد هذا الترخيص يسمح بالتثبيت أو التحديثات.
+    empty:
+      title: لا توجد إضافات مشتراة
+      body: "تظهر هنا الإضافات المدفوعة المشتراة لـ {organization} مع إيصالاتها وحالة تثبيتها. تنتقل الإضافات المجانية مباشرة إلى المثبتة."
+      browse: تصفّح الإضافات المدفوعة
+  admin:
+    config:
+      service:
+        title: خدمة السجل
+        url: عنوان الخدمة
+        url-help: العنوان الأساسي لخدمة سجل Fleetbase. يمر عبرها الاستكشاف والتثبيت والتحديث والشراء.
+      registration:
+        title: تسجيل المثيل
+        help: تُسجّل المثيلات برمز لمرة واحدة (صالح لمدة 15 دقيقة) من مالك أو مسؤول مؤسستك في السجل.
+        registered: مسجّل
+        instance: المثيل
+        organization: المؤسسة
+        token: رمز المثيل
+        registered-at: تاريخ التسجيل
+        register: تسجيل هذا المثيل
+        url-first: أدخل عنوان الخدمة أولاً.
+        register-again: "إعادة التسجيل"
+        register-again-help: "الصق رمزًا جديدًا من مؤسسة السجل. يحتفظ هذا المثيل بمعرّفه وعمليات التثبيت ومقاعد التراخيص في الخدمة؛ ويُستبدل الرمز المميز فقط."
+        cancel: "إلغاء"
+      result:
+        connected: متصل بالسجل
+        failed: تعذّر الاتصال بالسجل
+        host: المضيف
+        status: حالة HTTP
+        latency: زمن الاستجابة
+        extensions: الإضافات المنشورة
+        token-accepted: "مقبول ({name}، {organization})"
+        token-rejected: مرفوض
+        ok-toast: "تم الاتصال بـ {host} خلال {ms} مللي ثانية."
+      test: اختبار الاتصال
+      save: حفظ التغييرات
+      saved: تم حفظ إعدادات السجل.
+      this-instance: هذا المثيل
+      registered-toast: "تم التسجيل في {host} باسم {name}."
+      reregistered-toast: "أُعيد تسجيل {name} ({id}) في {host}: المثيل نفسه برمز مميز جديد. احتُفظ بعمليات التثبيت ومقاعد التراخيص."
+      unregistered-toast: لم يعد هذا المثيل مسجّلاً في خدمة السجل.
+      unregister:
+        title: إلغاء تسجيل هذا المثيل؟
+        body: "ينسى هذا المثيل رمز السجل الخاص به ولن يتمكن بعد ذلك من تثبيت الإضافات أو تحديثها أو شرائها. تستمر الإضافات المثبتة في العمل. لإبطال الرمز نفسه، أزل المثيل من مؤسستك في السجل. إذا سجّلت هذه الوحدة مرة أخرى لاحقًا، فستبقي الخدمة على المثيل نفسه."
+        accept: إلغاء التسجيل
diff --git a/translations/en-us.yaml b/translations/en-us.yaml
index 7c80995..b056bf1 100644
--- a/translations/en-us.yaml
+++ b/translations/en-us.yaml
@@ -3,12 +3,11 @@ registry-bridge:
   common:
     install: Install
     uninstall: Uninstall
-    approve: Approve
-    reject: Reject
-    details: Details
-    publish: Publish
     about: About
-    about-extension: About {extensionName}
+    retry: Retry
+    close: Close
+    cancel: Cancel
+    this-organization: this organization
   installer:
     starting: Starting…
     queued-next: Queued, next in line…
@@ -23,6 +22,7 @@ registry-bridge:
     reloading: "Done. Reloading the console in {seconds}s…"
     installed: "{extensionName} is now installed."
     uninstalled: "{extensionName} is now uninstalled."
+    updated: "{extensionName} is now updated."
     steps:
       resolve: Resolving the release…
       download: Downloading and verifying the release…
@@ -35,138 +35,326 @@ registry-bridge:
       cache-clear: Clearing caches…
       record: Finishing up…
       rollback: Rolling back changes…
-  component:
-    extension-details-modal:
+  sidebar:
+    installed: Installed
+    purchased: Purchased
+    explore: Explore
+    explore-all: Explore all
+    developers: Developers
+    publisher-portal: Publisher portal
+  explore:
+    title: Explore extensions
+    count: "{count, plural, one {# extension} other {# extensions}}"
+    search-placeholder: Search extensions, tags, publishers
+    category-title: "{categoryName}"
+    loading: Loading extensions
+    this-registry: The extensions registry
+    filters:
+      category: Category
+      pricing: Pricing
+      hosting: Hosting
+      hide-installed: Hide installed
+      sort: Sort
+      active: Active filters
+      remove: "Remove {filter} filter"
+    sort:
+      popular: Most installed
+      newest: Newest
+      updated: Recently updated
+      name: Name
+    pricing:
+      free: Free
+      paid: Paid
+    hosting:
+      self_hosted: Self-hosted
+      cloud: Fleetbase Cloud
+      both: Cloud and self-hosted
+    layout:
+      label: Layout
+      grid: Grid
+      table: Table
+    columns:
       extension: Extension
-      author: Author
-      description: Description
+      category: Category
+      publisher: Publisher
+      status: Price and status
+      updated: Updated
+    empty:
+      title: No extensions are published to this registry yet
+      body: "This console is connected to {host}. Extensions appear here once a publisher submits one and the registry team approves it."
+      check-config: Check registry config
+      publish: Publish an extension
+    no-results:
+      title: "No extensions match “{query}”"
+      filtered-title: No extensions match these filters
+      body: Try a broader term, clear a filter, or browse by category. Search covers names, subtitles, tags and publishers.
+      clear: Clear search and filters
+    error:
+      title: The registry did not respond
+      body: "{host} could not be reached or refused the request. Try again in a moment; if it keeps failing, an admin can check Admin → Registry config."
+    registration:
+      body: This instance is not registered with the registry service yet, so extensions can be browsed but not installed or bought.
+      action: Register this instance
+      ask-admin: Ask an admin to register it in Admin → Registry config.
+  card:
+    free: Free
+    purchased: Purchased
+    on-sale: On sale
+    installed: Installed
+    installed-version: "Installed v{version}"
+    update: "Update v{version}"
+    update-to: "Update to v{version}"
+    ready-to-install: Ready to install
+    self-hosted-only: Self-hosted only
+    cloud-only: Cloud only
+    verified: Verified publisher
+    view-details: View details
+    install: Install
+    no-description: No description yet.
+    unavailable: Not available here
+  detail:
+    tabs:
       overview: Overview
+      screenshots: Screenshots
       details: Details
+      versions: Versions
+    publisher: Publisher
+    category: Category
+    updated: "updated {date}"
+    verified-help: "The publisher's identity and payout account were verified by Fleetbase."
+    compat: "Compatible with Fleetbase console {console} and core-api {api}"
+    installs: Installs
+    last-release: Last release
+    support: Support
+    pricing-one-time: "{price} one-time · {currency}"
+    error:
+      title: Could not load this extension
+    cta:
+      install: Install
+      install-note: "Installs without a console rebuild (about {minutes} minutes). The console reloads when done."
+      install-note-rebuild: "Installs and rebuilds the console, which can take 15 to 40 minutes or longer. The console reloads when done."
+      purchase: "Purchase for {price}"
+      purchase-note: One-time payment via Stripe, then install. Facilitator fee included in the price.
+      installed: "Installed {version}"
+      update-note: "Installed v{installedVersion}. Updating rebuilds the console."
+      unauthorized: Needs permission
+      unauthorized-note: "You need “{permission}”. Ask an organisation admin."
+      author: You publish this extension. Manage the listing, releases and pricing on the publisher portal.
+      open-portal: Open in publisher portal
+      register: Register this instance
+      register-note: Installs go through the registry service. Register this instance once in Admin → Registry config.
+      register-ask-admin: Installs go through the registry service. Ask an admin to register this instance in Admin → Registry config.
+      unavailable: Unavailable
+      not-available: This extension cannot be installed on this instance yet.
+    screenshots:
+      previous: Previous screenshot
+      next: Next screenshot
+      show: "Show screenshot {number}"
+      empty: No screenshots yet
+    hosting:
+      both: Cloud and self-hosted
+      cloud: Fleetbase Cloud only
+      self-hosted: Self-hosted only
+    fields:
       version: Version
+      installed-version: Installed
       updated: Updated
+      publisher: Publisher
+      packages: Packages
       website: Website
-      self-managed: Self Managed
-      self-managed-help-text: A self-managed extension is designed for users who host Fleetbase on their own servers, outside of the cloud/SaaS environment. These extensions require manual installation and configuration. If you are using Fleetbase as a self-hosted instance, you can use these extensions to add additional features. However, they are not available for cloud/SaaS users.
-      self-hosted-install: Self Hosted Install
-      self-hosted-install-help-text: View self-hosted install instructions.
-    extension-pending-publish-viewer:
-      content-panel-title: Extensions Pending Publish
-      focused-extension-title: >
-        {extensionName} Details
-      download-bundle: Download Bundle
-      view-details: View Details
-      publish: Publish
-      no-extensions-awaiting-publish: No extensions awaiting publish
-    extension-reviewer-control:
-      content-panel-title: Extensions Awaiting Review
-      focused-extension-title: >
-        {extensionName} Details
-      approve-confirm-title: Are you sure you want to approve this extension?
-      approve-confirm-body: This extension should be thoroughly tested in both a development and test environment and tested for compliance as well as security issues. Once approved the extension will need to be manually published to the registry.
-      decline-confirm-title: Are you sure you want to reject this extension?
-      decline-confirm-body: This extension will be rejected, but the author will be given a chance to make corrections and re-submit for review.
-      download-bundle: Download Bundle
-      view-details: View Details
-      approve: Approve
-      reject: Reject
-      no-extensions-awaiting-review: No extensions awaiting review
+      repository: Repository
+      support: Support
+      privacy: Privacy policy
+      terms: Terms
+      languages: Languages
+      copyright: Copyright
+      hosting: Hosting
+      pricing: Pricing
+    versions:
+      columns:
+        version: Version
+        channel: Channel
+        date: Date
+        size: Size
+        notes: Notes
+      install: Install this version
+      switch: Switch to this version
+      latest: Latest
+      yanked: Yanked
+      error: Could not load the release history.
+      unsupported: Release history is available for extensions from the Registry Service. This listing only reports its current version.
+      empty: No published releases yet
+  install:
+    confirm:
+      title: "Install {name} {version}?"
+      body: "This installs the server package and the console engine for {company}, then reloads the console. Other people signed in will see the new extension after their next page load."
+      time: "Usually takes about {minutes} minutes. Unsaved work in other tabs is not affected; this tab will reload."
+      time-rebuild: "This extension needs a console rebuild, which can take 15 to 40 minutes or longer on a small server. Unsaved work in other tabs is not affected; this tab will reload."
+      accept: Install now
+    steps:
+      label: Install steps
+      server: Install server package
+      engine: Install console engine
+      build: Rebuild console and reload
+    progress:
+      title: "Installing {name}…"
+      button: Installing…
+      keep-open: Keep this tab open. You can keep working in other tabs; progress is streamed from the server, so reloading this page will not cancel the install.
+    success:
+      badge: Installed
+      title: "{name} {version} is installed"
+      reload-in: "Reloading the console in {seconds} s so the new section appears."
+      reload-cancelled: The console was not reloaded. Reload it to see the change.
+      reload-now: Reload now
+      stay: Wait, stay here
+    failed:
+      badge: Failed
+      title: "{name} could not be installed"
+      retry: Retry install
+      cli: "Or install it from the server with the CLI:"
+  update:
+    confirm:
+      title: "Update {name} to {version}?"
+      body: "This updates the server package and the console engine for {company} from v{installedVersion}, then reloads the console."
+      accept: Update now
+  uninstall:
+    confirm:
+      title: "Uninstall {name}?"
+      destructive: Destructive.
+      body: "This removes the extension and permanently deletes its settings and data for {company}. You can reinstall later, but nothing is recovered."
+      type-to-confirm: "Type {name} to confirm"
+      time: "Uninstalling reloads the console (about {minutes} minute)."
+      time-rebuild: "Uninstalling also rebuilds the console, which can take 15 to 40 minutes or longer, then reloads it."
+      accept: Uninstall
+    steps:
+      server: Remove server package
+      engine: Remove console engine
+      build: Rebuild console and reload
+    progress:
+      title: "Uninstalling {name}…"
+      button: Uninstalling…
+    success:
+      title: "{name} is uninstalled"
+    failed:
+      title: "{name} could not be uninstalled"
+      retry: Retry uninstall
+  purchase:
+    title: "Purchase {name}"
+    your-organization: your registry organization
+    finalizing:
+      title: Finalizing purchase…
+      body: "Confirming payment with Stripe and recording the licence for {organization}. Do not close this tab."
+    success:
+      badge: Paid
+      title: "{name} is yours"
+      body: "The licence belongs to {organization}, which this instance is registered to, and is listed under Purchased."
+      receipt: Stripe receipt
+      install-now: Install now
+      later: Later
+      paid: "Paid {amount}, tax included."
+    failed:
+      badge: Not completed
+      title: Payment did not go through
+      body: "Stripe reported the checkout session as {status}. No charge was made and nothing was licensed."
+      unknown-status: not completed
+      try-again: Try again
+    processing:
+      title: Payment is still being confirmed
+      body: Stripe has not confirmed the payment yet. The licence appears under Purchased as soon as it does; you can close this window.
+    cancelled:
+      badge: Cancelled
+      title: Checkout cancelled
+      body: You left the Stripe checkout before paying. Nothing was charged and nothing was licensed.
   installed:
-    title: Installed Extensions
+    title: Installed extensions
+    actions: Actions
+    update: Update
+    updates-available: "{count, plural, one {# update available} other {# updates available}}"
+    error: Could not load the installed extensions.
+    columns:
+      extension: Extension
+      category: Category
+      installed: Installed
+      latest: Latest
+      status: Status
+    status:
+      up-to-date: Up to date
+      update-available: Update available
+      core: Core service
+    empty:
+      title: Nothing installed yet
+      body: Extensions add telematics, routing, warehouse and customer features to this console. Install one from Explore; most installs take about two minutes, and an extension without a prebuilt engine rebuilds the console, which takes much longer.
+      filtered: No installed extensions match this search
+      explore: Explore extensions
+      purchased: See purchased
   purchased:
-    title: Purchased Extensions
-  developers:
-    payments:
-      manage-account: Manage Payout Account
-      no-account-warning: You must complete the Stripe onboarding process before accessing account settings.
-      settings:
-        title: Manage Payout Account
-        description: Manage your Stripe account details, including your business information and bank accounts for receiving payouts.
-        loading: Loading account management...
-    extensions:
-      extensions: Extensions
-      create-new-extension: Create new Extension
-      new-extension: New Extension
+    title: Purchased extensions
+    ready: "{count, plural, one {# ready to install} other {# ready to install}}"
+    blocked: "{count, plural, one {# licence refunded or revoked: updates blocked} other {# licences refunded or revoked: updates blocked}}"
+    blocked-help: "A refunded or revoked extension stays installed and keeps working where it is, but it can no longer be installed again or updated. Its receipt stays listed here."
+    error: Could not load the purchased extensions.
+    activations: "{used} of {max} instances"
+    receipt: Stripe receipt
+    columns:
       extension: Extension
-      submission: Submission
-      details: Details
-      bundles: Bundles
-      monetize: Monetize
-      explore:
-        explore-extensions: Explore Extensions
-        explore-category-extensions: >
-          {categoryName} Extensions
-        no-extensions-published: No extensions are published to this registry yet
-        no-extensions-published-help: Once extensions are published to the registry this console is connected to, they will show up here.
-        open-registry-config: Open registry configuration
-      extension-form:
-        package-name: Package Name
-        package-json-name: package.json name
-        composer-json-name: composer.json name
-        submission-success-message: Extension submitted and is awaiting review.
-        extension-category: Category
-        extension-category-help-text: Select the category in which users will be able to find your extension.
-        extension-select-category: Select Category
-        extension-name: Extension Name
-        extension-icon: Extension Icon
-        upload-extension-icon: Upload Icon
-        extension-description: Description
-        extension-tags: Tags
-        extension-add-tags: Add keywords and tags
-        extension-promotional-text: Promotional Text
-        details-content-block: Extension Details
-        extension-listing-details: Listing Details
-        extension-subtitle: Subtitle
-        extension-website-url: Website URL
-        extension-repo-url: Repository URL
-        extension-support-url: Support URL
-        extension-privacy-policy-url: Privacy Policy URL
-        extension-tos-url: Terms of Service URL
-        extension-primary-language: Primary Language
-        extension-version: Version
-        extension-copyright: Copyright
-        extension-copyright-help-text: Enter the copyright notice for your extension. This typically includes the year and the name of the copyright owner or company.
-        extension-payment-required: Payment Required
-        extension-payment-required-help-text: Determines if payment or subscription is required for users to install this extension.
-        extension-price: Price
-        extension-price-help-text: Specify the regular price of the extension. This is the standard cost for users to purchase or access the extension.
-        extension-sale-price: Sale Price
-        extension-sale-price-help-text: If the extension is currently offered at a discounted rate, enter the sale price here. This should be less than the regular price.
-        extension-subscription-required: Subscription Required
-        extension-subscription-required-help-text: Determines if user must have a subscription to install and use this extension.
-        extension-subscription-billing-period: Subscription Billing Period
-        extension-subscription-billing-period-placeholder: Select Billing Period
-        extension-subscription-billing-period-help-text: Specify the billing period for the subscription. Examples include monthly, quarterly, annually, or other custom intervals.
-        extension-subscription-amount: Subscription Amount
-        extension-subscription-amount-help-text: Enter the standard amount to be charged for the subscription. This should reflect the regular price before any discounts or tiered pricing adjustments.
-        extension-subscription-model: Subscription Model
-        extension-subscription-model-help-text: Determines the type of subscription pricing model to follow. Options include flate rate, tiered, and usage based subscription.
-        extension-subscription-tiers: Subscription Tiers
-        extension-subscription-tiers-help-text: Define the different pricing tiers for the subscription, if applicable. Include details like the tier levels, pricing for each tier, and any specific features or limitations of each tier.
-        extension-name-help-text: Enter the official name of the extension. This will be displayed as the primary identifier for users.
-        extension-icon-help-text: Upload an icon representing the extension. This icon will be used in listings and search results.
-        extension-description-help-text: Provide a detailed description of what the extension does and its key features. This information helps users understand the extension's functionality.
-        extension-tags-help-text: Add relevant keywords and tags that describe the extension, helping users find it through search.
-        extension-promotional-text-help-text: Write promotional text to highlight the extension's unique selling points. This text will be used in marketing or featured sections.
-        extension-subtitle-help-text: Provide a brief subtitle that offers additional context or information about the extension.
-        extension-website-url-help-text: Enter the URL to the extension's official website or product page for more information.
-        extension-repo-url-help-text: Provide the URL to the extension's code repository (e.g., GitHub, GitLab), if applicable.
-        extension-support-url-help-text: Specify the URL where users can obtain support, ask questions, or report issues with the extension.
-        extension-privacy-policy-url-help-text: Link to the privacy policy document that details how user data is handled and protected.
-        extension-tos-url-help-text: Link to the Terms of Service document that users must agree to before using the extension.
-        extension-primary-language-help-text: Specify the primary language the extension is developed or available in.
-        extension-version-help-text: Indicate the current version of the extension. This is important for tracking updates and compatibility.
-        extension-payment-details: Payment Details
-        extension-screenshots: Screenshots
-        upload-screenshots: Upload Screenshots
-        submit-for-review: Submit for Review
-        extension-bundle: Extension Bundle
-        extension-upload-bundle: Upload Extension Bundle
-        details: Details
-        bundle-id: Bundle ID
-        bundle-id-help-text: The identifier of the currently published bundle.
-        extension-id: Extension ID
-        extension-id-help-text: The unique identifier for this extension.
-        bundles: Bundles
-        upload-new-bundle: Upload new Bundle
-        self-managed: Self Managed
-        self-managed-help-text: Enable this option if your module is intended for self-hosted instances only. By selecting this, the module will not be available for installation on the cloud/SaaS version of Fleetbase and must be manually installed by the user on their own server.
\ No newline at end of file
+      price: Price
+      licence: Licence
+      activations: Activations
+      install-status: Install status
+      receipt: Receipt
+    status:
+      installed: "Installed v{version}"
+    licence:
+      active: Active
+      refunded: Refunded
+      revoked: Revoked
+      inactive: Inactive
+      reason:
+        refunded: The payment was refunded. Installs and updates stop; instances already running it keep their seat.
+        disputed: The payment is disputed with the card issuer. Installs and updates stop until the registry reinstates the licence.
+        staff: Revoked by the registry. Installs and updates stop; instances already running it keep their seat.
+        other: This licence no longer allows installs or updates.
+    empty:
+      title: No purchased extensions
+      body: "Paid extensions bought for {organization} appear here with their receipts and install status. Free extensions go straight to Installed."
+      browse: Browse paid extensions
+  admin:
+    config:
+      service:
+        title: Registry Service
+        url: Service URL
+        url-help: Base URL of the Fleetbase Registry Service. Explore, installs, updates and purchases all go through it.
+      registration:
+        title: Instance registration
+        help: Instances are registered with a one-time code (valid for 15 minutes) from an owner or admin of your registry organization.
+        registered: Registered
+        instance: Instance
+        organization: Organization
+        token: Instance token
+        registered-at: Registered
+        register: Register this instance
+        url-first: Enter the service URL first.
+        register-again: "Register again"
+        register-again-help: "Paste a new code from your registry organization. This instance keeps its id, installs and licence seats on the service; only its token is replaced."
+        cancel: "Cancel"
+      result:
+        connected: Connected to the registry
+        failed: Unable to connect to the registry
+        host: Host
+        status: HTTP status
+        latency: Latency
+        extensions: Published extensions
+        token-accepted: "Accepted ({name}, {organization})"
+        token-rejected: Rejected
+        ok-toast: "Connected to {host} in {ms} ms."
+      test: Test Connection
+      save: Save Changes
+      saved: Registry configuration saved.
+      this-instance: this instance
+      registered-toast: "Registered with {host} as {name}."
+      reregistered-toast: "Re-registered {name} ({id}) with {host}: same instance, new token. Its installs and licence seats are kept."
+      unregistered-toast: This instance is no longer registered with the registry service.
+      unregister:
+        title: Unregister this instance?
+        body: "This instance forgets its registry token and can no longer install, update or buy extensions. Installed extensions keep working. To revoke the token itself, remove the instance from your registry organization. Registering this console again later keeps the same instance on the service."
+        accept: Unregister
diff --git a/translations/uk-ua.yaml b/translations/uk-ua.yaml
index 775f0c5..629d9fb 100644
--- a/translations/uk-ua.yaml
+++ b/translations/uk-ua.yaml
@@ -1,147 +1,360 @@
 registry-bridge:
-  extension-name: Registry Bridge
+  extension-name: Міст реєстру
   common:
     install: Встановити
     uninstall: Видалити
-    approve: Схвалити
-    reject: Відхилити
-    details: Деталі
-    publish: Опублікувати
     about: Про розширення
-    about-extension: Про {extensionName}
-  component:
-    extension-details-modal:
+    retry: Повторити
+    close: Закрити
+    cancel: Скасувати
+    this-organization: цієї організації
+  installer:
+    starting: Запуск…
+    queued-next: У черзі, наступне…
+    queued-behind: "У черзі після {count, plural, one {# завдання} few {# завдань} many {# завдань} other {# завдання}}…"
+    completed: Готово.
+    failed: Завдання не вдалося.
+    failed-at: "Помилка на кроці: {step}"
+    rolled-back: Усі зміни скасовано; екземпляр у тому самому стані, що й до запуску.
+    rebuild-required: Під час завдання консоль було перезібрано; перезберіть її ще раз, щоб прибрати розширення з консолі.
+    show-log: Показати журнал
+    retry: Повторити
+    reloading: "Готово. Консоль перезавантажиться через {seconds} с…"
+    installed: "{extensionName} встановлено."
+    uninstalled: "{extensionName} видалено."
+    updated: "{extensionName} оновлено."
+    steps:
+      resolve: Визначення випуску…
+      download: Завантаження та перевірка випуску…
+      snapshot: Збереження точки відновлення…
+      server-install: Встановлення серверного пакета…
+      server-uninstall: Видалення серверного пакета…
+      engine-install: Встановлення рушія консолі…
+      engine-uninstall: Видалення рушія консолі…
+      console-build: Перезбирання консолі (це може зайняти деякий час)…
+      cache-clear: Очищення кешу…
+      record: Завершення…
+      rollback: Скасування змін…
+  sidebar:
+    installed: Встановлені
+    purchased: Придбані
+    explore: Огляд
+    explore-all: Усі розширення
+    developers: Розробникам
+    publisher-portal: Портал видавця
+  explore:
+    title: Огляд розширень
+    count: "{count, plural, one {# розширення} few {# розширення} many {# розширень} other {# розширення}}"
+    search-placeholder: Пошук розширень, тегів, видавців
+    category-title: "{categoryName}"
+    loading: Завантаження розширень
+    this-registry: Реєстр розширень
+    filters:
+      category: Категорія
+      pricing: Ціна
+      hosting: Розміщення
+      hide-installed: Приховати встановлені
+      sort: Сортування
+      active: Активні фільтри
+      remove: "Прибрати фільтр «{filter}»"
+    sort:
+      popular: Найпопулярніші
+      newest: Найновіші
+      updated: Нещодавно оновлені
+      name: Назва
+    pricing:
+      free: Безкоштовні
+      paid: Платні
+    hosting:
+      self_hosted: Власний сервер
+      cloud: Fleetbase Cloud
+      both: Хмара і власний сервер
+    layout:
+      label: Вигляд
+      grid: Сітка
+      table: Таблиця
+    columns:
       extension: Розширення
-      author: Автор
-      description: Опис
+      category: Категорія
+      publisher: Видавець
+      status: Ціна і стан
+      updated: Оновлено
+    empty:
+      title: У цьому реєстрі ще немає опублікованих розширень
+      body: "Ця консоль підключена до {host}. Розширення з’являться тут, щойно видавець надішле розширення, а команда реєстру його схвалить."
+      check-config: Перевірити налаштування реєстру
+      publish: Опублікувати розширення
+    no-results:
+      title: "Немає розширень за запитом «{query}»"
+      filtered-title: Немає розширень за цими фільтрами
+      body: Спробуйте ширший запит, приберіть фільтр або перегляньте категорії. Пошук охоплює назви, підзаголовки, теги та видавців.
+      clear: Очистити пошук і фільтри
+    error:
+      title: Реєстр не відповів
+      body: "Не вдалося зв’язатися з {host}, або він відхилив запит. Спробуйте ще раз за мить; якщо помилка повторюється, адміністратор може перевірити Адміністрування → Налаштування реєстру."
+    registration:
+      body: Цей екземпляр ще не зареєстровано в службі реєстру, тому розширення можна переглядати, але не встановлювати чи купувати.
+      action: Зареєструвати цей екземпляр
+      ask-admin: Попросіть адміністратора зареєструвати його в Адміністрування → Налаштування реєстру.
+  card:
+    free: Безкоштовно
+    purchased: Придбано
+    on-sale: Знижка
+    installed: Встановлено
+    installed-version: "Встановлено v{version}"
+    update: "Оновлення v{version}"
+    update-to: "Оновити до v{version}"
+    ready-to-install: Готове до встановлення
+    self-hosted-only: Лише власний сервер
+    cloud-only: Лише хмара
+    verified: Перевірений видавець
+    view-details: Докладніше
+    install: Встановити
+    no-description: Опису ще немає.
+    unavailable: Тут недоступне
+  detail:
+    tabs:
       overview: Огляд
-      details: Деталі
+      screenshots: Знімки екрана
+      details: Подробиці
+      versions: Версії
+    publisher: Видавець
+    category: Категорія
+    updated: "оновлено {date}"
+    verified-help: Fleetbase перевірив особу видавця та його платіжний обліковий запис.
+    compat: "Сумісне з консоллю Fleetbase {console} і core-api {api}"
+    installs: Встановлень
+    last-release: Останній випуск
+    support: Підтримка
+    pricing-one-time: "{price} одноразово · {currency}"
+    error:
+      title: Не вдалося завантажити це розширення
+    cta:
+      install: Встановити
+      install-note: "Встановлення без перезбирання консолі (близько {minutes} хв). Після завершення консоль перезавантажиться."
+      install-note-rebuild: "Встановлення перезбирає консоль, що може тривати від 15 до 40 хв або довше. Після завершення консоль перезавантажиться."
+      purchase: "Придбати за {price}"
+      purchase-note: Одноразовий платіж через Stripe, потім встановлення. Комісію посередника включено в ціну.
+      installed: "Встановлено {version}"
+      update-note: "Встановлено v{installedVersion}. Оновлення перезбирає консоль."
+      unauthorized: Потрібен дозвіл
+      unauthorized-note: "Потрібен дозвіл «{permission}». Зверніться до адміністратора організації."
+      author: Ви видавець цього розширення. Керуйте описом, випусками та цінами на порталі видавця.
+      open-portal: Відкрити на порталі видавця
+      register: Зареєструвати цей екземпляр
+      register-note: Встановлення відбувається через службу реєстру. Зареєструйте цей екземпляр один раз в Адміністрування → Налаштування реєстру.
+      register-ask-admin: Встановлення відбувається через службу реєстру. Попросіть адміністратора зареєструвати цей екземпляр в Адміністрування → Налаштування реєстру.
+      unavailable: Недоступне
+      not-available: Це розширення поки що не можна встановити на цей екземпляр.
+    screenshots:
+      previous: Попередній знімок
+      next: Наступний знімок
+      show: "Показати знімок {number}"
+      empty: Знімків екрана ще немає
+    hosting:
+      both: Хмара і власний сервер
+      cloud: Лише Fleetbase Cloud
+      self-hosted: Лише власний сервер
+    fields:
       version: Версія
+      installed-version: Встановлена
       updated: Оновлено
-      website: Веб-сайт
-      self-managed: Автономний режим
-      self-managed-help-text: Автономні розширення призначені для користувачів, які розгортають Fleetbase на власних серверах, поза хмарним/SaaS середовищем. Ці розширення вимагають ручного встановлення та налаштування. Якщо ви використовуєте Fleetbase на власному сервері, ви можете використовувати їх для додавання нових функцій. Вони недоступні для хмарних/SaaS користувачів.
-      self-hosted-install: Встановлення на власний сервер
-      self-hosted-install-help-text: Переглянути інструкції з встановлення на власний сервер.
-    extension-pending-publish-viewer:
-      content-panel-title: Розширення, що очікують публікації
-      focused-extension-title: >
-        Деталі {extensionName}
-      download-bundle: Завантажити пакет
-      view-details: Переглянути деталі
-      publish: Опублікувати
-      no-extensions-awaiting-publish: Немає розширень, що очікують публікації
-    extension-reviewer-control:
-      content-panel-title: Розширення, що очікують на перевірку
-      focused-extension-title: >
-        Деталі {extensionName}
-      approve-confirm-title: Ви впевнені, що хочете схвалити це розширення?
-      approve-confirm-body: Це розширення має бути ретельно протестоване в тестовому середовищі та середовищі розробки на відповідність вимогам та відсутність проблем із безпекою. Після схвалення розширення потрібно буде вручну опублікувати в реєстрі.
-      decline-confirm-title: Ви впевнені, що хочете відхилити це розширення?
-      decline-confirm-body: Це розширення буде відхилено, але автору буде надано можливість внести виправлення та повторно відправити його на перевірку.
-      download-bundle: Завантажити пакет
-      view-details: Переглянути деталі
-      approve: Схвалити
-      reject: Відхилити
-      no-extensions-awaiting-review: Немає розширень, що очікують перевірки
+      publisher: Видавець
+      packages: Пакети
+      website: Вебсайт
+      repository: Репозиторій
+      support: Підтримка
+      privacy: Політика конфіденційності
+      terms: Умови
+      languages: Мови
+      copyright: Авторське право
+      hosting: Розміщення
+      pricing: Ціна
+    versions:
+      columns:
+        version: Версія
+        channel: Канал
+        date: Дата
+        size: Розмір
+        notes: Примітки
+      install: Встановити цю версію
+      switch: Перейти на цю версію
+      latest: Найновіша
+      yanked: Відкликана
+      error: Не вдалося завантажити історію випусків.
+      unsupported: Історія випусків доступна для розширень зі служби реєстру. Цей запис повідомляє лише поточну версію.
+      empty: Опублікованих випусків ще немає
+  install:
+    confirm:
+      title: "Встановити {name} {version}?"
+      body: "Буде встановлено серверний пакет і рушій консолі для {company}, після чого консоль буде перезавантажено. Інші користувачі побачать нове розширення після наступного завантаження сторінки."
+      time: "Зазвичай займає близько {minutes} хв. Незбережена робота в інших вкладках не постраждає; ця вкладка перезавантажиться."
+      time-rebuild: "Це розширення потребує перезбирання консолі, що може тривати від 15 до 40 хв або довше на слабкому сервері. Незбережена робота в інших вкладках не постраждає; ця вкладка перезавантажиться."
+      accept: Встановити зараз
+    steps:
+      label: Кроки встановлення
+      server: Встановити серверний пакет
+      engine: Встановити рушій консолі
+      build: Перезібрати та перезавантажити консоль
+    progress:
+      title: "Встановлення {name}…"
+      button: Встановлення…
+      keep-open: Не закривайте цю вкладку. Можна працювати в інших вкладках; прогрес надходить із сервера, тому перезавантаження цієї сторінки не скасує встановлення.
+    success:
+      badge: Встановлено
+      title: "{name} {version} встановлено"
+      reload-in: "Консоль перезавантажиться через {seconds} с, щоб з’явився новий розділ."
+      reload-cancelled: Консоль не перезавантажено. Перезавантажте її, щоб побачити зміни.
+      reload-now: Перезавантажити зараз
+      stay: Зачекати, залишитися тут
+    failed:
+      badge: Помилка
+      title: "Не вдалося встановити {name}"
+      retry: Повторити встановлення
+      cli: "Або встановіть його на сервері через CLI:"
+  update:
+    confirm:
+      title: "Оновити {name} до {version}?"
+      body: "Буде оновлено серверний пакет і рушій консолі для {company} з v{installedVersion}, після чого консоль буде перезавантажено."
+      accept: Оновити зараз
+  uninstall:
+    confirm:
+      title: "Видалити {name}?"
+      destructive: Незворотна дія.
+      body: "Розширення буде видалено, а його налаштування й дані для {company} — остаточно стерто. Ви зможете встановити його знову, але нічого не буде відновлено."
+      type-to-confirm: "Введіть {name} для підтвердження"
+      time: "Видалення перезавантажує консоль (близько {minutes} хв)."
+      time-rebuild: "Видалення також перезбирає консоль, що може тривати від 15 до 40 хв або довше, а потім перезавантажує її."
+      accept: Видалити
+    steps:
+      server: Видалити серверний пакет
+      engine: Видалити рушій консолі
+      build: Перезібрати та перезавантажити консоль
+    progress:
+      title: "Видалення {name}…"
+      button: Видалення…
+    success:
+      title: "{name} видалено"
+    failed:
+      title: "Не вдалося видалити {name}"
+      retry: Повторити видалення
+  purchase:
+    title: "Придбати {name}"
+    your-organization: вашої організації в реєстрі
+    finalizing:
+      title: Завершення покупки…
+      body: "Підтверджуємо оплату в Stripe і реєструємо ліцензію для {organization}. Не закривайте цю вкладку."
+    success:
+      badge: Оплачено
+      title: "{name} тепер ваше"
+      body: "Ліцензію оформлено для {organization}, до якої зареєстровано цей екземпляр; її видно в розділі «Придбані»."
+      receipt: Квитанція Stripe
+      install-now: Встановити зараз
+      later: Пізніше
+      paid: "Сплачено {amount}, включно з податком."
+    failed:
+      badge: Не завершено
+      title: Оплату не проведено
+      body: "Stripe повідомив, що сеанс оплати {status}. Кошти не списано, ліцензію не надано."
+      unknown-status: не завершено
+      try-again: Спробувати ще раз
+    processing:
+      title: Оплата ще підтверджується
+      body: Stripe ще не підтвердив оплату. Ліцензія з’явиться в розділі «Придбані», щойно це станеться; це вікно можна закрити.
+    cancelled:
+      badge: Скасовано
+      title: Оплату скасовано
+      body: Ви вийшли з оплати Stripe до сплати. Кошти не списано, ліцензію не надано.
   installed:
     title: Встановлені розширення
+    actions: Дії
+    update: Оновити
+    updates-available: "{count, plural, one {Доступне # оновлення} few {Доступні # оновлення} many {Доступно # оновлень} other {Доступно # оновлення}}"
+    error: Не вдалося завантажити встановлені розширення.
+    columns:
+      extension: Розширення
+      category: Категорія
+      installed: Встановлена
+      latest: Найновіша
+      status: Стан
+    status:
+      up-to-date: Актуальне
+      update-available: Є оновлення
+      core: Базова служба
+    empty:
+      title: Ще нічого не встановлено
+      body: Розширення додають до цієї консолі телематику, маршрутизацію, склад і функції для клієнтів. Встановіть розширення з огляду; більшість встановлень триває близько двох хвилин, а розширення без готового рушія перезбирає консоль, і це триває значно довше.
+      filtered: Немає встановлених розширень за цим пошуком
+      explore: Огляд розширень
+      purchased: Переглянути придбані
   purchased:
     title: Придбані розширення
-  developers:
-    payments:
-      manage-account: Керування акаунтом виплат
-      no-account-warning: Ви повинні пройти процес реєстрації в Stripe перед доступом до налаштувань акаунта.
-      settings:
-        title: Керування акаунтом виплат
-        description: Керуйте даними свого акаунта Stripe, включаючи інформацію про бізнес та банківські рахунки для отримання виплат.
-        loading: Завантаження керування акаунтом...
-    extensions:
-      extensions: Розширення
-      create-new-extension: Створити нове розширення
-      new-extension: Нове розширення
+    ready: "{count, plural, one {# готове до встановлення} few {# готові до встановлення} many {# готових до встановлення} other {# готового до встановлення}}"
+    blocked: "{count, plural, one {# ліцензію повернено або відкликано: оновлення заблоковано} few {# ліцензії повернено або відкликано: оновлення заблоковано} many {# ліцензій повернено або відкликано: оновлення заблоковано} other {# ліцензії повернено або відкликано: оновлення заблоковано}}"
+    blocked-help: "Розширення з поверненою або відкликаною ліцензією залишається встановленим і працює там, де вже є, але його більше не можна встановити знову чи оновити. Квитанція залишається тут."
+    error: Не вдалося завантажити придбані розширення.
+    activations: "{used} з {max} екземплярів"
+    receipt: Квитанція Stripe
+    columns:
       extension: Розширення
-      submission: Подання
-      details: Деталі
-      bundles: Пакети
-      monetize: Монетизація
-      explore:
-        explore-extensions: Огляд розширень
-        explore-category-extensions: >
-          Розширення категорії {categoryName}
-        no-extensions-published: У цьому реєстрі ще не опубліковано жодного розширення
-        no-extensions-published-help: Щойно розширення буде опубліковано в реєстрі, до якого підключено цю консоль, вони з’являться тут.
-        open-registry-config: Відкрити налаштування реєстру
-      extension-form:
-        package-name: Назва пакета
-        package-json-name: назва в package.json
-        composer-json-name: назва в composer.json
-        submission-success-message: Розширення надіслано та воно очікує перевірки.
-        extension-category: Категорія
-        extension-category-help-text: Оберіть категорію, у якій користувачі зможуть знайти ваше розширення.
-        extension-select-category: Оберіть категорію
-        extension-name: Назва розширення
-        extension-icon: Іконка розширення
-        upload-extension-icon: Завантажити іконку
-        extension-description: Опис
-        extension-tags: Теги
-        extension-add-tags: Додати ключові слова та теги
-        extension-promotional-text: Рекламний текст
-        details-content-block: Деталі розширення
-        extension-listing-details: Деталі в каталозі
-        extension-subtitle: Підзаголовок
-        extension-website-url: URL-адреса веб-сайту
-        extension-repo-url: URL-адреса репозиторію
-        extension-support-url: URL-адреса підтримки
-        extension-privacy-policy-url: URL-адреса політики конфіденційності
-        extension-tos-url: URL-адреса умов використання
-        extension-primary-language: Основна мова
-        extension-version: Версія
-        extension-copyright: Авторські права
-        extension-copyright-help-text: Вкажіть примітку про авторські права для вашого розширення. Зазвичай це включає рік та ім'я власника авторських прав або назву компанії.
-        extension-payment-required: Потрібна оплата
-        extension-payment-required-help-text: Визначає, чи потрібна оплата або підписка для встановлення цього розширення користувачами.
-        extension-price: Ціна
-        extension-price-help-text: Вкажіть звичайну ціну розширення. Це стандартна вартість для купівлі або доступу.
-        extension-sale-price: Акційна ціна
-        extension-sale-price-help-text: Якщо розширення зараз пропонується зі знижкою, введіть акційну ціну тут. Вона має бути меншою за звичайну ціну.
-        extension-subscription-required: Потрібна підписка
-        extension-subscription-required-help-text: Визначає, чи повинен користувач мати підписку для встановлення та використання цього розширення.
-        extension-subscription-billing-period: Розрахунковий період підписки
-        extension-subscription-billing-period-placeholder: Оберіть розрахунковий період
-        extension-subscription-billing-period-help-text: >
-          Вкажіть розрахунковий період для підписки. Наприклад: щомісяця, щокварталу, щорічно або інші власні інтервали.
-        extension-subscription-amount: Вартість підписки
-        extension-subscription-amount-help-text: Введіть стандартну суму для стягнення за підписку. Вона має відображати звичайну ціну до застосування будь-яких знижок чи багаторівневих коригувань.
-        extension-subscription-model: Модель підписки
-        extension-subscription-model-help-text: Визначає тип цінової моделі підписки. Варіанти включають фіксовану ставку, багаторівневу підписку та підписку на основі використання.
-        extension-subscription-tiers: Рівні підписки
-        extension-subscription-tiers-help-text: Визначте різні рівні цін для підписки, якщо це застосовно. Включіть деталі, такі як рівні, ціноутворення для кожного рівня, а також будь-які специфічні функції чи обмеження кожного рівня.
-        extension-name-help-text: Введіть офіційну назву розширення. Вона відображатиметься як основний ідентифікатор для користувачів.
-        extension-icon-help-text: Завантажте іконку, яка представляє розширення. Ця іконка буде використовуватися в списках та результатах пошуку.
-        extension-description-help-text: Надайте детальний опис того, що робить розширення, та його основних функцій. Ця інформація допомагає користувачам зрозуміти функціонал розширення.
-        extension-tags-help-text: Додайте відповідні ключові слова та теги, які описують розширення, допомагаючи користувачам знайти його через пошук.
-        extension-promotional-text-help-text: Напишіть рекламний текст, щоб виділити унікальні переваги розширення. Цей текст буде використовуватися в маркетингових або обраних розділах.
-        extension-subtitle-help-text: Надайте короткий підзаголовок, який містить додатковий контекст або інформацію про розширення.
-        extension-website-url-help-text: Введіть URL-адресу офіційного веб-сайту розширення або сторінки продукту для отримання додаткової інформації.
-        extension-repo-url-help-text: Вкажіть URL-адресу репозиторію коду розширення (наприклад, GitHub, GitLab), якщо це застосовно.
-        extension-support-url-help-text: Вкажіть URL-адресу, де користувачі можуть отримати підтримку, поставити запитання або повідомити про проблеми з розширенням.
-        extension-privacy-policy-url-help-text: Посилання на документ політики конфіденційності, у якому детально описано, як обробляються та захищаються дані користувачів.
-        extension-tos-url-help-text: Посилання на документ умов використання, з якими користувачі повинні погодитися перед використанням розширення.
-        extension-primary-language-help-text: Вкажіть основну мову, якою розроблено або доступно розширення.
-        extension-version-help-text: Вкажіть поточну версію розширення. Це важливо для відстеження оновлень та сумісності.
-        extension-payment-details: Платіжні реквізити
-        extension-screenshots: Скріншоти
-        upload-screenshots: Завантажити скріншоти
-        submit-for-review: Надіслати на перевірку
-        extension-bundle: Пакет розширення
-        extension-upload-bundle: Завантажити пакет розширення
-        details: Деталі
-        bundle-id: ID пакета
-        bundle-id-help-text: Ідентифікатор наразі опублікованого пакета.
-        extension-id: ID розширення
-        extension-id-help-text: Унікальний ідентифікатор цього розширення.
-        bundles: Пакети
-        upload-new-bundle: Завантажити новий пакет
-        self-managed: Автономний режим
-        self-managed-help-text: Увімкніть цю опцію, якщо ваш модуль призначений лише для власних серверів. Якщо обрати цей параметр, модуль буде недоступний для встановлення в хмарній/SaaS версії Fleetbase і повинен бути встановлений користувачем вручну на власному сервері.
\ No newline at end of file
+      price: Ціна
+      licence: Ліцензія
+      activations: Активації
+      install-status: Стан встановлення
+      receipt: Квитанція
+    status:
+      installed: "Встановлено v{version}"
+    licence:
+      active: Активна
+      refunded: Кошти повернено
+      revoked: Відкликано
+      inactive: Неактивна
+      reason:
+        refunded: Оплату повернено. Встановлення й оновлення зупинено; екземпляри, де розширення вже працює, зберігають своє місце.
+        disputed: Оплату оскаржено в банку-емітенті картки. Встановлення й оновлення зупинено, доки реєстр не відновить ліцензію.
+        staff: Відкликано реєстром. Встановлення й оновлення зупинено; екземпляри, де розширення вже працює, зберігають своє місце.
+        other: Ця ліцензія більше не дозволяє встановлення чи оновлення.
+    empty:
+      title: Придбаних розширень немає
+      body: "Платні розширення, придбані для {organization}, з’являться тут разом із квитанціями та станом встановлення. Безкоштовні розширення одразу потрапляють у «Встановлені»."
+      browse: Переглянути платні розширення
+  admin:
+    config:
+      service:
+        title: Служба реєстру
+        url: URL служби
+        url-help: Базова адреса служби реєстру Fleetbase. Через неї проходять огляд, встановлення, оновлення та покупки.
+      registration:
+        title: Реєстрація екземпляра
+        help: Екземпляри реєструються одноразовим кодом (дійсним 15 хвилин) від власника або адміністратора вашої організації в реєстрі.
+        registered: Зареєстровано
+        instance: Екземпляр
+        organization: Організація
+        token: Токен екземпляра
+        registered-at: Дата реєстрації
+        register: Зареєструвати цей екземпляр
+        url-first: Спершу введіть URL служби.
+        register-again: "Зареєструвати повторно"
+        register-again-help: "Вставте новий код від вашої організації реєстру. Цей екземпляр зберігає свій ідентифікатор, встановлення та місця ліцензій у службі; замінюється лише його токен."
+        cancel: "Скасувати"
+      result:
+        connected: Підключено до реєстру
+        failed: Не вдалося підключитися до реєстру
+        host: Хост
+        status: Стан HTTP
+        latency: Затримка
+        extensions: Опубліковані розширення
+        token-accepted: "Прийнято ({name}, {organization})"
+        token-rejected: Відхилено
+        ok-toast: "Підключено до {host} за {ms} мс."
+      test: Перевірити з’єднання
+      save: Зберегти зміни
+      saved: Налаштування реєстру збережено.
+      this-instance: цей екземпляр
+      registered-toast: "Зареєстровано в {host} як {name}."
+      reregistered-toast: "{name} ({id}) повторно зареєстровано в {host}: той самий екземпляр, новий токен. Його встановлення та місця ліцензій збережено."
+      unregistered-toast: Цей екземпляр більше не зареєстровано в службі реєстру.
+      unregister:
+        title: Скасувати реєстрацію цього екземпляра?
+        body: "Екземпляр забуде свій токен реєстру й більше не зможе встановлювати, оновлювати чи купувати розширення. Встановлені розширення продовжать працювати. Щоб відкликати сам токен, видаліть екземпляр зі своєї організації в реєстрі. Якщо пізніше зареєструвати цю консоль знову, у службі залишиться той самий екземпляр."
+        accept: Скасувати реєстрацію
diff --git a/translations/vi-vn.yaml b/translations/vi-vn.yaml
index 6395937..b946b65 100644
--- a/translations/vi-vn.yaml
+++ b/translations/vi-vn.yaml
@@ -1,134 +1,360 @@
 registry-bridge:
-  extension-name: Cầu nối Đăng ký
+  extension-name: Cầu nối kho tiện ích
   common:
     install: Cài đặt
     uninstall: Gỡ cài đặt
-    approve: Phê duyệt
-    reject: Từ chối
-    details: Chi tiết
     about: Giới thiệu
-    about-extension: Giới thiệu {extensionName}
-  component:
-    extension-details-modal:
-      extension: Tiện ích mở rộng
-      author: Tác giả
+    retry: Thử lại
+    close: Đóng
+    cancel: Hủy
+    this-organization: tổ chức này
+  installer:
+    starting: Đang bắt đầu…
+    queued-next: Đang chờ, sắp đến lượt…
+    queued-behind: "Đang chờ sau {count, plural, other {# tác vụ}}…"
+    completed: Xong.
+    failed: Tác vụ thất bại.
+    failed-at: "Thất bại ở bước: {step}"
+    rolled-back: Mọi thay đổi đã được hoàn tác; phiên bản trở lại như trước.
+    rebuild-required: Bảng điều khiển đã được dựng lại trong lúc chạy tác vụ; hãy dựng lại lần nữa để gỡ tiện ích khỏi bảng điều khiển.
+    show-log: Xem nhật ký
+    retry: Thử lại
+    reloading: "Xong. Bảng điều khiển sẽ tải lại sau {seconds} giây…"
+    installed: "Đã cài đặt {extensionName}."
+    uninstalled: "Đã gỡ cài đặt {extensionName}."
+    updated: "Đã cập nhật {extensionName}."
+    steps:
+      resolve: Đang xác định bản phát hành…
+      download: Đang tải xuống và xác minh bản phát hành…
+      snapshot: Đang lưu điểm khôi phục…
+      server-install: Đang cài đặt gói máy chủ…
+      server-uninstall: Đang gỡ gói máy chủ…
+      engine-install: Đang cài đặt engine bảng điều khiển…
+      engine-uninstall: Đang gỡ engine bảng điều khiển…
+      console-build: Đang dựng lại bảng điều khiển (có thể mất một lúc)…
+      cache-clear: Đang xóa bộ nhớ đệm…
+      record: Đang hoàn tất…
+      rollback: Đang hoàn tác thay đổi…
+  sidebar:
+    installed: Đã cài đặt
+    purchased: Đã mua
+    explore: Khám phá
+    explore-all: Khám phá tất cả
+    developers: Nhà phát triển
+    publisher-portal: Cổng nhà phát hành
+  explore:
+    title: Khám phá tiện ích
+    count: "{count, plural, other {# tiện ích}}"
+    search-placeholder: Tìm tiện ích, thẻ, nhà phát hành
+    category-title: "{categoryName}"
+    loading: Đang tải tiện ích
+    this-registry: Kho tiện ích
+    filters:
+      category: Danh mục
+      pricing: Giá
+      hosting: Hình thức lưu trữ
+      hide-installed: Ẩn tiện ích đã cài
+      sort: Sắp xếp
+      active: Bộ lọc đang dùng
+      remove: "Bỏ bộ lọc {filter}"
+    sort:
+      popular: Cài đặt nhiều nhất
+      newest: Mới nhất
+      updated: Cập nhật gần đây
+      name: Tên
+    pricing:
+      free: Miễn phí
+      paid: Trả phí
+    hosting:
+      self_hosted: Tự lưu trữ
+      cloud: Fleetbase Cloud
+      both: Đám mây và tự lưu trữ
+    layout:
+      label: Bố cục
+      grid: Lưới
+      table: Bảng
+    columns:
+      extension: Tiện ích
+      category: Danh mục
+      publisher: Nhà phát hành
+      status: Giá và trạng thái
+      updated: Cập nhật
+    empty:
+      title: Chưa có tiện ích nào được phát hành trên kho này
+      body: "Bảng điều khiển này đang kết nối với {host}. Tiện ích sẽ xuất hiện ở đây khi nhà phát hành gửi lên và đội ngũ kho phê duyệt."
+      check-config: Kiểm tra cấu hình kho
+      publish: Phát hành tiện ích
+    no-results:
+      title: "Không có tiện ích nào khớp với “{query}”"
+      filtered-title: Không có tiện ích nào khớp với các bộ lọc này
+      body: Hãy thử từ khóa rộng hơn, bỏ bớt bộ lọc hoặc duyệt theo danh mục. Tìm kiếm bao gồm tên, phụ đề, thẻ và nhà phát hành.
+      clear: Xóa tìm kiếm và bộ lọc
+    error:
+      title: Kho tiện ích không phản hồi
+      body: "Không thể kết nối tới {host} hoặc yêu cầu bị từ chối. Hãy thử lại sau giây lát; nếu vẫn lỗi, quản trị viên có thể kiểm tra Quản trị → Cấu hình kho."
+    registration:
+      body: Phiên bản này chưa được đăng ký với dịch vụ kho, nên có thể duyệt tiện ích nhưng chưa thể cài đặt hoặc mua.
+      action: Đăng ký phiên bản này
+      ask-admin: Hãy nhờ quản trị viên đăng ký tại Quản trị → Cấu hình kho.
+  card:
+    free: Miễn phí
+    purchased: Đã mua
+    on-sale: Đang giảm giá
+    installed: Đã cài đặt
+    installed-version: "Đã cài v{version}"
+    update: "Cập nhật v{version}"
+    update-to: "Cập nhật lên v{version}"
+    ready-to-install: Sẵn sàng cài đặt
+    self-hosted-only: Chỉ tự lưu trữ
+    cloud-only: Chỉ đám mây
+    verified: Nhà phát hành đã xác minh
+    view-details: Xem chi tiết
+    install: Cài đặt
+    no-description: Chưa có mô tả.
+    unavailable: Không khả dụng tại đây
+  detail:
+    tabs:
       overview: Tổng quan
+      screenshots: Ảnh chụp màn hình
       details: Chi tiết
+      versions: Phiên bản
+    publisher: Nhà phát hành
+    category: Danh mục
+    updated: "cập nhật {date}"
+    verified-help: Fleetbase đã xác minh danh tính và tài khoản nhận thanh toán của nhà phát hành.
+    compat: "Tương thích với bảng điều khiển Fleetbase {console} và core-api {api}"
+    installs: Lượt cài đặt
+    last-release: Bản phát hành gần nhất
+    support: Hỗ trợ
+    pricing-one-time: "{price} một lần · {currency}"
+    error:
+      title: Không thể tải tiện ích này
+    cta:
+      install: Cài đặt
+      install-note: "Cài đặt mà không cần dựng lại bảng điều khiển (khoảng {minutes} phút). Bảng điều khiển sẽ tải lại khi xong."
+      install-note-rebuild: "Cài đặt và dựng lại bảng điều khiển, có thể mất từ 15 đến 40 phút hoặc lâu hơn. Bảng điều khiển sẽ tải lại khi xong."
+      purchase: "Mua với giá {price}"
+      purchase-note: Thanh toán một lần qua Stripe, sau đó cài đặt. Phí trung gian đã bao gồm trong giá.
+      installed: "Đã cài đặt {version}"
+      update-note: "Đã cài v{installedVersion}. Cập nhật sẽ dựng lại bảng điều khiển."
+      unauthorized: Cần quyền
+      unauthorized-note: "Bạn cần quyền “{permission}”. Hãy liên hệ quản trị viên tổ chức."
+      author: Bạn là nhà phát hành tiện ích này. Quản lý trang giới thiệu, bản phát hành và giá trên cổng nhà phát hành.
+      open-portal: Mở trong cổng nhà phát hành
+      register: Đăng ký phiên bản này
+      register-note: Việc cài đặt đi qua dịch vụ kho. Hãy đăng ký phiên bản này một lần tại Quản trị → Cấu hình kho.
+      register-ask-admin: Việc cài đặt đi qua dịch vụ kho. Hãy nhờ quản trị viên đăng ký phiên bản này tại Quản trị → Cấu hình kho.
+      unavailable: Không khả dụng
+      not-available: Hiện chưa thể cài đặt tiện ích này trên phiên bản này.
+    screenshots:
+      previous: Ảnh trước
+      next: Ảnh tiếp theo
+      show: "Xem ảnh {number}"
+      empty: Chưa có ảnh chụp màn hình
+    hosting:
+      both: Đám mây và tự lưu trữ
+      cloud: Chỉ Fleetbase Cloud
+      self-hosted: Chỉ tự lưu trữ
+    fields:
       version: Phiên bản
+      installed-version: Đã cài
       updated: Cập nhật
+      publisher: Nhà phát hành
+      packages: Gói
       website: Trang web
-      self-managed: Tự quản lý
-      self-managed-help-text: Một tiện ích mở rộng tự quản lý được thiết kế cho người dùng tự lưu trữ Fleetbase trên máy chủ của riêng họ, ngoài môi trường đám mây/SaaS. Những tiện ích mở rộng này yêu cầu cài đặt và cấu hình thủ công. Nếu bạn đang sử dụng Fleetbase như một phiên bản tự lưu trữ, bạn có thể sử dụng những tiện ích mở rộng này để thêm các tính năng bổ sung. Tuy nhiên, chúng không có sẵn cho người dùng đám mây/SaaS.
-    extension-pending-publish-viewer:
-      content-panel-title: Các tiện ích mở rộng đang chờ xuất bản
-      focused-extension-title: >
-        Chi tiết {extensionName}
-      download-bundle: Tải gói
-      view-details: Xem chi tiết
-      no-extensions-awaiting-publish: Không có tiện ích mở rộng nào đang chờ xuất bản
-    extension-reviewer-control:
-      content-panel-title: Các tiện ích mở rộng đang chờ xem xét
-      focused-extension-title: >
-        Chi tiết {extensionName}
-      approve-confirm-title: Bạn có chắc chắn muốn phê duyệt tiện ích mở rộng này không?
-      approve-confirm-body: Tiện ích mở rộng này nên được kiểm tra kỹ lưỡng trong cả môi trường phát triển và kiểm thử và kiểm tra tuân thủ cũng như các vấn đề bảo mật. Khi được phê duyệt, tiện ích mở rộng sẽ cần phải được xuất bản thủ công lên đăng ký.
-      decline-confirm-title: Bạn có chắc chắn muốn từ chối tiện ích mở rộng này không?
-      decline-confirm-body: Tiện ích mở rộng này sẽ bị từ chối, nhưng tác giả sẽ có cơ hội để sửa chữa và nộp lại để xem xét.
-      download-bundle: Tải gói
-      view-details: Xem chi tiết
-      approve: Phê duyệt
-      reject: Từ chối
-      no-extensions-awaiting-review: Không có tiện ích mở rộng nào đang chờ xem xét
+      repository: Kho mã nguồn
+      support: Hỗ trợ
+      privacy: Chính sách quyền riêng tư
+      terms: Điều khoản
+      languages: Ngôn ngữ
+      copyright: Bản quyền
+      hosting: Hình thức lưu trữ
+      pricing: Giá
+    versions:
+      columns:
+        version: Phiên bản
+        channel: Kênh
+        date: Ngày
+        size: Dung lượng
+        notes: Ghi chú
+      install: Cài phiên bản này
+      switch: Chuyển sang phiên bản này
+      latest: Mới nhất
+      yanked: Đã thu hồi
+      error: Không thể tải lịch sử phát hành.
+      unsupported: Lịch sử phát hành chỉ có cho tiện ích từ dịch vụ kho. Mục này chỉ cho biết phiên bản hiện tại.
+      empty: Chưa có bản phát hành nào
+  install:
+    confirm:
+      title: "Cài đặt {name} {version}?"
+      body: "Thao tác này sẽ cài gói máy chủ và engine bảng điều khiển cho {company}, sau đó tải lại bảng điều khiển. Người dùng khác sẽ thấy tiện ích mới sau lần tải trang tiếp theo."
+      time: "Thường mất khoảng {minutes} phút. Công việc chưa lưu ở các tab khác không bị ảnh hưởng; tab này sẽ tải lại."
+      time-rebuild: "Tiện ích này cần dựng lại bảng điều khiển, có thể mất từ 15 đến 40 phút hoặc lâu hơn trên máy chủ nhỏ. Công việc chưa lưu ở các tab khác không bị ảnh hưởng; tab này sẽ tải lại."
+      accept: Cài đặt ngay
+    steps:
+      label: Các bước cài đặt
+      server: Cài gói máy chủ
+      engine: Cài engine bảng điều khiển
+      build: Dựng lại và tải lại bảng điều khiển
+    progress:
+      title: "Đang cài đặt {name}…"
+      button: Đang cài đặt…
+      keep-open: Hãy giữ tab này mở. Bạn vẫn có thể làm việc ở các tab khác; tiến trình được truyền từ máy chủ, nên tải lại trang này sẽ không hủy việc cài đặt.
+    success:
+      badge: Đã cài đặt
+      title: "Đã cài đặt {name} {version}"
+      reload-in: "Bảng điều khiển sẽ tải lại sau {seconds} giây để hiển thị mục mới."
+      reload-cancelled: Bảng điều khiển chưa được tải lại. Hãy tải lại để thấy thay đổi.
+      reload-now: Tải lại ngay
+      stay: Chờ đã, ở lại đây
+    failed:
+      badge: Thất bại
+      title: "Không thể cài đặt {name}"
+      retry: Thử cài lại
+      cli: "Hoặc cài đặt từ máy chủ bằng CLI:"
+  update:
+    confirm:
+      title: "Cập nhật {name} lên {version}?"
+      body: "Thao tác này sẽ cập nhật gói máy chủ và engine bảng điều khiển cho {company} từ v{installedVersion}, sau đó tải lại bảng điều khiển."
+      accept: Cập nhật ngay
+  uninstall:
+    confirm:
+      title: "Gỡ cài đặt {name}?"
+      destructive: Không thể hoàn tác.
+      body: "Thao tác này sẽ gỡ tiện ích và xóa vĩnh viễn cài đặt cùng dữ liệu của nó cho {company}. Bạn có thể cài lại sau, nhưng sẽ không khôi phục được gì."
+      type-to-confirm: "Nhập {name} để xác nhận"
+      time: "Gỡ cài đặt sẽ tải lại bảng điều khiển (khoảng {minutes} phút)."
+      time-rebuild: "Gỡ cài đặt cũng sẽ dựng lại bảng điều khiển, có thể mất từ 15 đến 40 phút hoặc lâu hơn, rồi tải lại."
+      accept: Gỡ cài đặt
+    steps:
+      server: Gỡ gói máy chủ
+      engine: Gỡ engine bảng điều khiển
+      build: Dựng lại và tải lại bảng điều khiển
+    progress:
+      title: "Đang gỡ cài đặt {name}…"
+      button: Đang gỡ cài đặt…
+    success:
+      title: "Đã gỡ cài đặt {name}"
+    failed:
+      title: "Không thể gỡ cài đặt {name}"
+      retry: Thử gỡ lại
+  purchase:
+    title: "Mua {name}"
+    your-organization: tổ chức của bạn trên registry
+    finalizing:
+      title: Đang hoàn tất giao dịch…
+      body: "Đang xác nhận thanh toán với Stripe và ghi nhận giấy phép cho {organization}. Đừng đóng tab này."
+    success:
+      badge: Đã thanh toán
+      title: "{name} giờ là của bạn"
+      body: "Giấy phép thuộc về {organization}, nơi phiên bản này đã đăng ký, và hiển thị trong mục Đã mua."
+      receipt: Biên lai Stripe
+      install-now: Cài đặt ngay
+      later: Để sau
+      paid: "Đã thanh toán {amount}, đã bao gồm thuế."
+    failed:
+      badge: Chưa hoàn tất
+      title: Thanh toán không thành công
+      body: "Stripe báo phiên thanh toán ở trạng thái {status}. Không có khoản phí nào bị trừ và không có giấy phép nào được cấp."
+      unknown-status: chưa hoàn tất
+      try-again: Thử lại
+    processing:
+      title: Thanh toán vẫn đang được xác nhận
+      body: Stripe chưa xác nhận thanh toán. Giấy phép sẽ xuất hiện trong mục Đã mua ngay khi được xác nhận; bạn có thể đóng cửa sổ này.
+    cancelled:
+      badge: Đã hủy
+      title: Đã hủy thanh toán
+      body: Bạn đã rời trang thanh toán Stripe trước khi trả tiền. Không có khoản phí nào bị trừ và không có giấy phép nào được cấp.
   installed:
-    title: Các tiện ích mở rộng đã cài đặt
+    title: Tiện ích đã cài đặt
+    actions: Thao tác
+    update: Cập nhật
+    updates-available: "{count, plural, other {Có # bản cập nhật}}"
+    error: Không thể tải danh sách tiện ích đã cài đặt.
+    columns:
+      extension: Tiện ích
+      category: Danh mục
+      installed: Đã cài
+      latest: Mới nhất
+      status: Trạng thái
+    status:
+      up-to-date: Đã cập nhật
+      update-available: Có bản cập nhật
+      core: Dịch vụ lõi
+    empty:
+      title: Chưa cài đặt tiện ích nào
+      body: Tiện ích bổ sung các tính năng viễn thông, định tuyến, kho bãi và khách hàng cho bảng điều khiển này. Hãy cài đặt từ mục Khám phá; hầu hết lượt cài mất khoảng hai phút, còn tiện ích không có engine dựng sẵn sẽ dựng lại bảng điều khiển và mất lâu hơn nhiều.
+      filtered: Không có tiện ích đã cài nào khớp với tìm kiếm này
+      explore: Khám phá tiện ích
+      purchased: Xem tiện ích đã mua
   purchased:
-    title: Các tiện ích mở rộng đã mua
-  developers:
-    extensions:
-      extensions: Tiện ích mở rộng
-      create-new-extension: Tạo tiện ích mở rộng mới
-      new-extension: Tiện ích mở rộng mới
-      extension: Tiện ích mở rộng
-      submission: Nộp đơn
-      details: Chi tiết
-      bundles: Gói
-      monetize: Kiếm tiền
-      explore:
-        explore-extensions: Khám phá tiện ích mở rộng
-        explore-category-extensions: >
-          Tiện ích mở rộng {categoryName}
-        no-extensions-published: Chưa có tiện ích mở rộng nào được xuất bản lên registry này
-        no-extensions-published-help: Khi có tiện ích mở rộng được xuất bản lên registry mà bảng điều khiển này kết nối, chúng sẽ hiển thị ở đây.
-        open-registry-config: Mở cấu hình registry
-      extension-form:
-        package-name: Tên gói
-        package-json-name: tên package.json
-        composer-json-name: tên composer.json
-        submission-success-message: Tiện ích mở rộng đã được nộp và đang chờ xem xét.
-        extension-category: Danh mục
-        extension-category-help-text: Chọn danh mục mà người dùng sẽ có thể tìm thấy tiện ích mở rộng của bạn.
-        extension-select-category: Chọn danh mục
-        extension-name: Tên tiện ích mở rộng
-        extension-icon: Biểu tượng tiện ích mở rộng
-        upload-extension-icon: Tải lên biểu tượng
-        extension-description: Mô tả
-        extension-tags: Thẻ
-        extension-add-tags: Thêm từ khóa và thẻ
-        extension-promotional-text: Văn bản quảng cáo
-        details-content-block: Chi tiết tiện ích mở rộng
-        extension-listing-details: Chi tiết niêm yết
-        extension-subtitle: Phụ đề
-        extension-website-url: URL trang web
-        extension-repo-url: URL kho lưu trữ
-        extension-support-url: URL hỗ trợ
-        extension-privacy-policy-url: URL chính sách bảo mật
-        extension-tos-url: URL điều khoản dịch vụ
-        extension-primary-language: Ngôn ngữ chính
-        extension-version: Phiên bản
-        extension-copyright: Bản quyền
-        extension-copyright-help-text: Nhập thông báo bản quyền cho tiện ích mở rộng của bạn. Thông thường bao gồm năm và tên của chủ sở hữu bản quyền hoặc công ty.
-        extension-payment-required: Cần thanh toán
-        extension-payment-required-help-text: Xác định xem có cần thanh toán hoặc đăng ký để người dùng cài đặt tiện ích mở rộng này không.
-        extension-price: Giá
-        extension-price-help-text: Xác định giá thông thường của tiện ích mở rộng. Đây là chi phí tiêu chuẩn để người dùng mua hoặc truy cập tiện ích mở rộng.
-        extension-sale-price: Giá bán
-        extension-sale-price-help-text: Nếu tiện ích mở rộng hiện đang được cung cấp với mức giá giảm, hãy nhập giá bán ở đây. Điều này nên thấp hơn giá thông thường.
-        extension-subscription-required: Cần đăng ký
-        extension-subscription-required-help-text: Xác định xem người dùng phải có đăng ký để cài đặt và sử dụng tiện ích mở rộng này không.
-        extension-subscription-billing-period: Thời gian thanh toán đăng ký
-        extension-subscription-billing-period-placeholder: Chọn thời gian thanh toán
-        extension-subscription-billing-period-help-text: Xác định thời gian thanh toán cho đăng ký. Ví dụ bao gồm hàng tháng, hàng quý, hàng năm hoặc các khoảng thời gian tùy chỉnh khác.
-        extension-subscription-amount: Số tiền đăng ký
-        extension-subscription-amount-help-text: Nhập số tiền tiêu chuẩn được tính cho đăng ký. Điều này nên phản ánh giá thông thường trước bất kỳ giảm giá hoặc điều chỉnh giá theo cấp độ nào.
-        extension-subscription-model: Mô hình đăng ký
-        extension-subscription-model-help-text: Xác định loại mô hình giá đăng ký. Các tùy chọn bao gồm giá cố định, theo cấp độ và dựa trên mức sử dụng.
-        extension-subscription-tiers: Các cấp đăng ký
-        extension-subscription-tiers-help-text: Xác định các cấp giá khác nhau cho đăng ký, nếu có. Bao gồm chi tiết như các cấp độ, giá cho mỗi cấp và bất kỳ tính năng hoặc hạn chế cụ thể nào của mỗi cấp.
-        extension-name-help-text: Nhập tên chính thức của tiện ích mở rộng. Tên này sẽ được hiển thị như một chỉ định chính cho người dùng.
-        extension-icon-help-text: Tải lên một biểu tượng đại diện cho tiện ích mở rộng. Biểu tượng này sẽ được sử dụng trong các danh sách và kết quả tìm kiếm.
-        extension-description-help-text: Cung cấp một mô tả chi tiết về những gì tiện ích mở rộng làm và các tính năng chính của nó. Thông tin này giúp người dùng hiểu chức năng của tiện ích mở rộng.
-        extension-tags-help-text: Thêm từ khóa và thẻ liên quan mô tả tiện ích mở rộng, giúp người dùng tìm thấy nó qua tìm kiếm.
-        extension-promotional-text-help-text: Viết văn bản quảng cáo để làm nổi bật các điểm bán hàng độc đáo của tiện ích mở rộng. Văn bản này sẽ được sử dụng trong các phần tiếp thị hoặc nổi bật.
-        extension-subtitle-help-text: Cung cấp một phụ đề ngắn gọn cung cấp ngữ cảnh hoặc thông tin bổ sung về tiện ích mở rộng.
-        extension-website-url-help-text: Nhập URL đến trang web chính thức của tiện ích mở rộng hoặc trang sản phẩm để biết thêm thông tin.
-        extension-repo-url-help-text: "Cung cấp URL đến kho lưu trữ mã của tiện ích mở rộng (ví dụ: GitHub, GitLab), nếu có."
-        extension-support-url-help-text: Xác định URL nơi người dùng có thể nhận hỗ trợ, đặt câu hỏi hoặc báo cáo sự cố với tiện ích mở rộng.
-        extension-privacy-policy-url-help-text: Liên kết đến tài liệu chính sách bảo mật chi tiết cách dữ liệu người dùng được xử lý và bảo vệ.
-        extension-tos-url-help-text: Liên kết đến tài liệu Điều khoản dịch vụ mà người dùng phải đồng ý trước khi sử dụng tiện ích mở rộng.
-        extension-primary-language-help-text: Xác định ngôn ngữ chính mà tiện ích mở rộng được phát triển hoặc có sẵn.
-        extension-version-help-text: Cho biết phiên bản hiện tại của tiện ích mở rộng. Điều này quan trọng để theo dõi các bản cập nhật và khả năng tương thích.
-        extension-payment-details: Chi tiết thanh toán
-        extension-screenshots: Ảnh chụp màn hình
-        upload-screenshots: Tải lên ảnh chụp màn hình
-        submit-for-review: Nộp để xem xét
-        extension-bundle: Gói tiện ích mở rộng
-        extension-upload-bundle: Tải lên gói tiện ích mở rộng
-        details: Chi tiết
-        bundle-id: ID gói
-        bundle-id-help-text: Định danh của gói hiện đang được xuất bản.
-        extension-id: ID tiện ích mở rộng
-        extension-id-help-text: Định danh duy nhất cho tiện ích mở rộng này.
-        bundles: Gói
-        upload-new-bundle: Tải lên gói mới
-        self-managed: Tự quản lý
-        self-managed-help-text: Kích hoạt tùy chọn này nếu mô-đun của bạn chỉ dành cho các phiên bản tự lưu trữ. Khi chọn tùy chọn này, mô-đun sẽ không có sẵn để cài đặt trên phiên bản đám mây/SaaS của Fleetbase và phải được người dùng cài đặt thủ công trên máy chủ của riêng họ.
+    title: Tiện ích đã mua
+    ready: "{count, plural, other {# sẵn sàng cài đặt}}"
+    blocked: "{count, plural, other {# giấy phép đã hoàn tiền hoặc bị thu hồi: chặn cập nhật}}"
+    blocked-help: "Tiện ích đã hoàn tiền hoặc bị thu hồi vẫn được cài đặt và hoạt động ở nơi đã cài, nhưng không thể cài lại hoặc cập nhật. Biên lai vẫn được liệt kê ở đây."
+    error: Không thể tải danh sách tiện ích đã mua.
+    activations: "{used} / {max} phiên bản"
+    receipt: Biên lai Stripe
+    columns:
+      extension: Tiện ích
+      price: Giá
+      licence: Giấy phép
+      activations: Lượt kích hoạt
+      install-status: Trạng thái cài đặt
+      receipt: Biên lai
+    status:
+      installed: "Đã cài v{version}"
+    licence:
+      active: Đang hiệu lực
+      refunded: Đã hoàn tiền
+      revoked: Đã thu hồi
+      inactive: Không hiệu lực
+      reason:
+        refunded: Khoản thanh toán đã được hoàn tiền. Việc cài đặt và cập nhật dừng lại; các phiên bản đang chạy tiện ích vẫn giữ chỗ.
+        disputed: Khoản thanh toán đang bị khiếu nại với ngân hàng phát hành thẻ. Việc cài đặt và cập nhật dừng lại cho đến khi registry khôi phục giấy phép.
+        staff: Registry đã thu hồi giấy phép. Việc cài đặt và cập nhật dừng lại; các phiên bản đang chạy tiện ích vẫn giữ chỗ.
+        other: Giấy phép này không còn cho phép cài đặt hoặc cập nhật.
+    empty:
+      title: Chưa mua tiện ích nào
+      body: "Các tiện ích trả phí đã mua cho {organization} sẽ hiển thị ở đây cùng biên lai và trạng thái cài đặt. Tiện ích miễn phí sẽ vào thẳng mục Đã cài đặt."
+      browse: Duyệt tiện ích trả phí
+  admin:
+    config:
+      service:
+        title: Dịch vụ kho
+        url: URL dịch vụ
+        url-help: Địa chỉ gốc của dịch vụ kho Fleetbase. Khám phá, cài đặt, cập nhật và mua đều đi qua dịch vụ này.
+      registration:
+        title: Đăng ký phiên bản
+        help: Phiên bản được đăng ký bằng mã dùng một lần (hiệu lực 15 phút) do chủ sở hữu hoặc quản trị viên tổ chức của bạn trên kho cung cấp.
+        registered: Đã đăng ký
+        instance: Phiên bản
+        organization: Tổ chức
+        token: Token phiên bản
+        registered-at: Ngày đăng ký
+        register: Đăng ký phiên bản này
+        url-first: Hãy nhập URL dịch vụ trước.
+        register-again: "Đăng ký lại"
+        register-again-help: "Dán mã mới từ tổ chức kho của bạn. Phiên bản này giữ nguyên mã định danh, các bản cài đặt và chỗ giấy phép trên dịch vụ; chỉ token được thay thế."
+        cancel: "Hủy"
+      result:
+        connected: Đã kết nối với kho
+        failed: Không thể kết nối với kho
+        host: Máy chủ
+        status: Trạng thái HTTP
+        latency: Độ trễ
+        extensions: Tiện ích đã phát hành
+        token-accepted: "Được chấp nhận ({name}, {organization})"
+        token-rejected: Bị từ chối
+        ok-toast: "Đã kết nối với {host} trong {ms} ms."
+      test: Kiểm tra kết nối
+      save: Lưu thay đổi
+      saved: Đã lưu cấu hình kho.
+      this-instance: phiên bản này
+      registered-toast: "Đã đăng ký với {host} dưới tên {name}."
+      reregistered-toast: "Đã đăng ký lại {name} ({id}) với {host}: cùng phiên bản, token mới. Các bản cài đặt và chỗ giấy phép được giữ nguyên."
+      unregistered-toast: Phiên bản này không còn đăng ký với dịch vụ kho.
+      unregister:
+        title: Hủy đăng ký phiên bản này?
+        body: "Phiên bản này sẽ quên token kho và không thể cài đặt, cập nhật hoặc mua tiện ích nữa. Các tiện ích đã cài vẫn hoạt động. Để thu hồi chính token đó, hãy xóa phiên bản khỏi tổ chức của bạn trên kho. Nếu sau này đăng ký lại bảng điều khiển này, dịch vụ vẫn giữ cùng một phiên bản."
+        accept: Hủy đăng ký