diff --git a/web/projects/marketplace/package.json b/web/projects/marketplace/package.json
index 0df2775d8..1623a6e6e 100644
--- a/web/projects/marketplace/package.json
+++ b/web/projects/marketplace/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@start9labs/marketplace",
-  "version": "0.3.34",
+  "version": "0.3.35",
   "peerDependencies": {
     "@angular/common": ">=13.2.0",
     "@angular/core": ">=13.2.0",
diff --git a/web/projects/marketplace/src/components/menu/menu.component.ts b/web/projects/marketplace/src/components/menu/menu.component.ts
index 5eb580e30..9d56faa8e 100644
--- a/web/projects/marketplace/src/components/menu/menu.component.ts
+++ b/web/projects/marketplace/src/components/menu/menu.component.ts
@@ -8,7 +8,7 @@ import {
 import { MarketplaceConfig } from '@start9labs/shared'
 import { Subject, takeUntil } from 'rxjs'
 import { AbstractCategoryService } from '../../services/category.service'
-import { StoreData } from '../../types'
+import { StoreDataWithUrl } from '../../types'
 
 @Component({
   selector: 'menu',
@@ -21,7 +21,7 @@ export class MenuComponent implements OnDestroy {
   iconConfig!: MarketplaceConfig
 
   @Input({ required: true })
-  registry: (StoreData & { url?: string }) | null = null
+  registry: StoreDataWithUrl | null = null
 
   private destroy$ = new Subject<void>()
   private readonly categoryService = inject(AbstractCategoryService)
diff --git a/web/projects/marketplace/src/types.ts b/web/projects/marketplace/src/types.ts
index 9853cddbb..e5022cc68 100644
--- a/web/projects/marketplace/src/types.ts
+++ b/web/projects/marketplace/src/types.ts
@@ -37,3 +37,5 @@ export type MarketplacePkg = T.PackageVersionInfo &
     version: string
     flavor: string | null
   }
+
+export type StoreDataWithUrl = StoreData & { url: string }
diff --git a/web/projects/ui/src/app/app.providers.ts b/web/projects/ui/src/app/app.providers.ts
index 6389eb76d..47e7a6314 100644
--- a/web/projects/ui/src/app/app.providers.ts
+++ b/web/projects/ui/src/app/app.providers.ts
@@ -3,7 +3,6 @@ import { UntypedFormBuilder } from '@angular/forms'
 import { Router } from '@angular/router'
 import {
   AbstractCategoryService,
-  AbstractMarketplaceService,
   FilterPackagesPipe,
 } from '@start9labs/marketplace'
 import { RELATIVE_URL, THEME, WorkspaceConfig } from '@start9labs/shared'
@@ -90,10 +89,6 @@ export const APP_PROVIDERS: Provider[] = [
     provide: THEME,
     useExisting: ThemeSwitcherService,
   },
-  {
-    provide: AbstractMarketplaceService,
-    useClass: MarketplaceService,
-  },
   {
     provide: AbstractCategoryService,
     useClass: CategoryService,
diff --git a/web/projects/ui/src/app/routes/portal/components/tabs.component.ts b/web/projects/ui/src/app/routes/portal/components/tabs.component.ts
index 0a8c2f0db..2fa4a2126 100644
--- a/web/projects/ui/src/app/routes/portal/components/tabs.component.ts
+++ b/web/projects/ui/src/app/routes/portal/components/tabs.component.ts
@@ -50,6 +50,16 @@ const FILTER = ['/portal/system/settings', '/portal/system/marketplace']
       >
         Settings
       </a>
+      <a
+        tuiTabBarItem
+        icon="@tui.settings"
+        routerLink="/portal/system/settings"
+        routerLinkActive
+        [badge]="badge()"
+        (isActiveChange)="update()"
+      >
+        Settings
+      </a>
       <button
         tuiTabBarItem
         icon="@tui.ellipsis"
diff --git a/web/projects/ui/src/app/routes/portal/routes/system/marketplace/components/controls.component.ts b/web/projects/ui/src/app/routes/portal/routes/system/marketplace/components/controls.component.ts
index 55712ce20..430cb4297 100644
--- a/web/projects/ui/src/app/routes/portal/routes/system/marketplace/components/controls.component.ts
+++ b/web/projects/ui/src/app/routes/portal/routes/system/marketplace/components/controls.component.ts
@@ -7,10 +7,7 @@ import {
   Input,
 } from '@angular/core'
 import { Router } from '@angular/router'
-import {
-  AbstractMarketplaceService,
-  MarketplacePkg,
-} from '@start9labs/marketplace'
+import { MarketplacePkg } from '@start9labs/marketplace'
 import {
   Exver,
   ErrorService,
@@ -106,12 +103,7 @@ export class MarketplaceControlsComponent {
   private readonly loader = inject(LoadingService)
   private readonly exver = inject(Exver)
   private readonly router = inject(Router)
-  private readonly marketplace = inject(
-    AbstractMarketplaceService,
-  ) as MarketplaceService
-
-  @Input()
-  url?: string
+  private readonly marketplaceService = inject(MarketplaceService)
 
   @Input({ required: true })
   pkg!: MarketplacePkg
@@ -125,19 +117,19 @@ export class MarketplaceControlsComponent {
   readonly showDevTools$ = inject(ClientStorageService).showDevTools$
 
   async tryInstall() {
-    const current = await firstValueFrom(this.marketplace.getSelectedHost$())
-    const url = this.url || current.url
+    const currentUrl = await firstValueFrom(
+      this.marketplaceService.getRegistryUrl$(),
+    )
     const originalUrl = this.localPkg?.registry || ''
-
     if (!this.localPkg) {
-      if (await this.alerts.alertInstall(this.pkg)) this.install(url)
+      if (await this.alerts.alertInstall(this.pkg)) this.install(currentUrl)
 
       return
     }
 
     if (
-      !sameUrl(url, originalUrl) &&
-      !(await this.alerts.alertMarketplace(url, originalUrl))
+      !sameUrl(currentUrl, originalUrl) &&
+      !(await this.alerts.alertMarketplace(currentUrl, originalUrl))
     ) {
       return
     }
@@ -148,9 +140,9 @@ export class MarketplaceControlsComponent {
       hasCurrentDeps(localManifest.id, await getAllPackages(this.patch)) &&
       this.exver.compareExver(localManifest.version, this.pkg.version) !== 0
     ) {
-      this.dryInstall(url)
+      this.dryInstall(currentUrl)
     } else {
-      this.install(url)
+      this.install(currentUrl)
     }
   }
 
@@ -178,7 +170,7 @@ export class MarketplaceControlsComponent {
     const { id, version } = this.pkg
 
     try {
-      await this.marketplace.installPackage(id, version, url)
+      await this.marketplaceService.installPackage(id, version, url)
     } catch (e: any) {
       this.errorService.handleError(e)
     } finally {
diff --git a/web/projects/ui/src/app/routes/portal/routes/system/marketplace/components/menu.component.ts b/web/projects/ui/src/app/routes/portal/routes/system/marketplace/components/menu.component.ts
index 7506ba8fa..46603da40 100644
--- a/web/projects/ui/src/app/routes/portal/routes/system/marketplace/components/menu.component.ts
+++ b/web/projects/ui/src/app/routes/portal/routes/system/marketplace/components/menu.component.ts
@@ -1,4 +1,5 @@
 import { ChangeDetectionStrategy, Component, inject } from '@angular/core'
+import { CommonModule } from '@angular/common'
 import { MenuModule } from '@start9labs/marketplace'
 import {
   TuiDialogService,
@@ -8,12 +9,13 @@ import {
 } from '@taiga-ui/core'
 import { ConfigService } from 'src/app/services/config.service'
 import { MARKETPLACE_REGISTRY } from '../modals/registry.component'
+import { MarketplaceService } from 'src/app/services/marketplace.service'
 
 @Component({
   standalone: true,
   selector: 'marketplace-menu',
   template: `
-    <menu [iconConfig]="marketplace">
+    <menu [iconConfig]="marketplace" [registry]="registry$ | async">
       <button
         slot="desktop"
         tuiIconButton
@@ -45,11 +47,13 @@ import { MARKETPLACE_REGISTRY } from '../modals/registry.component'
     `,
   ],
   changeDetection: ChangeDetectionStrategy.OnPush,
-  imports: [MenuModule, TuiButton, TuiIcon, TuiAppearance],
+  imports: [CommonModule, MenuModule, TuiButton, TuiIcon, TuiAppearance],
 })
 export class MarketplaceMenuComponent {
   private readonly dialogs = inject(TuiDialogService)
   readonly marketplace = inject(ConfigService).marketplace
+  private readonly marketplaceService = inject(MarketplaceService)
+  readonly registry$ = this.marketplaceService.getRegistry$()
 
   changeRegistry() {
     this.dialogs
diff --git a/web/projects/ui/src/app/routes/portal/routes/system/marketplace/marketplace.component.ts b/web/projects/ui/src/app/routes/portal/routes/system/marketplace/marketplace.component.ts
index 4e382c6bb..8187e3f87 100644
--- a/web/projects/ui/src/app/routes/portal/routes/system/marketplace/marketplace.component.ts
+++ b/web/projects/ui/src/app/routes/portal/routes/system/marketplace/marketplace.component.ts
@@ -5,7 +5,7 @@ import {
   AbstractCategoryService,
   FilterPackagesPipe,
 } from '@start9labs/marketplace'
-import { combineLatest, map } from 'rxjs'
+import { combineLatest, distinctUntilKeyChanged, map } from 'rxjs'
 import { MarketplaceNotificationComponent } from './components/notification.component'
 import { MarketplaceMenuComponent } from './components/menu.component'
 import { MarketplaceTileComponent } from './components/tile.component'
@@ -13,6 +13,10 @@ import { MarketplaceControlsComponent } from './components/controls.component'
 import { MarketplacePreviewComponent } from './modals/preview.component'
 import { MarketplaceSidebarsComponent } from './components/sidebars.component'
 import { MarketplaceService } from 'src/app/services/marketplace.service'
+import { ActivatedRoute, Router } from '@angular/router'
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop'
+import { PatchDB } from 'patch-db-client'
+import { DataModel } from 'src/app/services/patch-db/data-model'
 
 @Component({
   standalone: true,
@@ -21,7 +25,7 @@ import { MarketplaceService } from 'src/app/services/marketplace.service'
     <tui-scrollbar>
       <div class="marketplace-content-wrapper">
         <div class="marketplace-content-inner">
-          <marketplace-notification [url]="(details$ | async)?.url || ''" />
+          <marketplace-notification [url]="(details$ | async) || ''" />
           <div class="title-wrapper">
             <h1>
               {{ category$ | async | titlecase }}
@@ -152,11 +156,28 @@ export class MarketplaceComponent {
   private readonly categoryService = inject(AbstractCategoryService)
   private readonly marketplaceService = inject(MarketplaceService)
 
-  readonly details$ = this.marketplaceService.getSelectedHost$()
+  constructor(
+    private readonly route: ActivatedRoute,
+    private readonly router: Router,
+    private readonly patch: PatchDB<DataModel>,
+  ) {
+    this.route.queryParamMap.pipe(takeUntilDestroyed()).subscribe(params => {
+      this.patch
+        .watch$('ui', 'marketplace')
+        .pipe(distinctUntilKeyChanged('selectedUrl'))
+        .subscribe(({ selectedUrl }) => {
+          this.marketplaceService.setRegistryUrl(
+            params.get('registry') || selectedUrl,
+          )
+        })
+    })
+  }
+
+  readonly details$ = this.marketplaceService.getRegistryUrl$()
   readonly category$ = this.categoryService.getCategory$()
   readonly filtered$ = combineLatest([
     this.marketplaceService
-      .getSelectedRegistry$()
+      .getRegistry$()
       .pipe(map(({ packages }) => packages)),
     this.categoryService.getQuery$(),
     this.category$,
diff --git a/web/projects/ui/src/app/routes/portal/routes/system/marketplace/modals/preview.component.ts b/web/projects/ui/src/app/routes/portal/routes/system/marketplace/modals/preview.component.ts
index 420b0fcfd..751a8ccff 100644
--- a/web/projects/ui/src/app/routes/portal/routes/system/marketplace/modals/preview.component.ts
+++ b/web/projects/ui/src/app/routes/portal/routes/system/marketplace/modals/preview.component.ts
@@ -187,7 +187,7 @@ export class MarketplacePreviewComponent {
   private readonly exver = inject(Exver)
   private readonly router = inject(Router)
   private readonly marketplaceService = inject(MarketplaceService)
-  private readonly version$ = new BehaviorSubject<string>('*')
+  private readonly version$ = new BehaviorSubject<string | null>(null)
   private readonly flavor$ = this.router.routerState.root.queryParamMap.pipe(
     map(paramMap => paramMap.get('flavor')),
   )
@@ -202,7 +202,7 @@ export class MarketplacePreviewComponent {
 
   readonly flavors$ = this.flavor$.pipe(
     switchMap(current =>
-      this.marketplaceService.getSelectedRegistry$().pipe(
+      this.marketplaceService.getRegistry$().pipe(
         map(({ packages }) =>
           packages.filter(
             ({ id, flavor }) => id === this.pkgId && flavor !== current,
diff --git a/web/projects/ui/src/app/routes/portal/routes/system/marketplace/modals/registry.component.ts b/web/projects/ui/src/app/routes/portal/routes/system/marketplace/modals/registry.component.ts
index 8326aec8f..91e951c42 100644
--- a/web/projects/ui/src/app/routes/portal/routes/system/marketplace/modals/registry.component.ts
+++ b/web/projects/ui/src/app/routes/portal/routes/system/marketplace/modals/registry.component.ts
@@ -9,12 +9,20 @@ import {
   toUrl,
 } from '@start9labs/shared'
 import {
-  AbstractMarketplaceService,
   StoreIconComponentModule,
   MarketplaceRegistryComponent,
 } from '@start9labs/marketplace'
-import { TuiDialogService, TuiIcon, TuiTitle, TuiButton } from '@taiga-ui/core'
-import { PolymorpheusComponent } from '@taiga-ui/polymorpheus'
+import {
+  TuiDialogService,
+  TuiIcon,
+  TuiTitle,
+  TuiButton,
+  TuiDialogContext,
+} from '@taiga-ui/core'
+import {
+  PolymorpheusComponent,
+  POLYMORPHEUS_CONTEXT,
+} from '@taiga-ui/polymorpheus'
 import { PatchDB } from 'patch-db-client'
 import { combineLatest, filter, firstValueFrom, map, Subscription } from 'rxjs'
 import { FormComponent } from 'src/app/routes/portal/components/form.component'
@@ -24,6 +32,7 @@ import { MarketplaceService } from 'src/app/services/marketplace.service'
 import { FormDialogService } from 'src/app/services/form-dialog.service'
 import { getMarketplaceValueSpec, getPromptOptions } from '../utils/registry'
 import { ConfigService } from 'src/app/services/config.service'
+import { ActivatedRoute, Router } from '@angular/router'
 
 @Component({
   standalone: true,
@@ -90,9 +99,10 @@ export class MarketplaceRegistryModal {
   private readonly errorService = inject(ErrorService)
   private readonly formDialog = inject(FormDialogService)
   private readonly dialogs = inject(TuiDialogService)
-  private readonly marketplace = inject(
-    AbstractMarketplaceService,
-  ) as MarketplaceService
+  private readonly marketplaceService = inject(MarketplaceService)
+  private readonly context = inject<TuiDialogContext>(POLYMORPHEUS_CONTEXT)
+  private readonly route = inject(ActivatedRoute)
+  private readonly router = inject(Router)
   private readonly hosts$ = inject<PatchDB<DataModel>>(PatchDB).watch$(
     'ui',
     'marketplace',
@@ -101,13 +111,13 @@ export class MarketplaceRegistryModal {
   readonly marketplaceConfig = inject(ConfigService).marketplace
 
   readonly stores$ = combineLatest([
-    this.marketplace.getKnownHosts$(),
-    this.marketplace.getSelectedHost$(),
+    this.marketplaceService.getKnownHosts$(),
+    this.marketplaceService.getRegistryUrl$(),
   ]).pipe(
-    map(([stores, selected]) =>
+    map(([stores, selectedUrl]) =>
       stores.map(s => ({
         ...s,
-        selected: sameUrl(s.url, selected.url),
+        selected: sameUrl(s.url, selectedUrl),
       })),
     ),
     // 0 and 1 are prod and community, 2 and beyond are alts
@@ -170,9 +180,10 @@ export class MarketplaceRegistryModal {
     loader.unsubscribe()
     loader.closed = false
     loader.add(this.loader.open('Changing Registry...').subscribe())
-
     try {
+      this.marketplaceService.setRegistryUrl(url)
       await this.api.setDbValue<string>(['marketplace', 'selectedUrl'], url)
+      this.context.$implicit.complete()
     } catch (e: any) {
       this.errorService.handleError(e)
     } finally {
@@ -210,7 +221,9 @@ export class MarketplaceRegistryModal {
     loader.closed = false
     loader.add(this.loader.open('Validating marketplace...').subscribe())
 
-    const { name } = await firstValueFrom(this.marketplace.fetchInfo$(url))
+    const { name } = await firstValueFrom(
+      this.marketplaceService.fetchInfo$(url),
+    )
 
     // Save
     loader.unsubscribe()
diff --git a/web/projects/ui/src/app/routes/portal/routes/system/system.module.ts b/web/projects/ui/src/app/routes/portal/routes/system/system.module.ts
index b225c171c..65681ada2 100644
--- a/web/projects/ui/src/app/routes/portal/routes/system/system.module.ts
+++ b/web/projects/ui/src/app/routes/portal/routes/system/system.module.ts
@@ -42,12 +42,12 @@ const ROUTES: Routes = [
     loadComponent: () => import('./sideload/sideload.component'),
     data: toNavigationItem('/portal/system/sideload'),
   },
-  {
-    title: systemTabResolver,
-    path: 'updates',
-    loadComponent: () => import('./updates/updates.component'),
-    data: toNavigationItem('/portal/system/updates'),
-  },
+  // {
+  //   title: systemTabResolver,
+  //   path: 'updates',
+  //   loadComponent: () => import('./updates/updates.component'),
+  //   data: toNavigationItem('/portal/system/updates'),
+  // },
   {
     title: systemTabResolver,
     path: 'metrics',
diff --git a/web/projects/ui/src/app/routes/portal/routes/system/updates/filter-updates.pipe.ts b/web/projects/ui/src/app/routes/portal/routes/system/updates/filter-updates.pipe.ts
index 3d312bf68..649a6821c 100644
--- a/web/projects/ui/src/app/routes/portal/routes/system/updates/filter-updates.pipe.ts
+++ b/web/projects/ui/src/app/routes/portal/routes/system/updates/filter-updates.pipe.ts
@@ -1,40 +1,40 @@
-import { inject, Pipe, PipeTransform } from '@angular/core'
-import { Exver } from '@start9labs/shared'
-import { MarketplacePkg } from '@start9labs/marketplace'
-import {
-  InstalledState,
-  PackageDataEntry,
-  UpdatingState,
-} from 'src/app/services/patch-db/data-model'
+// import { inject, Pipe, PipeTransform } from '@angular/core'
+// import { Exver } from '@start9labs/shared'
+// import { MarketplacePkg } from '@start9labs/marketplace'
+// import {
+//   InstalledState,
+//   PackageDataEntry,
+//   UpdatingState,
+// } from 'src/app/services/patch-db/data-model'
 
-@Pipe({
-  name: 'filterUpdates',
-  standalone: true,
-})
-export class FilterUpdatesPipe implements PipeTransform {
-  private readonly exver = inject(Exver)
+// @Pipe({
+//   name: 'filterUpdates',
+//   standalone: true,
+// })
+// export class FilterUpdatesPipe implements PipeTransform {
+//   private readonly exver = inject(Exver)
 
-  transform(
-    pkgs?: MarketplacePkg[],
-    local: Record<
-      string,
-      PackageDataEntry<InstalledState | UpdatingState>
-    > = {},
-  ): MarketplacePkg[] | null {
-    return (
-      pkgs?.filter(
-        ({ id, version, flavor }) =>
-          local[id] &&
-          this.exver.getFlavor(getVersion(local, id)) === flavor &&
-          this.exver.compareExver(version, getVersion(local, id)) === 1,
-      ) || null
-    )
-  }
-}
+//   transform(
+//     pkgs?: MarketplacePkg[],
+//     local: Record<
+//       string,
+//       PackageDataEntry<InstalledState | UpdatingState>
+//     > = {},
+//   ): MarketplacePkg[] | null {
+//     return (
+//       pkgs?.filter(
+//         ({ id, version, flavor }) =>
+//           local[id] &&
+//           this.exver.getFlavor(getVersion(local, id)) === flavor &&
+//           this.exver.compareExver(version, getVersion(local, id)) === 1,
+//       ) || null
+//     )
+//   }
+// }
 
-function getVersion(
-  local: Record<string, PackageDataEntry<InstalledState | UpdatingState>>,
-  id: string,
-): string {
-  return local[id].stateInfo.manifest.version
-}
+// function getVersion(
+//   local: Record<string, PackageDataEntry<InstalledState | UpdatingState>>,
+//   id: string,
+// ): string {
+//   return local[id].stateInfo.manifest.version
+// }
diff --git a/web/projects/ui/src/app/routes/portal/routes/system/updates/item.component.ts b/web/projects/ui/src/app/routes/portal/routes/system/updates/item.component.ts
index 60e30260a..296cf7a14 100644
--- a/web/projects/ui/src/app/routes/portal/routes/system/updates/item.component.ts
+++ b/web/projects/ui/src/app/routes/portal/routes/system/updates/item.component.ts
@@ -1,202 +1,199 @@
-import { Component, inject, Input } from '@angular/core'
-import { RouterLink } from '@angular/router'
-import {
-  AbstractMarketplaceService,
-  MarketplacePkg,
-} from '@start9labs/marketplace'
-import {
-  MarkdownPipeModule,
-  SafeLinksDirective,
-  SharedPipesModule,
-} from '@start9labs/shared'
-import {
-  TuiDialogService,
-  TuiLoader,
-  TuiIcon,
-  TuiLink,
-  TuiButton,
-} from '@taiga-ui/core'
-import {
-  TuiProgress,
-  TuiAccordion,
-  TuiAvatar,
-  TUI_CONFIRM,
-} from '@taiga-ui/kit'
-import { NgDompurifyModule } from '@tinkoff/ng-dompurify'
-import { PatchDB } from 'patch-db-client'
-import { InstallingProgressPipe } from 'src/app/routes/portal/routes/service/pipes/install-progress.pipe'
-import { MarketplaceService } from 'src/app/services/marketplace.service'
-import {
-  DataModel,
-  InstalledState,
-  PackageDataEntry,
-  UpdatingState,
-} from 'src/app/services/patch-db/data-model'
-import { getAllPackages } from 'src/app/utils/get-package-data'
-import { hasCurrentDeps } from 'src/app/utils/has-deps'
+// import { Component, inject, Input } from '@angular/core'
+// import { RouterLink } from '@angular/router'
+// import {
+//   MarketplacePkg,
+// } from '@start9labs/marketplace'
+// import {
+//   MarkdownPipeModule,
+//   SafeLinksDirective,
+//   SharedPipesModule,
+// } from '@start9labs/shared'
+// import {
+//   TuiDialogService,
+//   TuiLoader,
+//   TuiIcon,
+//   TuiLink,
+//   TuiButton,
+// } from '@taiga-ui/core'
+// import {
+//   TuiProgress,
+//   TuiAccordion,
+//   TuiAvatar,
+//   TUI_CONFIRM,
+// } from '@taiga-ui/kit'
+// import { NgDompurifyModule } from '@tinkoff/ng-dompurify'
+// import { PatchDB } from 'patch-db-client'
+// import { InstallingProgressPipe } from 'src/app/routes/portal/routes/service/pipes/install-progress.pipe'
+// import { MarketplaceService } from 'src/app/services/marketplace.service'
+// import {
+//   DataModel,
+//   InstalledState,
+//   PackageDataEntry,
+//   UpdatingState,
+// } from 'src/app/services/patch-db/data-model'
+// import { getAllPackages } from 'src/app/utils/get-package-data'
+// import { hasCurrentDeps } from 'src/app/utils/has-deps'
 
-@Component({
-  selector: 'updates-item',
-  template: `
-    <tui-accordion-item borders="top-bottom">
-      <div class="g-action">
-        <tui-avatar size="s">
-          <img alt="" [src]="marketplacePkg.icon" />
-        </tui-avatar>
-        <div [style.flex]="1" [style.overflow]="'hidden'">
-          <strong>{{ marketplacePkg.title }}</strong>
-          <div>
-            {{ localPkg.stateInfo.manifest.version }}
-            <tui-icon icon="@tui.arrow-right" [style.font-size.rem]="1" />
-            <span [style.color]="'var(--tui-text-positive)'">
-              {{ marketplacePkg.version }}
-            </span>
-          </div>
-          <div [style.color]="'var(--tui-text-negative)'">{{ errors }}</div>
-        </div>
-        @if (localPkg.stateInfo.state === 'updating') {
-          <tui-progress-circle
-            class="g-success"
-            size="s"
-            [max]="1"
-            [value]="
-              (localPkg.stateInfo.installingInfo.progress.overall
-                | installingProgress) || 0
-            "
-          />
-        } @else {
-          @if (ready) {
-            <button
-              tuiButton
-              size="s"
-              [appearance]="errors ? 'destructive' : 'primary'"
-              (click.stop)="onClick()"
-            >
-              {{ errors ? 'Retry' : 'Update' }}
-            </button>
-          } @else {
-            <tui-loader [style.width.rem]="2" [inheritColor]="true" />
-          }
-        }
-      </div>
-      <ng-template tuiAccordionItemContent>
-        <strong>What's new</strong>
-        <p
-          safeLinks
-          [innerHTML]="marketplacePkg.releaseNotes | markdown | dompurify"
-        ></p>
-        <a
-          tuiLink
-          iconEnd="@tui.external-link"
-          routerLink="/marketplace"
-          [queryParams]="{ url: url, id: marketplacePkg.id }"
-        >
-          View listing
-        </a>
-      </ng-template>
-    </tui-accordion-item>
-  `,
-  styles: [
-    `
-      :host {
-        display: block;
-        --tui-background-neutral-1-hover: transparent;
+// @Component({
+//   selector: 'updates-item',
+//   template: `
+//     <tui-accordion-item borders="top-bottom">
+//       <div class="g-action">
+//         <tui-avatar size="s">
+//           <img alt="" [src]="marketplacePkg.icon" />
+//         </tui-avatar>
+//         <div [style.flex]="1" [style.overflow]="'hidden'">
+//           <strong>{{ marketplacePkg.title }}</strong>
+//           <div>
+//             {{ localPkg.stateInfo.manifest.version }}
+//             <tui-icon icon="@tui.arrow-right" [style.font-size.rem]="1" />
+//             <span [style.color]="'var(--tui-text-positive)'">
+//               {{ marketplacePkg.version }}
+//             </span>
+//           </div>
+//           <div [style.color]="'var(--tui-text-negative)'">{{ errors }}</div>
+//         </div>
+//         @if (localPkg.stateInfo.state === 'updating') {
+//           <tui-progress-circle
+//             class="g-success"
+//             size="s"
+//             [max]="1"
+//             [value]="
+//               (localPkg.stateInfo.installingInfo.progress.overall
+//                 | installingProgress) || 0
+//             "
+//           />
+//         } @else {
+//           @if (ready) {
+//             <button
+//               tuiButton
+//               size="s"
+//               [appearance]="errors ? 'destructive' : 'primary'"
+//               (click.stop)="onClick()"
+//             >
+//               {{ errors ? 'Retry' : 'Update' }}
+//             </button>
+//           } @else {
+//             <tui-loader [style.width.rem]="2" [inheritColor]="true" />
+//           }
+//         }
+//       </div>
+//       <ng-template tuiAccordionItemContent>
+//         <strong>What's new</strong>
+//         <p
+//           safeLinks
+//           [innerHTML]="marketplacePkg.releaseNotes | markdown | dompurify"
+//         ></p>
+//         <a
+//           tuiLink
+//           iconEnd="@tui.external-link"
+//           routerLink="/marketplace"
+//           [queryParams]="{ url: url, id: marketplacePkg.id }"
+//         >
+//           View listing
+//         </a>
+//       </ng-template>
+//     </tui-accordion-item>
+//   `,
+//   styles: [
+//     `
+//       :host {
+//         display: block;
+//         --tui-background-neutral-1-hover: transparent;
 
-        &:not(:last-child) {
-          border-bottom: 1px solid var(--tui-background-neutral-1);
-        }
-      }
-    `,
-  ],
-  standalone: true,
-  imports: [
-    RouterLink,
-    MarkdownPipeModule,
-    NgDompurifyModule,
-    SafeLinksDirective,
-    SharedPipesModule,
-    TuiProgress,
-    TuiAccordion,
-    TuiAvatar,
-    TuiIcon,
-    TuiButton,
-    TuiLink,
-    TuiLoader,
-    InstallingProgressPipe,
-  ],
-})
-export class UpdatesItemComponent {
-  private readonly dialogs = inject(TuiDialogService)
-  private readonly patch = inject<PatchDB<DataModel>>(PatchDB)
-  private readonly marketplace = inject(
-    AbstractMarketplaceService,
-  ) as MarketplaceService
+//         &:not(:last-child) {
+//           border-bottom: 1px solid var(--tui-background-neutral-1);
+//         }
+//       }
+//     `,
+//   ],
+//   standalone: true,
+//   imports: [
+//     RouterLink,
+//     MarkdownPipeModule,
+//     NgDompurifyModule,
+//     SafeLinksDirective,
+//     SharedPipesModule,
+//     TuiProgress,
+//     TuiAccordion,
+//     TuiAvatar,
+//     TuiIcon,
+//     TuiButton,
+//     TuiLink,
+//     TuiLoader,
+//     InstallingProgressPipe,
+//   ],
+// })
+// export class UpdatesItemComponent {
+//   private readonly dialogs = inject(TuiDialogService)
+//   private readonly patch = inject<PatchDB<DataModel>>(PatchDB)
+//   private readonly marketplaceService = inject(MarketplaceService)
 
-  @Input({ required: true })
-  marketplacePkg!: MarketplacePkg
+//   @Input({ required: true })
+//   marketplacePkg!: MarketplacePkg
 
-  @Input({ required: true })
-  localPkg!: PackageDataEntry<InstalledState | UpdatingState>
+//   @Input({ required: true })
+//   localPkg!: PackageDataEntry<InstalledState | UpdatingState>
 
-  @Input({ required: true })
-  url!: string
+//   @Input({ required: true })
+//   url!: string
 
-  get pkgId(): string {
-    return this.marketplacePkg.id
-  }
+//   get pkgId(): string {
+//     return this.marketplacePkg.id
+//   }
 
-  get errors(): string {
-    return this.marketplace.updateErrors[this.pkgId]
-  }
+//   get errors(): string {
+//     return this.marketplaceService.updateErrors[this.pkgId]
+//   }
 
-  get ready(): boolean {
-    return !this.marketplace.updateQueue[this.pkgId]
-  }
+//   get ready(): boolean {
+//     return !this.marketplaceService.updateQueue[this.pkgId]
+//   }
 
-  async onClick() {
-    const { id } = this.marketplacePkg
+//   async onClick() {
+//     const { id } = this.marketplacePkg
 
-    delete this.marketplace.updateErrors[id]
-    this.marketplace.updateQueue[id] = true
+//     delete this.marketplaceService.updateErrors[id]
+//     this.marketplaceService.updateQueue[id] = true
 
-    if (hasCurrentDeps(id, await getAllPackages(this.patch))) {
-      const proceed = await this.alert()
+//     if (hasCurrentDeps(id, await getAllPackages(this.patch))) {
+//       const proceed = await this.alert()
 
-      if (proceed) {
-        await this.update()
-      } else {
-        delete this.marketplace.updateQueue[id]
-      }
-    } else {
-      await this.update()
-    }
-  }
+//       if (proceed) {
+//         await this.update()
+//       } else {
+//         delete this.marketplaceService.updateQueue[id]
+//       }
+//     } else {
+//       await this.update()
+//     }
+//   }
 
-  private async update() {
-    const { id, version } = this.marketplacePkg
+//   private async update() {
+//     const { id, version } = this.marketplacePkg
 
-    try {
-      await this.marketplace.installPackage(id, version, this.url)
-      delete this.marketplace.updateQueue[id]
-    } catch (e: any) {
-      delete this.marketplace.updateQueue[id]
-      this.marketplace.updateErrors[id] = e.message
-    }
-  }
+//     try {
+//       await this.marketplaceService.installPackage(id, version, this.url)
+//       delete this.marketplaceService.updateQueue[id]
+//     } catch (e: any) {
+//       delete this.marketplaceService.updateQueue[id]
+//       this.marketplaceService.updateErrors[id] = e.message
+//     }
+//   }
 
-  private async alert(): Promise<boolean> {
-    return new Promise(async resolve => {
-      this.dialogs
-        .open<boolean>(TUI_CONFIRM, {
-          label: 'Warning',
-          size: 's',
-          data: {
-            content: `Services that depend on ${this.localPkg.stateInfo.manifest.title} will no longer work properly and may crash`,
-            yes: 'Continue',
-            no: 'Cancel',
-          },
-        })
-        .subscribe(response => resolve(response))
-    })
-  }
-}
+//   private async alert(): Promise<boolean> {
+//     return new Promise(async resolve => {
+//       this.dialogs
+//         .open<boolean>(TUI_CONFIRM, {
+//           label: 'Warning',
+//           size: 's',
+//           data: {
+//             content: `Services that depend on ${this.localPkg.stateInfo.manifest.title} will no longer work properly and may crash`,
+//             yes: 'Continue',
+//             no: 'Cancel',
+//           },
+//         })
+//         .subscribe(response => resolve(response))
+//     })
+//   }
+// }
diff --git a/web/projects/ui/src/app/routes/portal/routes/system/updates/updates.component.ts b/web/projects/ui/src/app/routes/portal/routes/system/updates/updates.component.ts
index 774976c0f..1303824c0 100644
--- a/web/projects/ui/src/app/routes/portal/routes/system/updates/updates.component.ts
+++ b/web/projects/ui/src/app/routes/portal/routes/system/updates/updates.component.ts
@@ -1,98 +1,95 @@
-import { CommonModule } from '@angular/common'
-import { ChangeDetectionStrategy, Component, inject } from '@angular/core'
-import {
-  AbstractMarketplaceService,
-  StoreIconComponentModule,
-} from '@start9labs/marketplace'
-import { TuiAvatar } from '@taiga-ui/kit'
-import { TuiCell } from '@taiga-ui/layout'
-import { PatchDB } from 'patch-db-client'
-import { combineLatest, map } from 'rxjs'
-import { FilterUpdatesPipe } from 'src/app/routes/portal/routes/system/updates/filter-updates.pipe'
-import { UpdatesItemComponent } from 'src/app/routes/portal/routes/system/updates/item.component'
-import { ConfigService } from 'src/app/services/config.service'
-import { MarketplaceService } from 'src/app/services/marketplace.service'
-import {
-  DataModel,
-  InstalledState,
-  PackageDataEntry,
-  UpdatingState,
-} from 'src/app/services/patch-db/data-model'
-import { isInstalled, isUpdating } from 'src/app/utils/get-package-data'
+// import { CommonModule } from '@angular/common'
+// import { ChangeDetectionStrategy, Component, inject } from '@angular/core'
+// import {
+//   StoreIconComponentModule,
+// } from '@start9labs/marketplace'
+// import { TuiAvatar } from '@taiga-ui/kit'
+// import { TuiCell } from '@taiga-ui/layout'
+// import { PatchDB } from 'patch-db-client'
+// import { combineLatest, map } from 'rxjs'
+// import { FilterUpdatesPipe } from 'src/app/routes/portal/routes/system/updates/filter-updates.pipe'
+// import { UpdatesItemComponent } from 'src/app/routes/portal/routes/system/updates/item.component'
+// import { ConfigService } from 'src/app/services/config.service'
+// import { MarketplaceService } from 'src/app/services/marketplace.service'
+// import {
+//   DataModel,
+//   InstalledState,
+//   PackageDataEntry,
+//   UpdatingState,
+// } from 'src/app/services/patch-db/data-model'
+// import { isInstalled, isUpdating } from 'src/app/utils/get-package-data'
 
-@Component({
-  template: `
-    @if (data$ | async; as data) {
-      @for (host of data.hosts; track host) {
-        <h3 class="g-title">
-          <store-icon [url]="host.url" [marketplace]="mp" size="26px" />
-          {{ host.name }}
-        </h3>
-        @if (data.errors.includes(host.url)) {
-          <p class="g-error">Request Failed</p>
-        }
-        @if (data.mp[host.url]?.packages | filterUpdates: data.local; as pkgs) {
-          @for (pkg of pkgs; track pkg) {
-            <updates-item
-              [marketplacePkg]="pkg"
-              [localPkg]="data.local[pkg.id]"
-              [url]="host.url"
-            />
-          } @empty {
-            <p>All services are up to date!</p>
-          }
-        } @else {
-          @for (i of [0, 1, 2]; track i) {
-            <section tuiCell>
-              <tui-avatar class="tui-skeleton" />
-              <span class="tui-skeleton">Loading update item</span>
-              <span class="tui-skeleton" [style.margin-left]="'auto'">
-                Loading actions
-              </span>
-            </section>
-          }
-        }
-      }
-    }
-  `,
-  host: { class: 'g-page' },
-  changeDetection: ChangeDetectionStrategy.OnPush,
-  standalone: true,
-  imports: [
-    CommonModule,
-    TuiCell,
-    TuiAvatar,
-    StoreIconComponentModule,
-    FilterUpdatesPipe,
-    UpdatesItemComponent,
-  ],
-})
-export default class UpdatesComponent {
-  private readonly service = inject(
-    AbstractMarketplaceService,
-  ) as MarketplaceService
+// @Component({
+//   template: `
+//     @if (data$ | async; as data) {
+//       @for (host of data.hosts; track host) {
+//         <h3 class="g-title">
+//           <store-icon [url]="host.url" [marketplace]="mp" size="26px" />
+//           {{ host.name }}
+//         </h3>
+//         @if (data.errors.includes(host.url)) {
+//           <p class="g-error">Request Failed</p>
+//         }
+//         @if (data.mp[host.url]?.packages | filterUpdates: data.local; as pkgs) {
+//           @for (pkg of pkgs; track pkg) {
+//             <updates-item
+//               [marketplacePkg]="pkg"
+//               [localPkg]="data.local[pkg.id]"
+//               [url]="host.url"
+//             />
+//           } @empty {
+//             <p>All services are up to date!</p>
+//           }
+//         } @else {
+//           @for (i of [0, 1, 2]; track i) {
+//             <section tuiCell>
+//               <tui-avatar class="tui-skeleton" />
+//               <span class="tui-skeleton">Loading update item</span>
+//               <span class="tui-skeleton" [style.margin-left]="'auto'">
+//                 Loading actions
+//               </span>
+//             </section>
+//           }
+//         }
+//       }
+//     }
+//   `,
+//   host: { class: 'g-page' },
+//   changeDetection: ChangeDetectionStrategy.OnPush,
+//   standalone: true,
+//   imports: [
+//     CommonModule,
+//     TuiCell,
+//     TuiAvatar,
+//     StoreIconComponentModule,
+//     FilterUpdatesPipe,
+//     UpdatesItemComponent,
+//   ],
+// })
+// export default class UpdatesComponent {
+//   private readonly marketplaceService = inject(MarketplaceService)
 
-  readonly mp = inject(ConfigService).marketplace
-  readonly data$ = combineLatest({
-    hosts: this.service.getKnownHosts$(true),
-    mp: this.service.getMarketplace$(),
-    local: inject<PatchDB<DataModel>>(PatchDB)
-      .watch$('packageData')
-      .pipe(
-        map(pkgs =>
-          Object.entries(pkgs).reduce(
-            (acc, [id, val]) => {
-              if (isInstalled(val) || isUpdating(val))
-                return { ...acc, [id]: val }
-              return acc
-            },
-            {} as Record<
-              string,
-              PackageDataEntry<InstalledState | UpdatingState>
-            >,
-          ),
-        ),
-      ),
-    errors: this.service.getRequestErrors$(),
-  })
-}
+//   readonly mp = inject(ConfigService).marketplace
+//   readonly data$ = combineLatest({
+//     hosts: this.marketplaceService.getKnownHosts$(true),
+//     mp: this.marketplaceService.getMarketplace$(),
+//     local: inject<PatchDB<DataModel>>(PatchDB)
+//       .watch$('packageData')
+//       .pipe(
+//         map(pkgs =>
+//           Object.entries(pkgs).reduce(
+//             (acc, [id, val]) => {
+//               if (isInstalled(val) || isUpdating(val))
+//                 return { ...acc, [id]: val }
+//               return acc
+//             },
+//             {} as Record<
+//               string,
+//               PackageDataEntry<InstalledState | UpdatingState>
+//             >,
+//           ),
+//         ),
+//       ),
+//     errors: this.marketplaceService.getRequestErrors$(),
+//   })
+// }
diff --git a/web/projects/ui/src/app/services/badge.service.ts b/web/projects/ui/src/app/services/badge.service.ts
index 28917c6e8..d1b8ab062 100644
--- a/web/projects/ui/src/app/services/badge.service.ts
+++ b/web/projects/ui/src/app/services/badge.service.ts
@@ -1,5 +1,4 @@
 import { inject, Injectable } from '@angular/core'
-import { AbstractMarketplaceService } from '@start9labs/marketplace'
 import { Exver } from '@start9labs/shared'
 import { PatchDB } from 'patch-db-client'
 import {
@@ -10,7 +9,6 @@ import {
   map,
   Observable,
   pairwise,
-  shareReplay,
   startWith,
   switchMap,
 } from 'rxjs'
@@ -32,9 +30,7 @@ export class BadgeService {
     this.patch.watch$('serverInfo', 'ntpSynced'),
     inject(EOSService).updateAvailable$,
   ]).pipe(map(([synced, update]) => Number(!synced) + Number(update)))
-  private readonly marketplace = inject(
-    AbstractMarketplaceService,
-  ) as MarketplaceService
+  private readonly marketplaceService = inject(MarketplaceService)
 
   private readonly local$ = inject(ConnectionService).pipe(
     filter(Boolean),
@@ -58,35 +54,35 @@ export class BadgeService {
     ),
   )
 
-  private readonly updates$ = combineLatest([
-    this.marketplace.getMarketplace$(true),
-    this.local$,
-  ]).pipe(
-    map(
-      ([marketplace, local]) =>
-        Object.entries(marketplace).reduce(
-          (list, [_, store]) =>
-            store?.packages.reduce(
-              (result, { id, version }) =>
-                local[id] &&
-                this.exver.compareExver(
-                  version,
-                  getManifest(local[id]).version,
-                ) === 1
-                  ? result.add(id)
-                  : result,
-              list,
-            ) || list,
-          new Set<string>(),
-        ).size,
-    ),
-    shareReplay(1),
-  )
+  // private readonly updates$ = combineLatest([
+  //   this.marketplaceService.getMarketplace$(true),
+  //   this.local$,
+  // ]).pipe(
+  //   map(
+  //     ([marketplace, local]) =>
+  //       Object.entries(marketplace).reduce(
+  //         (list, [_, store]) =>
+  //           store?.packages.reduce(
+  //             (result, { id, version }) =>
+  //               local[id] &&
+  //               this.exver.compareExver(
+  //                 version,
+  //                 getManifest(local[id]).version,
+  //               ) === 1
+  //                 ? result.add(id)
+  //                 : result,
+  //             list,
+  //           ) || list,
+  //         new Set<string>(),
+  //       ).size,
+  //   ),
+  //   shareReplay(1),
+  // )
 
   getCount(id: string): Observable<number> {
     switch (id) {
-      case '/portal/system/updates':
-        return this.updates$
+      // case '/portal/system/updates':
+      //   return this.updates$
       case '/portal/system/settings':
         return this.settings$
       case '/portal/system/notifications':
diff --git a/web/projects/ui/src/app/services/marketplace.service.ts b/web/projects/ui/src/app/services/marketplace.service.ts
index 60152dbdb..23f05a2e8 100644
--- a/web/projects/ui/src/app/services/marketplace.service.ts
+++ b/web/projects/ui/src/app/services/marketplace.service.ts
@@ -1,11 +1,11 @@
 import { Injectable } from '@angular/core'
 import {
-  AbstractMarketplaceService,
   Marketplace,
   StoreIdentity,
   MarketplacePkg,
   GetPackageRes,
   StoreData,
+  StoreDataWithUrl,
 } from '@start9labs/marketplace'
 import { PatchDB } from 'patch-db-client'
 import {
@@ -26,6 +26,8 @@ import {
   switchMap,
   take,
   tap,
+  distinctUntilChanged,
+  ReplaySubject,
 } from 'rxjs'
 import { RR } from 'src/app/services/api/api.types'
 import { ApiService } from 'src/app/services/api/embassy-api.service'
@@ -34,9 +36,38 @@ import { ConfigService } from './config.service'
 import { Exver, sameUrl } from '@start9labs/shared'
 import { ClientStorageService } from './client-storage.service'
 import { T } from '@start9labs/start-sdk'
+import { Router } from '@angular/router'
+
+@Injectable({
+  providedIn: 'root',
+})
+export class MarketplaceService {
+  private readonly registryUrlSubject$ = new ReplaySubject<string>(1)
+  private readonly registryUrl$ = this.registryUrlSubject$.pipe(
+    distinctUntilChanged(),
+  )
+
+  private readonly registry$: Observable<StoreDataWithUrl> =
+    this.registryUrl$.pipe(
+      switchMap(url => this.fetchRegistry$(url)),
+      filter(Boolean),
+      map(registry => {
+        registry.info.categories = {
+          all: {
+            name: 'All',
+            description: {
+              short: 'All registry packages',
+              long: 'An unfiltered list of all packages available on this registry.',
+            },
+          },
+          ...registry.info.categories,
+        }
+
+        return registry
+      }),
+      shareReplay(1),
+    )
 
-@Injectable()
-export class MarketplaceService implements AbstractMarketplaceService {
   private readonly knownHosts$: Observable<StoreIdentity[]> = this.patch
     .watch$('ui', 'marketplace', 'knownHosts')
     .pipe(
@@ -69,71 +100,6 @@ export class MarketplaceService implements AbstractMarketplaceService {
       ),
     )
 
-  private readonly selectedHost$: Observable<StoreIdentity> = this.patch
-    .watch$('ui', 'marketplace')
-    .pipe(
-      distinctUntilKeyChanged('selectedUrl'),
-      map(({ selectedUrl: url, knownHosts: hosts }) =>
-        toStoreIdentity(url, hosts[url]),
-      ),
-      shareReplay(1),
-    )
-
-  private readonly marketplace$ = this.knownHosts$.pipe(
-    startWith<StoreIdentity[]>([]),
-    pairwise(),
-    mergeMap(([prev, curr]) =>
-      curr.filter(c => !prev.find(p => sameUrl(c.url, p.url))),
-    ),
-    mergeMap(({ url, name }) =>
-      this.fetchStore$(url).pipe(
-        tap(data => {
-          if (data?.info.name) this.updateStoreName(url, name, data.info.name)
-        }),
-        map<StoreData | null, [string, StoreData | null]>(data => [url, data]),
-        startWith<[string, StoreData | null]>([url, null]),
-      ),
-    ),
-    scan<[string, StoreData | null], Record<string, StoreData | null>>(
-      (requests, [url, store]) => {
-        requests[url] = store
-
-        return requests
-      },
-      {},
-    ),
-    shareReplay(1),
-  )
-
-  private readonly filteredMarketplace$ = combineLatest([
-    this.clientStorageService.showDevTools$,
-    this.marketplace$,
-  ]).pipe(
-    map(([devMode, marketplace]) =>
-      Object.entries(marketplace).reduce(
-        (filtered, [url, store]) =>
-          !devMode && (url.includes('alpha') || url.includes('beta'))
-            ? filtered
-            : {
-                [url]: store,
-                ...filtered,
-              },
-        {} as Marketplace,
-      ),
-    ),
-  )
-
-  private readonly selectedRegistry$: Observable<StoreData> =
-    this.selectedHost$.pipe(
-      switchMap(({ url }) =>
-        this.marketplace$.pipe(
-          map(m => m[url]),
-          filter(Boolean),
-          take(1),
-        ),
-      ),
-    )
-
   private readonly requestErrors$ = new BehaviorSubject<string[]>([])
 
   constructor(
@@ -142,6 +108,7 @@ export class MarketplaceService implements AbstractMarketplaceService {
     private readonly config: ConfigService,
     private readonly clientStorageService: ClientStorageService,
     private readonly exver: Exver,
+    private readonly router: Router,
   ) {}
 
   getKnownHosts$(filtered = false): Observable<StoreIdentity[]> {
@@ -149,32 +116,32 @@ export class MarketplaceService implements AbstractMarketplaceService {
     return filtered ? this.filteredKnownHosts$ : this.knownHosts$
   }
 
-  getSelectedHost$(): Observable<StoreIdentity> {
-    return this.selectedHost$
+  getRegistryUrl$() {
+    return this.registryUrl$
   }
 
-  getMarketplace$(filtered = false): Observable<Marketplace> {
-    // option to filter out hosts containing 'alpha' or 'beta' substrings in registryURL
-    return filtered ? this.filteredMarketplace$ : this.marketplace$
+  getRegistry$(): Observable<StoreDataWithUrl> {
+    return this.registry$
   }
 
-  getSelectedRegistry$(): Observable<StoreData> {
-    return this.selectedRegistry$
+  setRegistryUrl(url: string | null) {
+    const registryUrl = url || this.config.marketplace.start9
+    this.router.navigate([], {
+      queryParams: { registry: url },
+      queryParamsHandling: 'merge',
+    })
+    this.registryUrlSubject$.next(registryUrl)
   }
 
-  getRegistry$() {
-    return this.selectedHost$.pipe(
-      switchMap(({ url }) =>
-        this.marketplace$.pipe(
-          map(m => m[url]),
-          filter(Boolean),
-          map(({ info, packages }) => ({
-            url,
-            info,
-            packages,
-          })),
-        ),
-      ),
+  private fetchRegistry$(url: string): Observable<StoreDataWithUrl | null> {
+    console.log('FETCHING REGISTRY: ', url)
+    return combineLatest([this.fetchInfo$(url), this.fetchPackages$(url)]).pipe(
+      map(([info, packages]) => ({ info, packages, url })),
+      catchError(e => {
+        console.error(e)
+        this.requestErrors$.next(this.requestErrors$.value.concat(url))
+        return of(null)
+      }),
     )
   }
 
@@ -184,18 +151,17 @@ export class MarketplaceService implements AbstractMarketplaceService {
     flavor: string | null,
     registryUrl?: string,
   ): Observable<MarketplacePkg> {
-    return this.selectedHost$.pipe(
-      switchMap(selected =>
-        this.marketplace$.pipe(
-          switchMap(m => {
-            const url = registryUrl || selected.url
-            const pkg = m[url]?.packages.find(
+    return this.registry$.pipe(
+      switchMap(({ url: selectedUrl }) =>
+        this.registry$.pipe(
+          switchMap(registry => {
+            const url = registryUrl || selectedUrl
+            const pkg = registry.packages.find(
               p =>
                 p.id === id &&
                 p.flavor === flavor &&
                 (!version || this.exver.compareExver(p.version, version) === 0),
             )
-
             return pkg ? of(pkg) : this.fetchPackage$(url, id, version, flavor)
           }),
         ),
@@ -247,17 +213,6 @@ export class MarketplaceService implements AbstractMarketplaceService {
     return from(this.api.getStaticProxy(pkg, type))
   }
 
-  private fetchStore$(url: string): Observable<StoreData | null> {
-    return combineLatest([this.fetchInfo$(url), this.fetchPackages$(url)]).pipe(
-      map(([info, packages]) => ({ info, packages })),
-      catchError(e => {
-        console.error(e)
-        this.requestErrors$.next(this.requestErrors$.value.concat(url))
-        return of(null)
-      }),
-    )
-  }
-
   private fetchPackages$(url: string): Observable<MarketplacePkg[]> {
     return from(this.api.getRegistryPackages(url)).pipe(
       map(packages => {
diff --git a/web/projects/ui/src/app/services/patch-data.service.ts b/web/projects/ui/src/app/services/patch-data.service.ts
index ae42987bd..35c86550e 100644
--- a/web/projects/ui/src/app/services/patch-data.service.ts
+++ b/web/projects/ui/src/app/services/patch-data.service.ts
@@ -1,14 +1,12 @@
-import { Inject, Injectable } from '@angular/core'
-import { AbstractMarketplaceService } from '@start9labs/marketplace'
+import { Injectable } from '@angular/core'
 import { TuiDialogService } from '@taiga-ui/core'
-import { filter, share, switchMap, take, Observable, map } from 'rxjs'
+import { filter, share, switchMap, Observable, map } from 'rxjs'
 import { PatchDB } from 'patch-db-client'
 import { DataModel } from 'src/app/services/patch-db/data-model'
 import { EOSService } from 'src/app/services/eos.service'
 import { WelcomeComponent } from 'src/app/components/welcome.component'
 import { ConfigService } from 'src/app/services/config.service'
 import { ApiService } from 'src/app/services/api/embassy-api.service'
-import { MarketplaceService } from 'src/app/services/marketplace.service'
 import { ConnectionService } from 'src/app/services/connection.service'
 import { PolymorpheusComponent } from '@taiga-ui/polymorpheus'
 import { LocalStorageBootstrap } from './patch-db/local-storage-bootstrap'
@@ -40,8 +38,6 @@ export class PatchDataService extends Observable<void> {
     private readonly config: ConfigService,
     private readonly dialogs: TuiDialogService,
     private readonly embassyApi: ApiService,
-    @Inject(AbstractMarketplaceService)
-    private readonly marketplaceService: MarketplaceService,
     private readonly connection$: ConnectionService,
     private readonly bootstrapper: LocalStorageBootstrap,
   ) {
@@ -50,7 +46,7 @@ export class PatchDataService extends Observable<void> {
 
   private checkForUpdates(): void {
     this.eosService.loadEos()
-    this.marketplaceService.getMarketplace$().pipe(take(1)).subscribe()
+    // this.marketplaceService.getMarketplace$().pipe(take(1)).subscribe()
   }
 
   private showEosWelcome(ackVersion: string) {
diff --git a/web/projects/ui/src/app/utils/system-utilities.ts b/web/projects/ui/src/app/utils/system-utilities.ts
index 825904955..c726c8170 100644
--- a/web/projects/ui/src/app/utils/system-utilities.ts
+++ b/web/projects/ui/src/app/utils/system-utilities.ts
@@ -12,10 +12,10 @@ export const SYSTEM_UTILITIES: Record<string, { icon: string; title: string }> =
       icon: '@tui.shopping-cart',
       title: 'Marketplace',
     },
-    '/portal/system/updates': {
-      icon: '@tui.globe',
-      title: 'Updates',
-    },
+    // '/portal/system/updates': {
+    //   icon: '@tui.globe',
+    //   title: 'Updates',
+    // },
     '/portal/system/sideload': {
       icon: '@tui.upload',
       title: 'Sideload',