diff --git a/src/app/core/constants/nav-items.constant.ts b/src/app/core/constants/nav-items.constant.ts
index cb8e29bf0..0ce0a1e9c 100644
--- a/src/app/core/constants/nav-items.constant.ts
+++ b/src/app/core/constants/nav-items.constant.ts
@@ -82,6 +82,13 @@ export const PROJECT_MENU_ITEMS: MenuItem[] = [
     visible: true,
     routerLinkActiveOptions: { exact: true },
   },
+  {
+    id: 'project-linked-services',
+    label: 'navigation.linkedServices',
+    routerLink: 'links',
+    visible: true,
+    routerLinkActiveOptions: { exact: true },
+  },
   {
     id: 'project-settings',
     label: 'navigation.settings',
diff --git a/src/app/features/files/pages/files/files.component.spec.ts b/src/app/features/files/pages/files/files.component.spec.ts
index 58e9e79bb..2fefa3ed7 100644
--- a/src/app/features/files/pages/files/files.component.spec.ts
+++ b/src/app/features/files/pages/files/files.component.spec.ts
@@ -21,7 +21,7 @@ import {
   SubHeaderComponent,
   ViewOnlyLinkMessageComponent,
 } from '@osf/shared/components';
-import { GoogleFilePickerComponent } from '@osf/shared/components/addons/folder-selector/google-file-picker/google-file-picker.component';
+import { GoogleFilePickerComponent } from '@osf/shared/components/addons/storage-item-selector/google-file-picker/google-file-picker.component';
 import { OsfFile } from '@osf/shared/models';
 import { CustomConfirmationService, FilesService } from '@osf/shared/services';
 
diff --git a/src/app/features/files/pages/files/files.component.ts b/src/app/features/files/pages/files/files.component.ts
index e0d819218..b437410aa 100644
--- a/src/app/features/files/pages/files/files.component.ts
+++ b/src/app/features/files/pages/files/files.component.ts
@@ -44,7 +44,6 @@ import {
   SetSearch,
   SetSort,
 } from '@osf/features/files/store';
-import { GoogleFilePickerComponent } from '@osf/shared/components/addons/folder-selector/google-file-picker/google-file-picker.component';
 import { ALL_SORT_OPTIONS } from '@osf/shared/constants';
 import { ResourceType } from '@osf/shared/enums';
 import { hasViewOnlyParam, IS_MEDIUM } from '@osf/shared/helpers';
@@ -56,13 +55,8 @@ import {
   SubHeaderComponent,
   ViewOnlyLinkMessageComponent,
 } from '@shared/components';
-import {
-  ConfiguredStorageAddonModel,
-  FileLabelModel,
-  FilesTreeActions,
-  OsfFile,
-  StorageItemModel,
-} from '@shared/models';
+import { GoogleFilePickerComponent } from '@shared/components/addons/storage-item-selector/google-file-picker/google-file-picker.component';
+import { ConfiguredAddonModel, FileLabelModel, FilesTreeActions, OsfFile, StorageItemModel } from '@shared/models';
 import { FilesService } from '@shared/services';
 
 import { CreateFolderDialogComponent, FileBrowserInfoComponent } from '../../components';
@@ -389,7 +383,7 @@ export class FilesComponent {
     this.router.navigate([file.guid], { relativeTo: this.activeRoute });
   }
 
-  getAddonName(addons: ConfiguredStorageAddonModel[], provider: string): string {
+  getAddonName(addons: ConfiguredAddonModel[], provider: string): string {
     if (provider === 'osfstorage') {
       return this.translateService.instant('files.storageLocation');
     } else {
@@ -407,7 +401,7 @@ export class FilesComponent {
     if (googleDrive) {
       this.accountId.set(googleDrive.baseAccountId);
       this.selectedRootFolder.set({
-        itemId: googleDrive.selectedFolderId,
+        itemId: googleDrive.selectedStorageItemId,
       });
     }
   }
diff --git a/src/app/features/files/store/files.model.ts b/src/app/features/files/store/files.model.ts
index 3cb6baac1..895245488 100644
--- a/src/app/features/files/store/files.model.ts
+++ b/src/app/features/files/store/files.model.ts
@@ -1,5 +1,5 @@
 import { ContributorModel, OsfFile, ResourceMetadata } from '@shared/models';
-import { ConfiguredStorageAddonModel } from '@shared/models/addons';
+import { ConfiguredAddonModel } from '@shared/models/addons';
 import { AsyncStateModel, AsyncStateWithTotalCount } from '@shared/models/store';
 
 import { FileProvider } from '../constants';
@@ -20,7 +20,7 @@ export interface FilesStateModel {
   fileRevisions: AsyncStateModel<OsfFileRevision[] | null>;
   tags: AsyncStateModel<string[]>;
   rootFolders: AsyncStateModel<OsfFile[] | null>;
-  configuredStorageAddons: AsyncStateModel<ConfiguredStorageAddonModel[] | null>;
+  configuredStorageAddons: AsyncStateModel<ConfiguredAddonModel[] | null>;
   isAnonymous: boolean;
 }
 
diff --git a/src/app/features/files/store/files.selectors.ts b/src/app/features/files/store/files.selectors.ts
index 43434bae2..1c0ce291c 100644
--- a/src/app/features/files/store/files.selectors.ts
+++ b/src/app/features/files/store/files.selectors.ts
@@ -1,6 +1,6 @@
 import { Selector } from '@ngxs/store';
 
-import { ConfiguredStorageAddonModel, ContributorModel, OsfFile, ResourceMetadata } from '@shared/models';
+import { ConfiguredAddonModel, ContributorModel, OsfFile, ResourceMetadata } from '@shared/models';
 
 import { OsfFileCustomMetadata, OsfFileRevision } from '../models';
 
@@ -129,7 +129,7 @@ export class FilesSelectors {
   }
 
   @Selector([FilesState])
-  static getConfiguredStorageAddons(state: FilesStateModel): ConfiguredStorageAddonModel[] | null {
+  static getConfiguredStorageAddons(state: FilesStateModel): ConfiguredAddonModel[] | null {
     return state.configuredStorageAddons.data;
   }
 
diff --git a/src/app/features/project/addons/addons.component.html b/src/app/features/project/addons/addons.component.html
index bf228d176..8ebdf9cfb 100644
--- a/src/app/features/project/addons/addons.component.html
+++ b/src/app/features/project/addons/addons.component.html
@@ -1,4 +1,4 @@
-<osf-sub-header [title]="'settings.addons.header.title' | translate" [icon]="'fas fa-gear'" />
+<osf-sub-header [title]="'settings.addons.header.title' | translate" />
 <section class="flex-column flex flex-1">
   <p-tabs [value]="selectedTab()" class="flex flex-1">
     <p-tablist class="pr-5 pl-5 hidden md:flex md:flex-column">
diff --git a/src/app/features/project/addons/addons.component.ts b/src/app/features/project/addons/addons.component.ts
index 0b6606d1d..43656c346 100644
--- a/src/app/features/project/addons/addons.component.ts
+++ b/src/app/features/project/addons/addons.component.ts
@@ -33,7 +33,9 @@ import {
   GetAddonsUserReference,
   GetCitationAddons,
   GetConfiguredCitationAddons,
+  GetConfiguredLinkAddons,
   GetConfiguredStorageAddons,
+  GetLinkAddons,
   GetStorageAddons,
 } from '@shared/stores/addons';
 
@@ -60,84 +62,126 @@ import {
 export class AddonsComponent implements OnInit {
   private route = inject(ActivatedRoute);
   private destroyRef = inject(DestroyRef);
-  protected readonly tabOptions = ADDON_TAB_OPTIONS;
-  protected readonly categoryOptions = ADDON_CATEGORY_OPTIONS;
-  protected readonly AddonTabValue = AddonTabValue;
-  protected readonly defaultTabValue = AddonTabValue.ALL_ADDONS;
-  protected searchControl = new FormControl<string>('');
-  protected searchValue = signal<string>('');
-  protected selectedCategory = signal<string>(AddonCategory.EXTERNAL_STORAGE_SERVICES);
-  protected selectedTab = signal<number>(this.defaultTabValue);
-
-  protected currentUser = select(UserSelectors.getCurrentUser);
-  protected addonsResourceReference = select(AddonsSelectors.getAddonsResourceReference);
-  protected addonsUserReference = select(AddonsSelectors.getAddonsUserReference);
-  protected storageAddons = select(AddonsSelectors.getStorageAddons);
-  protected citationAddons = select(AddonsSelectors.getCitationAddons);
-  protected configuredStorageAddons = select(AddonsSelectors.getConfiguredStorageAddons);
-  protected configuredCitationAddons = select(AddonsSelectors.getConfiguredCitationAddons);
-
-  protected isCurrentUserLoading = select(UserSelectors.getCurrentUserLoading);
-  protected isUserReferenceLoading = select(AddonsSelectors.getAddonsUserReferenceLoading);
-  protected isResourceReferenceLoading = select(AddonsSelectors.getAddonsResourceReferenceLoading);
-  protected isStorageAddonsLoading = select(AddonsSelectors.getStorageAddonsLoading);
-  protected isCitationAddonsLoading = select(AddonsSelectors.getCitationAddonsLoading);
-  protected isConfiguredStorageAddonsLoading = select(AddonsSelectors.getConfiguredStorageAddonsLoading);
-  protected isConfiguredCitationAddonsLoading = select(AddonsSelectors.getConfiguredCitationAddonsLoading);
-  protected isAddonsLoading = computed(() => {
+  readonly tabOptions = ADDON_TAB_OPTIONS;
+  readonly categoryOptions = ADDON_CATEGORY_OPTIONS;
+  readonly AddonTabValue = AddonTabValue;
+  readonly defaultTabValue = AddonTabValue.ALL_ADDONS;
+  searchControl = new FormControl<string>('');
+  searchValue = signal<string>('');
+  selectedCategory = signal<string>(AddonCategory.EXTERNAL_STORAGE_SERVICES);
+  selectedTab = signal<number>(this.defaultTabValue);
+
+  currentUser = select(UserSelectors.getCurrentUser);
+  addonsResourceReference = select(AddonsSelectors.getAddonsResourceReference);
+  addonsUserReference = select(AddonsSelectors.getAddonsUserReference);
+  storageAddons = select(AddonsSelectors.getStorageAddons);
+  citationAddons = select(AddonsSelectors.getCitationAddons);
+  linkAddons = select(AddonsSelectors.getLinkAddons);
+  configuredStorageAddons = select(AddonsSelectors.getConfiguredStorageAddons);
+  configuredCitationAddons = select(AddonsSelectors.getConfiguredCitationAddons);
+  configuredLinkAddons = select(AddonsSelectors.getConfiguredLinkAddons);
+
+  isCurrentUserLoading = select(UserSelectors.getCurrentUserLoading);
+  isUserReferenceLoading = select(AddonsSelectors.getAddonsUserReferenceLoading);
+  isResourceReferenceLoading = select(AddonsSelectors.getAddonsResourceReferenceLoading);
+  isStorageAddonsLoading = select(AddonsSelectors.getStorageAddonsLoading);
+  isCitationAddonsLoading = select(AddonsSelectors.getCitationAddonsLoading);
+  isConfiguredStorageAddonsLoading = select(AddonsSelectors.getConfiguredStorageAddonsLoading);
+  isConfiguredCitationAddonsLoading = select(AddonsSelectors.getConfiguredCitationAddonsLoading);
+  isConfiguredLinkAddonsLoading = select(AddonsSelectors.getConfiguredLinkAddonsLoading);
+  isAddonsLoading = computed(() => {
     return (
       this.isStorageAddonsLoading() ||
       this.isCitationAddonsLoading() ||
+      this.isLinkAddonsLoading() ||
       this.isUserReferenceLoading() ||
       this.isCurrentUserLoading()
     );
   });
-  protected isConfiguredAddonsLoading = computed(() => {
+  isConfiguredAddonsLoading = computed(() => {
     return (
       this.isConfiguredStorageAddonsLoading() ||
       this.isConfiguredCitationAddonsLoading() ||
+      this.isConfiguredLinkAddonsLoading() ||
       this.isResourceReferenceLoading() ||
       this.isCurrentUserLoading()
     );
   });
 
-  protected actions = createDispatchMap({
+  isLinkAddonsLoading = select(AddonsSelectors.getLinkAddonsLoading);
+
+  currentAddonsLoading = computed(() => {
+    switch (this.selectedCategory()) {
+      case AddonCategory.EXTERNAL_STORAGE_SERVICES:
+        return this.isStorageAddonsLoading();
+      case AddonCategory.EXTERNAL_CITATION_SERVICES:
+        return this.isCitationAddonsLoading();
+      case AddonCategory.EXTERNAL_LINK_SERVICES:
+        return this.isLinkAddonsLoading();
+      default:
+        return this.isStorageAddonsLoading();
+    }
+  });
+
+  actions = createDispatchMap({
     getStorageAddons: GetStorageAddons,
     getCitationAddons: GetCitationAddons,
+    getLinkAddons: GetLinkAddons,
     getConfiguredStorageAddons: GetConfiguredStorageAddons,
     getConfiguredCitationAddons: GetConfiguredCitationAddons,
+    getConfiguredLinkAddons: GetConfiguredLinkAddons,
     getAddonsUserReference: GetAddonsUserReference,
     getAddonsResourceReference: GetAddonsResourceReference,
     deleteAuthorizedAddon: DeleteAuthorizedAddon,
     clearConfiguredAddons: ClearConfiguredAddons,
   });
 
-  protected readonly userReferenceId = computed(() => {
+  readonly userReferenceId = computed(() => {
     return this.addonsUserReference()[0]?.id;
   });
 
-  protected allConfiguredAddons = computed(() => {
-    const authorizedAddons = [...this.configuredStorageAddons(), ...this.configuredCitationAddons()];
+  allConfiguredAddons = computed(() => {
+    const authorizedAddons = [
+      ...this.configuredStorageAddons(),
+      ...this.configuredCitationAddons(),
+      ...this.configuredLinkAddons(),
+    ];
 
     const searchValue = this.searchValue().toLowerCase();
     return authorizedAddons.filter((card) => card.displayName.toLowerCase().includes(searchValue));
   });
 
-  protected resourceReferenceId = computed(() => {
+  resourceReferenceId = computed(() => {
     return this.addonsResourceReference()[0]?.id;
   });
 
-  protected currentAction = computed(() =>
-    this.selectedCategory() === AddonCategory.EXTERNAL_STORAGE_SERVICES
-      ? this.actions.getStorageAddons
-      : this.actions.getCitationAddons
-  );
+  currentAction = computed(() => {
+    switch (this.selectedCategory()) {
+      case AddonCategory.EXTERNAL_STORAGE_SERVICES:
+        return this.actions.getStorageAddons;
+      case AddonCategory.EXTERNAL_CITATION_SERVICES:
+        return this.actions.getCitationAddons;
+      case AddonCategory.EXTERNAL_LINK_SERVICES:
+        return this.actions.getLinkAddons;
+      default:
+        return this.actions.getStorageAddons;
+    }
+  });
 
-  protected currentAddonsState = computed(() =>
-    this.selectedCategory() === AddonCategory.EXTERNAL_STORAGE_SERVICES ? this.storageAddons() : this.citationAddons()
-  );
+  currentAddonsState = computed(() => {
+    switch (this.selectedCategory()) {
+      case AddonCategory.EXTERNAL_STORAGE_SERVICES:
+        return this.storageAddons();
+      case AddonCategory.EXTERNAL_CITATION_SERVICES:
+        return this.citationAddons();
+      case AddonCategory.EXTERNAL_LINK_SERVICES:
+        return this.linkAddons();
+      default:
+        return this.storageAddons();
+    }
+  });
 
-  protected filteredAddonCards = computed(() => {
+  filteredAddonCards = computed(() => {
     const searchValue = this.searchValue().toLowerCase();
     return this.currentAddonsState().filter(
       (card) =>
@@ -146,7 +190,7 @@ export class AddonsComponent implements OnInit {
     );
   });
 
-  protected onCategoryChange(value: Primitive): void {
+  onCategoryChange(value: Primitive): void {
     if (typeof value === 'string') {
       this.selectedCategory.set(value);
     }
@@ -163,8 +207,9 @@ export class AddonsComponent implements OnInit {
       if (this.currentUser()) {
         const action = this.currentAction();
         const addons = this.currentAddonsState();
+        const isLoading = this.currentAddonsLoading();
 
-        if (!addons?.length) {
+        if (!addons?.length && !isLoading) {
           action();
         }
       }
@@ -199,5 +244,6 @@ export class AddonsComponent implements OnInit {
   private fetchAllConfiguredAddons(resourceReferenceId: string): void {
     this.actions.getConfiguredStorageAddons(resourceReferenceId);
     this.actions.getConfiguredCitationAddons(resourceReferenceId);
+    this.actions.getConfiguredLinkAddons(resourceReferenceId);
   }
 }
diff --git a/src/app/features/project/addons/components/configure-addon/configure-addon.component.html b/src/app/features/project/addons/components/configure-addon/configure-addon.component.html
index 9e2993dd6..977fdcf37 100644
--- a/src/app/features/project/addons/components/configure-addon/configure-addon.component.html
+++ b/src/app/features/project/addons/components/configure-addon/configure-addon.component.html
@@ -5,7 +5,7 @@
     <div class="flex flex-column gap-4">
       <div class="flex justify-content-between">
         <h2 class="align-self-center inline-block">
-          {{ 'settings.addons.connectAddon.configure' | translate }} {{ addon()?.externalServiceName }}
+          {{ 'settings.addons.connectAddon.configure' | translate }} {{ addonServiceName() }}
         </h2>
         <p-button
           [label]="'settings.addons.form.buttons.back' | translate"
@@ -14,7 +14,7 @@ <h2 class="align-self-center inline-block">
         ></p-button>
       </div>
 
-      @if (selectedFolder()) {
+      @if (selectedStorageItem()) {
         <div class="flex flex-column flex-1">
           <p-card>
             <div class="flex justify-content-between">
@@ -41,8 +41,8 @@ <h2 class="align-self-center inline-block">
             </div>
 
             <p class="font-normal mt-2">
-              {{ 'settings.addons.configureAddon.selectedFolder' | translate }}
-              <span class="font-bold">{{ selectedFolder()?.itemName }}</span>
+              {{ selectedItemLabel() | translate }}
+              <span class="font-bold">{{ selectedStorageItem()?.itemName }}</span>
             </p>
           </p-card>
         </div>
@@ -54,7 +54,7 @@ <h2 class="align-self-center inline-block">
     <section class="flex flex-column gap-5">
       <div class="flex justify-content-between">
         <h2 class="align-self-center">
-          {{ 'settings.addons.connectAddon.configure' | translate }} {{ addon()?.externalServiceName }}
+          {{ 'settings.addons.connectAddon.configure' | translate }} {{ addonServiceName() }}
         </h2>
         <p-button
           [label]="'settings.addons.form.buttons.back' | translate"
@@ -63,14 +63,18 @@ <h2 class="align-self-center">
           (keydown.enter)="toggleEditMode()"
         ></p-button>
       </div>
-      <osf-folder-selector
+      <osf-storage-item-selector
         [isGoogleFilePicker]="isGoogleDrive()"
         [accountId]="addon()?.baseAccountId || ''"
         [accountName]="addon()?.displayName || ''"
         [operationInvocationResult]="operationInvocation()?.operationResult || []"
         [accountNameControl]="accountNameControl"
+        [currentAddonType]="addonTypeString()"
+        [supportedResourceTypes]="supportedResourceTypes()"
         (operationInvoke)="handleCreateOperationInvocation($event.operationName, $event.itemId)"
-        [(selectedRootFolderId)]="selectedRootFolderId"
+        [(selectedStorageItemId)]="selectedStorageItemId"
+        [(selectedStorageItemUrl)]="selectedStorageItemUrl"
+        [(selectedResourceType)]="selectedResourceType"
         (save)="handleUpdateAddonConfiguration()"
         (cancelSelection)="toggleEditMode()"
       />
diff --git a/src/app/features/project/addons/components/configure-addon/configure-addon.component.spec.ts b/src/app/features/project/addons/components/configure-addon/configure-addon.component.spec.ts
index 1b041160f..92fa799fd 100644
--- a/src/app/features/project/addons/components/configure-addon/configure-addon.component.spec.ts
+++ b/src/app/features/project/addons/components/configure-addon/configure-addon.component.spec.ts
@@ -94,7 +94,7 @@ describe('Component: Configure Addon', () => {
       expect(component.baseUrl()).toBe('/project/abc123');
       expect(component.resourceUri()).toBe('https://staging4.osf.io/mocked-id');
       expect(component.addonTypeString()).toBe('storage');
-      expect(component.selectedRootFolderId()).toBeUndefined();
+      expect(component.selectedStorageItemId).toBeDefined();
       expect(component.accountNameControl.value).toBeUndefined();
       expect(component.isGoogleDrive()).toBeFalsy();
     });
diff --git a/src/app/features/project/addons/components/configure-addon/configure-addon.component.ts b/src/app/features/project/addons/components/configure-addon/configure-addon.component.ts
index 20d622702..52b57b7fd 100644
--- a/src/app/features/project/addons/components/configure-addon/configure-addon.component.ts
+++ b/src/app/features/project/addons/components/configure-addon/configure-addon.component.ts
@@ -24,13 +24,15 @@ import { ActivatedRoute, Router, RouterLink } from '@angular/router';
 import { OperationNames } from '@osf/features/project/addons/enums';
 import { getAddonTypeString } from '@osf/shared/helpers';
 import { SubHeaderComponent } from '@shared/components';
-import { FolderSelectorComponent } from '@shared/components/addons/folder-selector/folder-selector.component';
-import { AddonModel, ConfiguredStorageAddonModel } from '@shared/models';
+import { StorageItemSelectorComponent } from '@shared/components/addons';
+import { AddonServiceNames, AddonType } from '@shared/enums';
+import { AddonModel, ConfiguredAddonModel } from '@shared/models';
 import { AddonDialogService, AddonFormService, AddonOperationInvocationService, ToastService } from '@shared/services';
 import {
   AddonsSelectors,
   ClearOperationInvocations,
   CreateAddonOperationInvocation,
+  GetLinkAddons,
   UpdateConfiguredAddon,
 } from '@shared/stores/addons';
 
@@ -48,7 +50,8 @@ import { environment } from 'src/environments/environment';
     FormsModule,
     Skeleton,
     BreadcrumbModule,
-    FolderSelectorComponent,
+    StorageItemSelectorComponent,
+    StorageItemSelectorComponent,
   ],
   templateUrl: './configure-addon.component.html',
   styleUrl: './configure-addon.component.scss',
@@ -63,36 +66,25 @@ export class ConfigureAddonComponent implements OnInit {
   private addonDialogService = inject(AddonDialogService);
   private addonFormService = inject(AddonFormService);
   private operationInvocationService = inject(AddonOperationInvocationService);
-  /**
-   * Injected NGXS store used to access and dispatch state actions and selectors.
-   */
   private store = inject(Store);
-
-  /**
-   * Form control for capturing or displaying the user’s selected account name.
-   */
-  public accountNameControl = new FormControl('');
-  /**
-   * Signal representing the currently selected `Addon` from the list of available storage addons.
-   * This value updates reactively as the selection changes.
-   */
-  public storageAddon = signal<AddonModel | null>(null);
-  /**
-   * Signal representing the currently selected and configured storage addon model.
-   * This may be `null` if no addon has been configured.
-   */
-  public addon = signal<ConfiguredStorageAddonModel | null>(null);
-
-  public readonly isGoogleDrive = computed(() => {
+  accountNameControl = new FormControl('');
+  storageAddon = signal<AddonModel | null>(null);
+  addon = signal<ConfiguredAddonModel | null>(null);
+  readonly isGoogleDrive = computed(() => {
     return this.storageAddon()?.wbKey === 'googledrive';
   });
-
-  protected isEditMode = signal<boolean>(false);
-  public selectedRootFolderId = signal('');
-  protected addonsUserReference = select(AddonsSelectors.getAddonsUserReference);
-  public operationInvocation = select(AddonsSelectors.getOperationInvocation);
-  protected selectedFolderOperationInvocation = select(AddonsSelectors.getSelectedFolderOperationInvocation);
-  protected selectedFolder = select(AddonsSelectors.getSelectedFolder);
+  isEditMode = signal<boolean>(false);
+  selectedStorageItemId = signal('');
+  selectedStorageItemUrl = signal('');
+  selectedResourceType = signal('');
+  addonsUserReference = select(AddonsSelectors.getAddonsUserReference);
+  operationInvocation = select(AddonsSelectors.getOperationInvocation);
+  linkAddons = select(AddonsSelectors.getLinkAddons);
+  selectedStorageItem = select(AddonsSelectors.getSelectedStorageItem);
+
+  addonServiceName = computed(() => {
+    return AddonServiceNames[this.addon()?.externalServiceName as keyof typeof AddonServiceNames];
+  });
 
   readonly baseUrl = computed(() => {
     const currentUrl = this.router.url;
@@ -105,10 +97,24 @@ export class ConfigureAddonComponent implements OnInit {
   readonly addonTypeString = computed(() => {
     return getAddonTypeString(this.addon());
   });
-  protected readonly actions = createDispatchMap({
+  readonly selectedItemLabel = computed(() => {
+    const addonType = this.addonTypeString();
+    return addonType === AddonType.LINK
+      ? 'settings.addons.configureAddon.linkedItem'
+      : 'settings.addons.configureAddon.selectedFolder';
+  });
+  readonly supportedResourceTypes = computed(() => {
+    if (this.linkAddons().length && this.addonTypeString() === AddonType.LINK) {
+      const addon = this.linkAddons().find((a) => this.addon()?.externalServiceName === a.externalServiceName);
+      return addon?.supportedResourceTypes || [];
+    }
+    return [];
+  });
+  readonly actions = createDispatchMap({
     createAddonOperationInvocation: CreateAddonOperationInvocation,
     updateConfiguredAddon: UpdateConfiguredAddon,
     clearOperationInvocations: ClearOperationInvocations,
+    getLinkAddons: GetLinkAddons,
   });
 
   constructor() {
@@ -119,12 +125,18 @@ export class ConfigureAddonComponent implements OnInit {
         this.actions.clearOperationInvocations();
       });
     });
+
+    effect(() => {
+      if (this.addonTypeString() === AddonType.LINK) {
+        this.actions.getLinkAddons();
+      }
+    });
   }
 
   private initializeAddon(): void {
     // TODO this should be reviewed to have the addon be retrieved from the store
     // I have limited my testing because it will create a false/positive test based on the required data
-    const addon = this.router.getCurrentNavigation()?.extras.state?.['addon'] as ConfiguredStorageAddonModel;
+    const addon = this.router.getCurrentNavigation()?.extras.state?.['addon'] as ConfiguredAddonModel;
 
     if (addon) {
       this.storageAddon.set(
@@ -132,14 +144,16 @@ export class ConfigureAddonComponent implements OnInit {
       );
 
       this.addon.set(addon);
-      this.selectedRootFolderId.set(addon.selectedFolderId);
+      this.selectedStorageItemId.set(addon.selectedStorageItemId);
+      this.selectedStorageItemUrl.set(addon.targetUrl || '');
+      this.selectedResourceType.set(addon.resourceType || '');
       this.accountNameControl.setValue(addon.displayName);
     } else {
       this.router.navigate([`${this.baseUrl()}/addons`]);
     }
   }
 
-  protected handleCreateOperationInvocation(operationName: OperationNames, folderId: string): void {
+  handleCreateOperationInvocation(operationName: OperationNames, folderId: string): void {
     const addon = this.addon();
     if (!addon) return;
 
@@ -149,17 +163,17 @@ export class ConfigureAddonComponent implements OnInit {
   }
 
   ngOnInit(): void {
-    this.handleCreateOperationInvocation(OperationNames.GET_ITEM_INFO, this.selectedRootFolderId());
+    this.handleCreateOperationInvocation(OperationNames.GET_ITEM_INFO, this.selectedStorageItemId());
   }
 
-  protected handleDisconnectAccount(): void {
+  handleDisconnectAccount(): void {
     const currentAddon = this.addon();
     if (!currentAddon) return;
 
     this.openDisconnectDialog(currentAddon);
   }
 
-  private openDisconnectDialog(addon: ConfiguredStorageAddonModel): void {
+  private openDisconnectDialog(addon: ConfiguredAddonModel): void {
     const dialogRef = this.addonDialogService.openDisconnectDialog(addon);
 
     dialogRef.subscribe((result) => {
@@ -172,19 +186,16 @@ export class ConfigureAddonComponent implements OnInit {
     });
   }
 
-  protected toggleEditMode(): void {
-    const operationResult = this.selectedFolderOperationInvocation()?.operationResult[0];
-    const hasRootCandidates = operationResult?.mayContainRootCandidates ?? false;
-    const itemId = operationResult?.itemId || '/';
+  toggleEditMode(): void {
+    if (!this.isEditMode()) {
+      this.resetConfigurationForm();
+    }
 
-    this.handleCreateOperationInvocation(
-      hasRootCandidates ? OperationNames.LIST_CHILD_ITEMS : OperationNames.GET_ITEM_INFO,
-      itemId
-    );
+    this.handleCreateOperationInvocation(OperationNames.LIST_ROOT_ITEMS, this.selectedStorageItemId());
     this.isEditMode.set(!this.isEditMode());
   }
 
-  protected handleUpdateAddonConfiguration(): void {
+  handleUpdateAddonConfiguration(): void {
     const currentAddon = this.addon();
     if (!currentAddon) return;
 
@@ -193,17 +204,29 @@ export class ConfigureAddonComponent implements OnInit {
       this.addonsUserReference()[0].id || '',
       this.resourceUri(),
       this.accountNameControl.value || '',
-      this.selectedRootFolderId() || '',
-      this.addonTypeString()
+      this.selectedStorageItemId() || '',
+      this.addonTypeString(),
+      this.selectedResourceType(),
+      this.selectedStorageItemUrl()
     );
 
     this.actions.updateConfiguredAddon(payload, this.addonTypeString(), currentAddon.id).subscribe({
       complete: () => {
         this.router.navigate([`${this.baseUrl()}/addons`]);
         this.toastService.showSuccess('settings.addons.toast.updateSuccess', {
-          addonName: currentAddon.externalServiceName,
+          addonName: this.addonServiceName(),
         });
       },
     });
   }
+
+  private resetConfigurationForm(): void {
+    this.selectedStorageItemId.set('');
+    this.selectedStorageItemUrl.set('');
+    const currentAddon = this.addon();
+    if (currentAddon) {
+      this.selectedResourceType.set(currentAddon.resourceType || '');
+      this.accountNameControl.setValue(currentAddon.displayName);
+    }
+  }
 }
diff --git a/src/app/features/project/addons/components/connect-configured-addon/connect-configured-addon.component.html b/src/app/features/project/addons/components/connect-configured-addon/connect-configured-addon.component.html
index c8a2aaa9b..fcf990484 100644
--- a/src/app/features/project/addons/components/connect-configured-addon/connect-configured-addon.component.html
+++ b/src/app/features/project/addons/components/connect-configured-addon/connect-configured-addon.component.html
@@ -18,9 +18,11 @@ <h2>
               <p>
                 {{ 'settings.addons.connectAddon.termsDescription' | translate }}
               </p>
-              <p>
-                {{ 'settings.addons.connectAddon.storageDescription' | translate }}
-              </p>
+              @if (addonTypeString() === AddonType.STORAGE) {
+                <p>
+                  {{ 'settings.addons.connectAddon.storageDescription' | translate }}
+                </p>
+              }
             </div>
 
             <div class="flex gap-4 align-self-center md:align-self-end mt-3">
@@ -32,12 +34,12 @@ <h2>
               ></p-button>
               <p-button
                 [label]="
-                  !(isAuthorizedCitationAddonsLoading() || isAuthorizedStorageAddonsLoading())
+                  !isAuthorizedAddonsLoading()
                     ? ('settings.addons.form.buttons.next' | translate)
                     : ('settings.addons.form.buttons.acceptingTerms' | translate)
                 "
                 class="w-10rem btn-full-width"
-                [loading]="isAuthorizedCitationAddonsLoading() || isAuthorizedStorageAddonsLoading()"
+                [loading]="isAuthorizedAddonsLoading()"
                 (onClick)="handleAuthorizedAccountsPresenceCheck()"
               ></p-button>
             </div>
@@ -113,17 +115,21 @@ <h2 class="pt-2">{{ 'settings.addons.connectAddon.chooseExistingAccount' | trans
         <ng-template #content let-activateCallback="activateCallback">
           <section class="flex flex-column gap-5">
             <h2 class="pt-2">{{ 'settings.addons.connectAddon.configure' | translate }} {{ addon()?.displayName }}</h2>
-            <osf-folder-selector
+            <osf-storage-item-selector
               [isGoogleFilePicker]="isGoogleDrive()"
               [accountId]="chosenAccountId()"
               [accountName]="chosenAccountName()"
               [operationInvocationResult]="operationInvocation()?.operationResult || []"
               [accountNameControl]="accountNameControl"
               [isCreateMode]="true"
-              [(selectedRootFolderId)]="selectedRootFolderId"
+              [currentAddonType]="addonTypeString()"
+              [supportedResourceTypes]="supportedResourceTypes()"
+              [(selectedStorageItemId)]="selectedStorageItemId"
+              [(selectedStorageItemUrl)]="selectedStorageItemUrl"
+              [(selectedResourceType)]="selectedResourceType"
               (operationInvoke)="handleCreateOperationInvocation($event.operationName, $event.itemId)"
               (save)="handleCreateConfiguredAddon()"
-              (cancelSelection)="activateCallback(AddonStepperValue.CHOOSE_ACCOUNT)"
+              (cancelSelection)="handleNavigateToAccountSelection()"
             />
           </section>
         </ng-template>
diff --git a/src/app/features/project/addons/components/connect-configured-addon/connect-configured-addon.component.ts b/src/app/features/project/addons/components/connect-configured-addon/connect-configured-addon.component.ts
index f2c6cf70c..ad3b7ecfe 100644
--- a/src/app/features/project/addons/components/connect-configured-addon/connect-configured-addon.component.ts
+++ b/src/app/features/project/addons/components/connect-configured-addon/connect-configured-addon.component.ts
@@ -16,14 +16,15 @@ import { ActivatedRoute, Router, RouterLink } from '@angular/router';
 import { OperationNames } from '@osf/features/project/addons/enums';
 import { AddonConfigMap } from '@osf/features/project/addons/utils';
 import { SubHeaderComponent } from '@osf/shared/components';
-import { ProjectAddonsStepperValue } from '@osf/shared/enums';
+import { AddonType, ProjectAddonsStepperValue } from '@osf/shared/enums';
 import { getAddonTypeString } from '@osf/shared/helpers';
 import { AuthorizedAccountModel } from '@osf/shared/models/addons/authorized-account.model';
 import {
   AddonSetupAccountFormComponent,
   AddonTermsComponent,
-  FolderSelectorComponent,
+  StorageItemSelectorComponent,
 } from '@shared/components/addons';
+import { AddonServiceNames } from '@shared/enums';
 import { AddonModel, AddonTerm, AuthorizedAddonRequestJsonApi } from '@shared/models';
 import { AddonDialogService, AddonFormService, AddonOperationInvocationService, ToastService } from '@shared/services';
 import {
@@ -32,6 +33,7 @@ import {
   CreateAuthorizedAddon,
   CreateConfiguredAddon,
   GetAuthorizedCitationAddons,
+  GetAuthorizedLinkAddons,
   GetAuthorizedStorageAddons,
   UpdateAuthorizedAddon,
   UpdateConfiguredAddon,
@@ -53,7 +55,7 @@ import { environment } from 'src/environments/environment';
     ReactiveFormsModule,
     TranslatePipe,
     RadioButtonModule,
-    FolderSelectorComponent,
+    StorageItemSelectorComponent,
     AddonTermsComponent,
     AddonSetupAccountFormComponent,
     DialogModule,
@@ -71,35 +73,48 @@ export class ConnectConfiguredAddonComponent {
   private operationInvocationService = inject(AddonOperationInvocationService);
   private router = inject(Router);
   private route = inject(ActivatedRoute);
-  protected readonly AddonStepperValue = ProjectAddonsStepperValue;
-  protected readonly stepper = viewChild(Stepper);
-  protected accountNameControl = new FormControl('');
-  protected terms = signal<AddonTerm[]>([]);
-  protected addon = signal<AddonModel | AuthorizedAccountModel | null>(null);
-  protected addonAuthUrl = signal<string>('/settings/addons');
-  protected currentAuthorizedAddonAccounts = signal<AuthorizedAccountModel[]>([]);
-  protected chosenAccountId = signal('');
-  protected chosenAccountName = signal('');
-  protected selectedRootFolderId = signal('');
   private selectedAccount = signal<AuthorizedAccountModel>({} as AuthorizedAccountModel);
-  public readonly isGoogleDrive = computed(() => {
+  readonly isGoogleDrive = computed(() => {
     return this.selectedAccount()?.externalServiceName === 'googledrive';
   });
+  readonly AddonStepperValue = ProjectAddonsStepperValue;
+  readonly AddonType = AddonType;
+  readonly stepper = viewChild(Stepper);
+  accountNameControl = new FormControl('');
+  terms = signal<AddonTerm[]>([]);
+  addon = signal<AddonModel | AuthorizedAccountModel | null>(null);
+  addonAuthUrl = signal<string>('/settings/addons');
+  currentAuthorizedAddonAccounts = signal<AuthorizedAccountModel[]>([]);
+  chosenAccountId = signal('');
+  chosenAccountName = signal('');
+  selectedStorageItemId = signal('');
+  selectedStorageItemUrl = signal('');
+  selectedResourceType = signal('');
+
+  addonsUserReference = select(AddonsSelectors.getAddonsUserReference);
+  createdAuthorizedAddon = select(AddonsSelectors.getCreatedOrUpdatedAuthorizedAddon);
+  createdConfiguredAddon = select(AddonsSelectors.getCreatedOrUpdatedConfiguredAddon);
+  authorizedStorageAddons = select(AddonsSelectors.getAuthorizedStorageAddons);
+  authorizedCitationAddons = select(AddonsSelectors.getAuthorizedCitationAddons);
+  authorizedLinkAddons = select(AddonsSelectors.getAuthorizedLinkAddons);
+  operationInvocation = select(AddonsSelectors.getOperationInvocation);
+
+  isAuthorizedStorageAddonsLoading = select(AddonsSelectors.getAuthorizedStorageAddonsLoading);
+  isAuthorizedCitationAddonsLoading = select(AddonsSelectors.getAuthorizedCitationAddonsLoading);
+  isAuthorizedLinkAddonsLoading = select(AddonsSelectors.getAuthorizedLinkAddonsLoading);
+  isAuthorizedAddonsLoading = computed(() => {
+    return (
+      this.isAuthorizedStorageAddonsLoading() ||
+      this.isAuthorizedCitationAddonsLoading() ||
+      this.isAuthorizedLinkAddonsLoading()
+    );
+  });
+  isCreatingAuthorizedAddon = select(AddonsSelectors.getCreatedOrUpdatedStorageAddonSubmitting);
 
-  protected addonsUserReference = select(AddonsSelectors.getAddonsUserReference);
-  protected createdAuthorizedAddon = select(AddonsSelectors.getCreatedOrUpdatedAuthorizedAddon);
-  protected createdConfiguredAddon = select(AddonsSelectors.getCreatedOrUpdatedConfiguredAddon);
-  protected authorizedStorageAddons = select(AddonsSelectors.getAuthorizedStorageAddons);
-  protected authorizedCitationAddons = select(AddonsSelectors.getAuthorizedCitationAddons);
-  protected operationInvocation = select(AddonsSelectors.getOperationInvocation);
-
-  protected isAuthorizedStorageAddonsLoading = select(AddonsSelectors.getAuthorizedStorageAddonsLoading);
-  protected isAuthorizedCitationAddonsLoading = select(AddonsSelectors.getAuthorizedCitationAddonsLoading);
-  protected isCreatingAuthorizedAddon = select(AddonsSelectors.getCreatedOrUpdatedStorageAddonSubmitting);
-
-  protected actions = createDispatchMap({
+  actions = createDispatchMap({
     getAuthorizedStorageAddons: GetAuthorizedStorageAddons,
     getAuthorizedCitationAddons: GetAuthorizedCitationAddons,
+    getAuthorizedLinkAddons: GetAuthorizedLinkAddons,
     createAuthorizedAddon: CreateAuthorizedAddon,
     createConfiguredAddon: CreateConfiguredAddon,
     updateConfiguredAddon: UpdateConfiguredAddon,
@@ -107,30 +122,35 @@ export class ConnectConfiguredAddonComponent {
     createAddonOperationInvocation: CreateAddonOperationInvocation,
   });
 
-  protected readonly userReferenceId = computed(() => {
+  readonly userReferenceId = computed(() => {
     return this.addonsUserReference()[0]?.id;
   });
 
-  protected loginOrChooseAccountText = computed(() => {
+  loginOrChooseAccountText = computed(() => {
     return this.translateService.instant('settings.addons.connectAddon.loginToOrSelectAccount', {
       addonName: this.addon()?.displayName,
     });
   });
 
-  protected resourceUri = computed(() => {
+  resourceUri = computed(() => {
     const id = this.route.parent?.parent?.snapshot.params['id'];
     return `${environment.webUrl}/${id}`;
   });
 
-  protected addonTypeString = computed(() => {
+  addonTypeString = computed(() => {
     return getAddonTypeString(this.addon());
   });
 
-  protected readonly baseUrl = computed(() => {
+  readonly baseUrl = computed(() => {
     const currentUrl = this.router.url;
     return currentUrl.split('/addons')[0];
   });
 
+  readonly supportedResourceTypes = computed(() => {
+    const addon = this.addon();
+    return addon && 'supportedResourceTypes' in addon ? addon.supportedResourceTypes || [] : [];
+  });
+
   constructor() {
     const addon = this.router.getCurrentNavigation()?.extras.state?.['addon'] as AddonModel | AuthorizedAccountModel;
     if (!addon) {
@@ -139,7 +159,7 @@ export class ConnectConfiguredAddonComponent {
     this.addon.set(addon);
   }
 
-  protected handleCreateConfiguredAddon() {
+  handleCreateConfiguredAddon() {
     const addon = this.addon();
     this.selectedAccount.set(
       this.currentAuthorizedAddonAccounts().find((account) => account.id === this.chosenAccountId()) ||
@@ -153,8 +173,10 @@ export class ConnectConfiguredAddonComponent {
       this.userReferenceId(),
       this.resourceUri(),
       this.accountNameControl.value || '',
-      this.selectedRootFolderId(),
-      this.addonTypeString()
+      this.selectedStorageItemId(),
+      this.addonTypeString(),
+      this.selectedResourceType(),
+      this.selectedStorageItemUrl()
     );
 
     this.actions.createConfiguredAddon(payload, this.addonTypeString()).subscribe({
@@ -163,29 +185,34 @@ export class ConnectConfiguredAddonComponent {
         if (createdAddon) {
           this.router.navigate([`${this.baseUrl()}/addons`]);
           this.toastService.showSuccess('settings.addons.toast.createSuccess', {
-            addonName: addon.externalServiceName,
+            addonName: AddonServiceNames[addon.externalServiceName as keyof typeof AddonServiceNames],
           });
         }
       },
     });
   }
 
-  protected handleCreateAuthorizedAddon(payload: AuthorizedAddonRequestJsonApi): void {
+  handleCreateAuthorizedAddon(payload: AuthorizedAddonRequestJsonApi): void {
     if (!this.addon()) return;
 
     this.actions.createAuthorizedAddon(payload, this.addonTypeString()).subscribe({
       complete: () => {
-        const createdAddon = this.createdAuthorizedAddon();
-        if (createdAddon) {
-          this.addonAuthUrl.set(createdAddon.attributes.auth_url);
-          window.open(createdAddon.attributes.auth_url, '_blank');
+        const addon = this.createdAuthorizedAddon();
+        if (addon?.authUrl) {
+          this.addonAuthUrl.set(addon.authUrl);
+          window.open(addon.authUrl, '_blank');
           this.stepper()?.value.set(ProjectAddonsStepperValue.AUTH);
+        } else {
+          this.router.navigate([`${this.baseUrl()}/addons`]);
+          this.toastService.showSuccess('settings.addons.toast.createSuccess', {
+            addonName: AddonServiceNames[addon?.externalServiceName as keyof typeof AddonServiceNames],
+          });
         }
       },
     });
   }
 
-  protected handleConfirmAccountConnection(): void {
+  handleConfirmAccountConnection(): void {
     this.selectedAccount.set(
       this.currentAuthorizedAddonAccounts().find((account) => account.id === this.chosenAccountId()) ||
         ({} as AuthorizedAccountModel)
@@ -200,11 +227,12 @@ export class ConnectConfiguredAddonComponent {
         this.stepper()?.value.set(ProjectAddonsStepperValue.CONFIGURE_ROOT_FOLDER);
         this.chosenAccountName.set(this.selectedAccount().displayName);
         this.accountNameControl.setValue(this.selectedAccount().displayName);
+        this.resetConfigurationForm();
       }
     });
   }
 
-  protected handleAuthorizedAccountsPresenceCheck() {
+  handleAuthorizedAccountsPresenceCheck() {
     const requiredData = this.getDataForAccountCheck();
     if (!requiredData) return;
 
@@ -234,14 +262,18 @@ export class ConnectConfiguredAddonComponent {
 
   private getAddonConfig(addonType: string, referenceId: string) {
     const addonConfigMap: AddonConfigMap = {
-      storage: {
+      [AddonType.STORAGE]: {
         getAddons: () => this.actions.getAuthorizedStorageAddons(referenceId),
         getAuthorizedAddons: () => this.authorizedStorageAddons(),
       },
-      citation: {
+      [AddonType.CITATION]: {
         getAddons: () => this.actions.getAuthorizedCitationAddons(referenceId),
         getAuthorizedAddons: () => this.authorizedCitationAddons(),
       },
+      [AddonType.LINK]: {
+        getAddons: () => this.actions.getAuthorizedLinkAddons(referenceId),
+        getAuthorizedAddons: () => this.authorizedLinkAddons(),
+      },
     };
 
     return addonConfigMap[addonType] || null;
@@ -273,7 +305,7 @@ export class ConnectConfiguredAddonComponent {
     return authorizedAddons.filter((addon) => addon.externalServiceName === currentAddon.externalServiceName);
   }
 
-  protected handleCreateOperationInvocation(operationName: OperationNames, itemId: string): void {
+  handleCreateOperationInvocation(operationName: OperationNames, itemId: string): void {
     const selectedAccount = this.currentAuthorizedAddonAccounts().find(
       (account) => account.id === this.chosenAccountId()
     );
@@ -288,4 +320,15 @@ export class ConnectConfiguredAddonComponent {
 
     this.actions.createAddonOperationInvocation(payload);
   }
+
+  handleNavigateToAccountSelection(): void {
+    this.resetConfigurationForm();
+    this.stepper()?.value.set(ProjectAddonsStepperValue.CHOOSE_ACCOUNT);
+  }
+
+  private resetConfigurationForm(): void {
+    this.selectedStorageItemId.set('');
+    this.selectedStorageItemUrl.set('');
+    this.selectedResourceType.set('');
+  }
 }
diff --git a/src/app/features/project/addons/components/disconnect-addon-modal/disconnect-addon-modal.component.html b/src/app/features/project/addons/components/disconnect-addon-modal/disconnect-addon-modal.component.html
index e665b6e3d..e4447ba44 100644
--- a/src/app/features/project/addons/components/disconnect-addon-modal/disconnect-addon-modal.component.html
+++ b/src/app/features/project/addons/components/disconnect-addon-modal/disconnect-addon-modal.component.html
@@ -4,7 +4,7 @@
   {{ 'settings.addons.configureAddon.account' | translate }} <span class="font-bold">{{ addon.displayName }}</span>
 </p>
 <p>
-  {{ 'settings.addons.configureAddon.selectedFolder' | translate }}
+  {{ selectedItemLabel() | translate }}
   <span class="font-bold">{{ selectedFolder()?.itemName }}</span>
 </p>
 <div class="flex pt-5 justify-content-between gap-3">
diff --git a/src/app/features/project/addons/components/disconnect-addon-modal/disconnect-addon-modal.component.ts b/src/app/features/project/addons/components/disconnect-addon-modal/disconnect-addon-modal.component.ts
index 2821f7432..ad0cc5ead 100644
--- a/src/app/features/project/addons/components/disconnect-addon-modal/disconnect-addon-modal.component.ts
+++ b/src/app/features/project/addons/components/disconnect-addon-modal/disconnect-addon-modal.component.ts
@@ -5,8 +5,10 @@ import { TranslatePipe } from '@ngx-translate/core';
 import { Button } from 'primeng/button';
 import { DynamicDialogConfig, DynamicDialogRef } from 'primeng/dynamicdialog';
 
-import { ChangeDetectionStrategy, Component, inject } from '@angular/core';
+import { ChangeDetectionStrategy, Component, computed, inject } from '@angular/core';
 
+import { getAddonTypeString } from '@osf/shared/helpers';
+import { AddonType } from '@shared/enums';
 import { AddonsSelectors, DeleteConfiguredAddon } from '@shared/stores/addons';
 
 @Component({
@@ -18,16 +20,22 @@ import { AddonsSelectors, DeleteConfiguredAddon } from '@shared/stores/addons';
 })
 export class DisconnectAddonModalComponent {
   private dialogConfig = inject(DynamicDialogConfig);
-  protected dialogRef = inject(DynamicDialogRef);
-  protected addon = this.dialogConfig.data.addon;
-  protected dialogMessage = this.dialogConfig.data.message || '';
-  protected isSubmitting = select(AddonsSelectors.getDeleteStorageAddonSubmitting);
-  protected selectedFolder = select(AddonsSelectors.getSelectedFolder);
-  protected actions = createDispatchMap({
+  dialogRef = inject(DynamicDialogRef);
+  addon = this.dialogConfig.data.addon;
+  dialogMessage = this.dialogConfig.data.message || '';
+  isSubmitting = select(AddonsSelectors.getDeleteStorageAddonSubmitting);
+  selectedFolder = select(AddonsSelectors.getSelectedStorageItem);
+  selectedItemLabel = computed(() => {
+    const addonType = getAddonTypeString(this.addon);
+    return addonType === AddonType.LINK
+      ? 'settings.addons.configureAddon.linkedItem'
+      : 'settings.addons.configureAddon.selectedFolder';
+  });
+  actions = createDispatchMap({
     deleteConfiguredAddon: DeleteConfiguredAddon,
   });
 
-  protected handleDisconnectAddonAccount(): void {
+  handleDisconnectAddonAccount(): void {
     if (!this.addon) return;
 
     this.actions.deleteConfiguredAddon(this.addon.id, this.addon.type).subscribe({
diff --git a/src/app/features/project/linked-services/linked-services.component.html b/src/app/features/project/linked-services/linked-services.component.html
new file mode 100644
index 000000000..a36358f21
--- /dev/null
+++ b/src/app/features/project/linked-services/linked-services.component.html
@@ -0,0 +1,53 @@
+<osf-sub-header [title]="'project.linkedServices.title' | translate" />
+<section class="flex-column flex flex-1 bg-white p-3 sm:p-5">
+  @if (isLoading()) {
+    <div class="flex-1">
+      <osf-loading-spinner />
+    </div>
+  } @else if (convertedConfiguredLinkAddons().length) {
+    <p-table [value]="convertedConfiguredLinkAddons()">
+      <ng-template #header>
+        <tr>
+          <th>
+            {{ 'project.linkedServices.table.linkedService' | translate }}
+          </th>
+          <th>
+            {{ 'project.linkedServices.table.displayName' | translate }}
+          </th>
+          <th>
+            {{ 'project.linkedServices.table.resourceType' | translate }}
+          </th>
+          <th>
+            <a routerLink="../addons">{{ 'common.buttons.edit' | translate }}</a>
+          </th>
+        </tr>
+      </ng-template>
+
+      <ng-template #body let-item>
+        <tr>
+          <td>{{ item.serviceName }}</td>
+          <td>{{ item.displayName }}</td>
+          <td>{{ item.convertedResourceType }}</td>
+          <td>
+            <a [href]="item.targetUrl" target="_blank" rel="noopener noreferrer">
+              {{ 'project.linkedServices.table.link' | translate }}
+            </a>
+          </td>
+        </tr>
+      </ng-template>
+    </p-table>
+  } @else {
+    <div class="flex align-items-center justify-content-center flex-column flex-1 text-center gap-3">
+      <p>
+        {{ 'project.linkedServices.noLinkedServices' | translate }}
+      </p>
+      <p>
+        {{ 'project.linkedServices.redirectMessage' | translate }}
+        <a routerLink="../addons">
+          {{ 'project.linkedServices.addonsLink' | translate }}
+        </a>
+        {{ 'project.linkedServices.redirectMessageSuffix' | translate }}
+      </p>
+    </div>
+  }
+</section>
diff --git a/src/app/features/project/linked-services/linked-services.component.scss b/src/app/features/project/linked-services/linked-services.component.scss
new file mode 100644
index 000000000..da0c027b5
--- /dev/null
+++ b/src/app/features/project/linked-services/linked-services.component.scss
@@ -0,0 +1,5 @@
+:host {
+  display: flex;
+  flex-direction: column;
+  flex: 1;
+}
diff --git a/src/app/features/project/linked-services/linked-services.component.spec.ts b/src/app/features/project/linked-services/linked-services.component.spec.ts
new file mode 100644
index 000000000..14c4cac4d
--- /dev/null
+++ b/src/app/features/project/linked-services/linked-services.component.spec.ts
@@ -0,0 +1,22 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { LinkedServicesComponent } from './linked-services.component';
+
+describe.skip('LinkedServicesComponent', () => {
+  let component: LinkedServicesComponent;
+  let fixture: ComponentFixture<LinkedServicesComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [LinkedServicesComponent],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(LinkedServicesComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/features/project/linked-services/linked-services.component.ts b/src/app/features/project/linked-services/linked-services.component.ts
new file mode 100644
index 000000000..ea280a770
--- /dev/null
+++ b/src/app/features/project/linked-services/linked-services.component.ts
@@ -0,0 +1,69 @@
+import { createDispatchMap, select } from '@ngxs/store';
+
+import { TranslatePipe } from '@ngx-translate/core';
+
+import { TableModule } from 'primeng/table';
+
+import { ChangeDetectionStrategy, Component, computed, effect, inject, OnInit } from '@angular/core';
+import { ActivatedRoute, RouterLink } from '@angular/router';
+
+import { UserSelectors } from '@core/store/user';
+import { LoadingSpinnerComponent, SubHeaderComponent } from '@shared/components';
+import { AddonServiceNames } from '@shared/enums';
+import { convertCamelCaseToNormal } from '@shared/helpers';
+import { AddonsSelectors, GetAddonsResourceReference, GetConfiguredLinkAddons } from '@shared/stores';
+
+@Component({
+  selector: 'osf-linked-services',
+  imports: [SubHeaderComponent, TranslatePipe, TableModule, LoadingSpinnerComponent, RouterLink],
+  templateUrl: './linked-services.component.html',
+  styleUrl: './linked-services.component.scss',
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class LinkedServicesComponent implements OnInit {
+  private route = inject(ActivatedRoute);
+
+  currentUser = select(UserSelectors.getCurrentUser);
+  addonsResourceReference = select(AddonsSelectors.getAddonsResourceReference);
+  configuredLinkAddons = select(AddonsSelectors.getConfiguredLinkAddons);
+  isResourceReferenceLoading = select(AddonsSelectors.getAddonsResourceReferenceLoading);
+  isConfiguredLinkAddonsLoading = select(AddonsSelectors.getConfiguredLinkAddonsLoading);
+  isCurrentUserLoading = select(UserSelectors.getCurrentUserLoading);
+
+  isLoading = computed(() => {
+    return this.isConfiguredLinkAddonsLoading() || this.isResourceReferenceLoading() || this.isCurrentUserLoading();
+  });
+
+  resourceReferenceId = computed(() => this.addonsResourceReference()[0]?.id);
+
+  convertedConfiguredLinkAddons = computed(() => {
+    return this.configuredLinkAddons().map((item) => ({
+      ...item,
+      serviceName:
+        AddonServiceNames[item.externalServiceName as keyof typeof AddonServiceNames] || item.externalServiceName,
+      convertedResourceType: convertCamelCaseToNormal(item.resourceType || ''),
+    }));
+  });
+
+  actions = createDispatchMap({
+    getConfiguredLinkAddons: GetConfiguredLinkAddons,
+    getAddonsResourceReference: GetAddonsResourceReference,
+  });
+
+  constructor() {
+    effect(() => {
+      const resourceReferenceId = this.resourceReferenceId();
+      if (resourceReferenceId) {
+        this.actions.getConfiguredLinkAddons(resourceReferenceId);
+      }
+    });
+  }
+
+  ngOnInit(): void {
+    const projectId = this.route.parent?.parent?.snapshot.params['id'];
+
+    if (projectId && !this.addonsResourceReference().length) {
+      this.actions.getAddonsResourceReference(projectId);
+    }
+  }
+}
diff --git a/src/app/features/project/overview/components/files-widget/files-widget.component.ts b/src/app/features/project/overview/components/files-widget/files-widget.component.ts
index 6fa3518d3..e54bcfec3 100644
--- a/src/app/features/project/overview/components/files-widget/files-widget.component.ts
+++ b/src/app/features/project/overview/components/files-widget/files-widget.component.ts
@@ -32,7 +32,7 @@ import {
 import { FilesTreeComponent, SelectComponent } from '@osf/shared/components';
 import { Primitive } from '@osf/shared/helpers';
 import {
-  ConfiguredStorageAddonModel,
+  ConfiguredAddonModel,
   FileLabelModel,
   FilesTreeActions,
   NodeShortInfoModel,
@@ -198,7 +198,7 @@ export class FilesWidgetComponent {
     }, []);
   }
 
-  private getAddonName(addons: ConfiguredStorageAddonModel[], provider: string): string {
+  private getAddonName(addons: ConfiguredAddonModel[], provider: string): string {
     if (provider === FileProvider.OsfStorage) {
       return this.osfStorageLabel;
     } else {
diff --git a/src/app/features/project/overview/components/linked-resources/linked-resources.component.html b/src/app/features/project/overview/components/linked-resources/linked-resources.component.html
index c2d44da4c..68da00521 100644
--- a/src/app/features/project/overview/components/linked-resources/linked-resources.component.html
+++ b/src/app/features/project/overview/components/linked-resources/linked-resources.component.html
@@ -34,15 +34,20 @@ <h2 class="flex align-items-center gap-2">
               </div>
             </div>
 
-            <div class="component-name flex flex-column gap-2">
+            <div class="component-name flex flex-wrap gap-1">
+              <p>{{ 'common.labels.contributors' | translate }}:</p>
               @for (contributor of linkedResource.contributors; track contributor.id) {
                 <div>
                   <a class="font-bold"> {{ contributor.fullName }}</a>
                   <span>{{ $last ? '' : ',' }}</span>
                 </div>
               }
+            </div>
+            <div class="flex align-items-center gap-1">
               <div class="component-description">
-                <osf-truncated-text [text]="linkedResource.description" />
+                <osf-truncated-text
+                  [text]="('common.labels.description' | translate) + ': ' + linkedResource.description"
+                />
               </div>
             </div>
           </div>
diff --git a/src/app/features/project/overview/components/linked-resources/linked-resources.component.ts b/src/app/features/project/overview/components/linked-resources/linked-resources.component.ts
index bc3d43d62..9a3e1e76b 100644
--- a/src/app/features/project/overview/components/linked-resources/linked-resources.component.ts
+++ b/src/app/features/project/overview/components/linked-resources/linked-resources.component.ts
@@ -31,9 +31,9 @@ export class LinkedResourcesComponent {
   isCollectionsRoute = input<boolean>(false);
   canWrite = input.required<boolean>();
 
-  protected linkedResources = select(NodeLinksSelectors.getLinkedResources);
-  protected isLinkedResourcesLoading = select(NodeLinksSelectors.getLinkedResourcesLoading);
-  protected isMedium = toSignal(inject(IS_MEDIUM));
+  linkedResources = select(NodeLinksSelectors.getLinkedResources);
+  isLinkedResourcesLoading = select(NodeLinksSelectors.getLinkedResourcesLoading);
+  isMedium = toSignal(inject(IS_MEDIUM));
 
   openLinkProjectModal() {
     const dialogWidth = this.isMedium() ? '850px' : '95vw';
diff --git a/src/app/features/project/project.routes.ts b/src/app/features/project/project.routes.ts
index 8a018747d..94c3d3947 100644
--- a/src/app/features/project/project.routes.ts
+++ b/src/app/features/project/project.routes.ts
@@ -100,6 +100,12 @@ export const projectRoutes: Routes = [
         canActivate: [viewOnlyGuard],
         loadChildren: () => import('../project/addons/addons.routes').then((mod) => mod.addonsRoutes),
       },
+      {
+        path: 'links',
+        canActivate: [viewOnlyGuard],
+        loadComponent: () =>
+          import('../project/linked-services/linked-services.component').then((mod) => mod.LinkedServicesComponent),
+      },
     ],
   },
 ];
diff --git a/src/app/features/settings/addons/addons.component.ts b/src/app/features/settings/addons/addons.component.ts
index 2b47a827b..7c07173f8 100644
--- a/src/app/features/settings/addons/addons.component.ts
+++ b/src/app/features/settings/addons/addons.component.ts
@@ -26,8 +26,10 @@ import {
   DeleteAuthorizedAddon,
   GetAddonsUserReference,
   GetAuthorizedCitationAddons,
+  GetAuthorizedLinkAddons,
   GetAuthorizedStorageAddons,
   GetCitationAddons,
+  GetLinkAddons,
   GetStorageAddons,
   UpdateAuthorizedAddon,
 } from '@shared/stores/addons';
@@ -53,101 +55,128 @@ import {
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class AddonsComponent {
-  protected readonly tabOptions = ADDON_TAB_OPTIONS;
-  protected readonly categoryOptions = ADDON_CATEGORY_OPTIONS;
-
-  protected AddonTabValue = AddonTabValue;
-  protected defaultTabValue = AddonTabValue.ALL_ADDONS;
-
-  protected searchControl = new FormControl<string>('');
-
-  protected searchValue = signal<string>('');
-  protected selectedCategory = signal<string>(AddonCategory.EXTERNAL_STORAGE_SERVICES);
-  protected selectedTab = signal<number>(this.defaultTabValue);
-
-  protected currentUser = select(UserSelectors.getCurrentUser);
-  protected addonsUserReference = select(AddonsSelectors.getAddonsUserReference);
-  protected storageAddons = select(AddonsSelectors.getStorageAddons);
-  protected citationAddons = select(AddonsSelectors.getCitationAddons);
-  protected authorizedStorageAddons = select(AddonsSelectors.getAuthorizedStorageAddons);
-  protected authorizedCitationAddons = select(AddonsSelectors.getAuthorizedCitationAddons);
-
-  protected isCurrentUserLoading = select(UserSelectors.getCurrentUserLoading);
-  protected isUserReferenceLoading = select(AddonsSelectors.getAddonsUserReferenceLoading);
-  protected isStorageAddonsLoading = select(AddonsSelectors.getStorageAddonsLoading);
-  protected isCitationAddonsLoading = select(AddonsSelectors.getCitationAddonsLoading);
-  protected isAuthorizedStorageAddonsLoading = select(AddonsSelectors.getAuthorizedStorageAddonsLoading);
-  protected isAuthorizedCitationAddonsLoading = select(AddonsSelectors.getAuthorizedCitationAddonsLoading);
-
-  protected isAddonsLoading = computed(() => {
+  readonly tabOptions = ADDON_TAB_OPTIONS;
+  readonly categoryOptions = ADDON_CATEGORY_OPTIONS;
+  readonly AddonTabValue = AddonTabValue;
+  readonly defaultTabValue = AddonTabValue.ALL_ADDONS;
+  searchControl = new FormControl<string>('');
+  searchValue = signal<string>('');
+  selectedCategory = signal<string>(AddonCategory.EXTERNAL_STORAGE_SERVICES);
+  selectedTab = signal<number>(this.defaultTabValue);
+
+  currentUser = select(UserSelectors.getCurrentUser);
+  addonsUserReference = select(AddonsSelectors.getAddonsUserReference);
+  storageAddons = select(AddonsSelectors.getStorageAddons);
+  citationAddons = select(AddonsSelectors.getCitationAddons);
+  linkAddons = select(AddonsSelectors.getLinkAddons);
+  authorizedStorageAddons = select(AddonsSelectors.getAuthorizedStorageAddons);
+  authorizedCitationAddons = select(AddonsSelectors.getAuthorizedCitationAddons);
+  authorizedLinkAddons = select(AddonsSelectors.getAuthorizedLinkAddons);
+
+  isCurrentUserLoading = select(UserSelectors.getCurrentUserLoading);
+  isUserReferenceLoading = select(AddonsSelectors.getAddonsUserReferenceLoading);
+  isStorageAddonsLoading = select(AddonsSelectors.getStorageAddonsLoading);
+  isCitationAddonsLoading = select(AddonsSelectors.getCitationAddonsLoading);
+  isLinkAddonsLoading = select(AddonsSelectors.getLinkAddonsLoading);
+  isAuthorizedStorageAddonsLoading = select(AddonsSelectors.getAuthorizedStorageAddonsLoading);
+  isAuthorizedCitationAddonsLoading = select(AddonsSelectors.getAuthorizedCitationAddonsLoading);
+  isAuthorizedLinkAddonsLoading = select(AddonsSelectors.getAuthorizedLinkAddonsLoading);
+
+  isAddonsLoading = computed(() => {
     return (
       this.isStorageAddonsLoading() ||
       this.isCitationAddonsLoading() ||
+      this.isLinkAddonsLoading() ||
       this.isUserReferenceLoading() ||
       this.isCurrentUserLoading()
     );
   });
-  protected isAuthorizedAddonsLoading = computed(() => {
+  isAuthorizedAddonsLoading = computed(() => {
     return (
       this.isAuthorizedStorageAddonsLoading() ||
       this.isAuthorizedCitationAddonsLoading() ||
+      this.isAuthorizedLinkAddonsLoading() ||
       this.isUserReferenceLoading() ||
       this.isCurrentUserLoading()
     );
   });
 
-  protected actions = createDispatchMap({
+  actions = createDispatchMap({
     getStorageAddons: GetStorageAddons,
     getCitationAddons: GetCitationAddons,
+    getLinkAddons: GetLinkAddons,
     getAuthorizedStorageAddons: GetAuthorizedStorageAddons,
     getAuthorizedCitationAddons: GetAuthorizedCitationAddons,
+    getAuthorizedLinkAddons: GetAuthorizedLinkAddons,
     createAuthorizedAddon: CreateAuthorizedAddon,
     updateAuthorizedAddon: UpdateAuthorizedAddon,
     getAddonsUserReference: GetAddonsUserReference,
     deleteAuthorizedAddon: DeleteAuthorizedAddon,
   });
 
-  protected readonly allAuthorizedAddons = computed(() => {
-    const authorizedAddons = [...this.authorizedStorageAddons(), ...this.authorizedCitationAddons()];
+  readonly allAuthorizedAddons = computed(() => {
+    const authorizedAddons = [
+      ...this.authorizedStorageAddons(),
+      ...this.authorizedCitationAddons(),
+      ...this.authorizedLinkAddons(),
+    ];
 
     const searchValue = this.searchValue().toLowerCase();
-    return authorizedAddons.filter((card) => card.displayName.includes(searchValue));
+    return authorizedAddons.filter((card) => card.displayName.toLowerCase().includes(searchValue));
   });
 
-  protected readonly userReferenceId = computed(() => {
+  readonly userReferenceId = computed(() => {
     return this.addonsUserReference()[0]?.id;
   });
 
-  protected readonly currentAction = computed(() =>
-    this.selectedCategory() === AddonCategory.EXTERNAL_STORAGE_SERVICES
-      ? this.actions.getStorageAddons
-      : this.actions.getCitationAddons
-  );
+  readonly currentAction = computed(() => {
+    switch (this.selectedCategory()) {
+      case AddonCategory.EXTERNAL_STORAGE_SERVICES:
+        return this.actions.getStorageAddons;
+      case AddonCategory.EXTERNAL_CITATION_SERVICES:
+        return this.actions.getCitationAddons;
+      case AddonCategory.EXTERNAL_LINK_SERVICES:
+        return this.actions.getLinkAddons;
+      default:
+        return this.actions.getStorageAddons;
+    }
+  });
 
-  protected readonly currentAddonsState = computed(() =>
-    this.selectedCategory() === AddonCategory.EXTERNAL_STORAGE_SERVICES ? this.storageAddons() : this.citationAddons()
-  );
+  readonly currentAddonsState = computed(() => {
+    switch (this.selectedCategory()) {
+      case AddonCategory.EXTERNAL_STORAGE_SERVICES:
+        return this.storageAddons();
+      case AddonCategory.EXTERNAL_CITATION_SERVICES:
+        return this.citationAddons();
+      case AddonCategory.EXTERNAL_LINK_SERVICES:
+        return this.linkAddons();
+      default:
+        return this.storageAddons();
+    }
+  });
 
-  protected readonly filteredAddonCards = computed(() => {
+  readonly filteredAddonCards = computed(() => {
     const searchValue = this.searchValue().toLowerCase();
-    return this.currentAddonsState().filter((card) => card.externalServiceName.toLowerCase().includes(searchValue));
+    return this.currentAddonsState().filter(
+      (card) =>
+        card.externalServiceName.toLowerCase().includes(searchValue) ||
+        card.displayName.toLowerCase().includes(searchValue)
+    );
   });
 
-  protected onCategoryChange(value: Primitive): void {
+  onCategoryChange(value: Primitive): void {
     if (typeof value === 'string') {
       this.selectedCategory.set(value);
     }
   }
 
   constructor() {
-    // TODO There should not be three effects
     effect(() => {
-      if (this.currentUser()) {
+      if (this.currentUser() && !this.userReferenceId()) {
         this.actions.getAddonsUserReference();
       }
     });
 
-    // TODO There should not be three effects
     effect(() => {
       if (this.currentUser() && this.userReferenceId()) {
         const action = this.currentAction();
@@ -156,12 +185,7 @@ export class AddonsComponent {
         if (!addons?.length) {
           action();
         }
-      }
-    });
 
-    // TODO There should not be three effects
-    effect(() => {
-      if (this.currentUser() && this.userReferenceId()) {
         this.fetchAllAuthorizedAddons(this.userReferenceId());
       }
     });
@@ -174,5 +198,6 @@ export class AddonsComponent {
   private fetchAllAuthorizedAddons(userReferenceId: string): void {
     this.actions.getAuthorizedStorageAddons(userReferenceId);
     this.actions.getAuthorizedCitationAddons(userReferenceId);
+    this.actions.getAuthorizedLinkAddons(userReferenceId);
   }
 }
diff --git a/src/app/features/settings/addons/components/connect-addon/connect-addon.component.html b/src/app/features/settings/addons/components/connect-addon/connect-addon.component.html
index 1fd573822..84b2feff5 100644
--- a/src/app/features/settings/addons/components/connect-addon/connect-addon.component.html
+++ b/src/app/features/settings/addons/components/connect-addon/connect-addon.component.html
@@ -18,9 +18,11 @@ <h2>
               <p>
                 {{ 'settings.addons.connectAddon.termsDescription' | translate }}
               </p>
-              <p>
-                {{ 'settings.addons.connectAddon.storageDescription' | translate }}
-              </p>
+              @if (addonTypeString() === AddonType.STORAGE) {
+                <p>
+                  {{ 'settings.addons.connectAddon.storageDescription' | translate }}
+                </p>
+              }
             </div>
 
             <div class="flex gap-4 align-self-center md:align-self-end mt-3">
diff --git a/src/app/features/settings/addons/components/connect-addon/connect-addon.component.ts b/src/app/features/settings/addons/components/connect-addon/connect-addon.component.ts
index 8d60665c1..21ecad24b 100644
--- a/src/app/features/settings/addons/components/connect-addon/connect-addon.component.ts
+++ b/src/app/features/settings/addons/components/connect-addon/connect-addon.component.ts
@@ -11,10 +11,11 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { Router, RouterLink } from '@angular/router';
 
 import { SubHeaderComponent } from '@osf/shared/components';
-import { ProjectAddonsStepperValue } from '@osf/shared/enums';
+import { AddonServiceNames, AddonType, ProjectAddonsStepperValue } from '@osf/shared/enums';
 import { getAddonTypeString, isAuthorizedAddon } from '@osf/shared/helpers';
 import { AddonSetupAccountFormComponent, AddonTermsComponent } from '@shared/components/addons';
 import { AddonModel, AddonTerm, AuthorizedAccountModel, AuthorizedAddonRequestJsonApi } from '@shared/models';
+import { ToastService } from '@shared/services';
 import { AddonsSelectors, CreateAuthorizedAddon, UpdateAuthorizedAddon } from '@shared/stores/addons';
 
 @Component({
@@ -38,33 +39,35 @@ import { AddonsSelectors, CreateAuthorizedAddon, UpdateAuthorizedAddon } from '@
 })
 export class ConnectAddonComponent {
   private readonly router = inject(Router);
+  private readonly toastService = inject(ToastService);
 
-  protected readonly stepper = viewChild(Stepper);
-  protected readonly ProjectAddonsStepperValue = ProjectAddonsStepperValue;
+  readonly stepper = viewChild(Stepper);
+  readonly AddonType = AddonType;
+  readonly ProjectAddonsStepperValue = ProjectAddonsStepperValue;
 
-  protected terms = signal<AddonTerm[]>([]);
-  protected addon = signal<AddonModel | AuthorizedAccountModel | null>(null);
-  protected addonAuthUrl = signal<string>('/settings/addons');
+  terms = signal<AddonTerm[]>([]);
+  addon = signal<AddonModel | AuthorizedAccountModel | null>(null);
+  addonAuthUrl = signal<string>('/settings/addons');
 
-  protected addonsUserReference = select(AddonsSelectors.getAddonsUserReference);
-  protected createdAddon = select(AddonsSelectors.getCreatedOrUpdatedAuthorizedAddon);
-  protected isCreatingAuthorizedAddon = select(AddonsSelectors.getCreatedOrUpdatedStorageAddonSubmitting);
-  protected isAuthorized = computed(() => {
+  addonsUserReference = select(AddonsSelectors.getAddonsUserReference);
+  createdAddon = select(AddonsSelectors.getCreatedOrUpdatedAuthorizedAddon);
+  isCreatingAuthorizedAddon = select(AddonsSelectors.getCreatedOrUpdatedStorageAddonSubmitting);
+  isAuthorized = computed(() => {
     return isAuthorizedAddon(this.addon());
   });
-  protected addonTypeString = computed(() => {
+  addonTypeString = computed(() => {
     return getAddonTypeString(this.addon());
   });
 
-  protected actions = createDispatchMap({
+  actions = createDispatchMap({
     createAuthorizedAddon: CreateAuthorizedAddon,
     updateAuthorizedAddon: UpdateAuthorizedAddon,
   });
 
-  protected readonly userReferenceId = computed(() => {
+  readonly userReferenceId = computed(() => {
     return this.addonsUserReference()[0]?.id;
   });
-  protected readonly baseUrl = computed(() => {
+  readonly baseUrl = computed(() => {
     const currentUrl = this.router.url;
     return currentUrl.split('/addons')[0];
   });
@@ -92,10 +95,15 @@ export class ConnectAddonComponent {
     ).subscribe({
       complete: () => {
         const createdAddon = this.createdAddon();
-        if (createdAddon) {
-          this.addonAuthUrl.set(createdAddon.attributes.auth_url);
-          window.open(createdAddon.attributes.auth_url, '_blank');
+        if (createdAddon?.authUrl) {
+          this.addonAuthUrl.set(createdAddon.authUrl);
+          window.open(createdAddon.authUrl, '_blank');
           this.stepper()?.value.set(ProjectAddonsStepperValue.AUTH);
+        } else {
+          this.router.navigate([`${this.baseUrl()}/addons`]);
+          this.toastService.showSuccess('settings.addons.toast.createSuccess', {
+            addonName: AddonServiceNames[createdAddon?.externalServiceName as keyof typeof AddonServiceNames],
+          });
         }
       },
     });
diff --git a/src/app/shared/components/addons/addon-card-list/addon-card-list.component.ts b/src/app/shared/components/addons/addon-card-list/addon-card-list.component.ts
index aaebeeaba..88922ed4a 100644
--- a/src/app/shared/components/addons/addon-card-list/addon-card-list.component.ts
+++ b/src/app/shared/components/addons/addon-card-list/addon-card-list.component.ts
@@ -3,7 +3,7 @@ import { TranslatePipe } from '@ngx-translate/core';
 import { Component, input } from '@angular/core';
 
 import { AddonCardComponent } from '@shared/components/addons';
-import { AddonModel, AuthorizedAccountModel, ConfiguredStorageAddonModel } from '@shared/models';
+import { AddonModel, AuthorizedAccountModel, ConfiguredAddonModel } from '@shared/models';
 
 @Component({
   selector: 'osf-addon-card-list',
@@ -12,7 +12,7 @@ import { AddonModel, AuthorizedAccountModel, ConfiguredStorageAddonModel } from
   styleUrl: './addon-card-list.component.scss',
 })
 export class AddonCardListComponent {
-  cards = input<(AddonModel | AuthorizedAccountModel | ConfiguredStorageAddonModel)[]>([]);
+  cards = input<(AddonModel | AuthorizedAccountModel | ConfiguredAddonModel)[]>([]);
   cardButtonLabel = input<string>('');
   showDangerButton = input<boolean>(false);
 }
diff --git a/src/app/shared/components/addons/addon-card/addon-card.component.ts b/src/app/shared/components/addons/addon-card/addon-card.component.ts
index f2818d02e..941f0d666 100644
--- a/src/app/shared/components/addons/addon-card/addon-card.component.ts
+++ b/src/app/shared/components/addons/addon-card/addon-card.component.ts
@@ -9,7 +9,7 @@ import { Router } from '@angular/router';
 
 import { getAddonTypeString, isConfiguredAddon } from '@osf/shared/helpers';
 import { CustomConfirmationService, LoaderService } from '@osf/shared/services';
-import { AddonModel, AuthorizedAccountModel, ConfiguredStorageAddonModel } from '@shared/models';
+import { AddonModel, AuthorizedAccountModel, ConfiguredAddonModel } from '@shared/models';
 import { DeleteAuthorizedAddon } from '@shared/stores/addons';
 
 @Component({
@@ -24,7 +24,7 @@ export class AddonCardComponent {
   private readonly loaderService = inject(LoaderService);
   private readonly actions = createDispatchMap({ deleteAuthorizedAddon: DeleteAuthorizedAddon });
 
-  readonly card = input<AddonModel | AuthorizedAccountModel | ConfiguredStorageAddonModel | null>(null);
+  readonly card = input<AddonModel | AuthorizedAccountModel | ConfiguredAddonModel | null>(null);
   readonly cardButtonLabel = input<string>('');
   readonly showDangerButton = input<boolean>(false);
 
diff --git a/src/app/shared/components/addons/addon-setup-account-form/addon-setup-account-form.component.ts b/src/app/shared/components/addons/addon-setup-account-form/addon-setup-account-form.component.ts
index c0b2ea0a8..cbcb857eb 100644
--- a/src/app/shared/components/addons/addon-setup-account-form/addon-setup-account-form.component.ts
+++ b/src/app/shared/components/addons/addon-setup-account-form/addon-setup-account-form.component.ts
@@ -31,38 +31,38 @@ export class AddonSetupAccountFormComponent {
   readonly formSubmit = output<AuthorizedAddonRequestJsonApi>();
   readonly backClick = output<void>();
 
-  protected readonly formControls = AddonFormControls;
+  readonly formControls = AddonFormControls;
 
   get isFormValid() {
     return this.addonForm().valid;
   }
 
-  protected readonly addonForm = computed<FormGroup<AddonForm>>(() => {
+  readonly addonForm = computed<FormGroup<AddonForm>>(() => {
     return this.addonFormService.initializeForm(this.addon());
   });
 
-  protected readonly isAccessSecretKeysFormat = computed(() => {
+  readonly isAccessSecretKeysFormat = computed(() => {
     return this.addon().credentialsFormat === CredentialsFormat.ACCESS_SECRET_KEYS;
   });
 
-  protected readonly isDataverseApiTokenFormat = computed(() => {
+  readonly isDataverseApiTokenFormat = computed(() => {
     return this.addon().credentialsFormat === CredentialsFormat.DATAVERSE_API_TOKEN;
   });
 
-  protected readonly isUsernamePasswordFormat = computed(() => {
+  readonly isUsernamePasswordFormat = computed(() => {
     return this.addon().credentialsFormat === CredentialsFormat.USERNAME_PASSWORD;
   });
 
-  protected readonly isRepoTokenFormat = computed(() => {
+  readonly isRepoTokenFormat = computed(() => {
     return this.addon().credentialsFormat === CredentialsFormat.REPO_TOKEN;
   });
 
-  protected readonly isOAuthFormat = computed(() => {
+  readonly isOAuthFormat = computed(() => {
     const format = this.addon().credentialsFormat;
     return format === CredentialsFormat.OAUTH2 || format === CredentialsFormat.OAUTH;
   });
 
-  protected handleSubmit(): void {
+  handleSubmit(): void {
     if (!this.isFormValid) return;
 
     const formValue = this.addonForm().value;
@@ -76,7 +76,7 @@ export class AddonSetupAccountFormComponent {
     this.formSubmit.emit(payload);
   }
 
-  protected handleBack(): void {
+  handleBack(): void {
     this.backClick.emit();
   }
 }
diff --git a/src/app/shared/components/addons/folder-selector/folder-selector.component.ts b/src/app/shared/components/addons/folder-selector/folder-selector.component.ts
deleted file mode 100644
index 3aae2cca9..000000000
--- a/src/app/shared/components/addons/folder-selector/folder-selector.component.ts
+++ /dev/null
@@ -1,170 +0,0 @@
-import { select } from '@ngxs/store';
-
-import { TranslatePipe, TranslateService } from '@ngx-translate/core';
-
-import { MenuItem } from 'primeng/api';
-import { BreadcrumbModule } from 'primeng/breadcrumb';
-import { Button } from 'primeng/button';
-import { Card } from 'primeng/card';
-import { InputText } from 'primeng/inputtext';
-import { RadioButton } from 'primeng/radiobutton';
-import { Skeleton } from 'primeng/skeleton';
-
-import {
-  ChangeDetectionStrategy,
-  Component,
-  computed,
-  DestroyRef,
-  effect,
-  inject,
-  input,
-  model,
-  OnInit,
-  output,
-  signal,
-} from '@angular/core';
-import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
-import { FormControl, FormsModule, ReactiveFormsModule } from '@angular/forms';
-
-import { OperationNames } from '@osf/features/project/addons/enums';
-import { OperationInvokeData, StorageItemModel } from '@osf/shared/models';
-import { AddonsSelectors } from '@osf/shared/stores';
-
-import { GoogleFilePickerComponent } from './google-file-picker/google-file-picker.component';
-
-@Component({
-  selector: 'osf-folder-selector',
-  templateUrl: './folder-selector.component.html',
-  styleUrl: './folder-selector.component.scss',
-  imports: [
-    BreadcrumbModule,
-    Button,
-    Card,
-    FormsModule,
-    GoogleFilePickerComponent,
-    InputText,
-    RadioButton,
-    ReactiveFormsModule,
-    Skeleton,
-    TranslatePipe,
-  ],
-  changeDetection: ChangeDetectionStrategy.OnPush,
-})
-export class FolderSelectorComponent implements OnInit {
-  private destroyRef = inject(DestroyRef);
-  private translateService = inject(TranslateService);
-
-  isGoogleFilePicker = input.required<boolean>();
-  accountName = input.required<string>();
-  accountId = input.required<string>();
-  operationInvocationResult = input.required<StorageItemModel[]>();
-  accountNameControl = input(new FormControl());
-  isCreateMode = input(false);
-
-  selectedRootFolderId = model<string>('/');
-  operationInvoke = output<OperationInvokeData>();
-  save = output<void>();
-  cancelSelection = output<void>();
-  readonly OperationNames = OperationNames;
-  hasInputChanged = signal(false);
-  hasFolderChanged = signal(false);
-  public selectedRootFolder = signal<StorageItemModel | null>(null);
-  breadcrumbItems = signal<MenuItem[]>([]);
-  initiallySelectedFolder = select(AddonsSelectors.getSelectedFolder);
-  isOperationInvocationSubmitting = select(AddonsSelectors.getOperationInvocationSubmitting);
-  isSubmitting = select(AddonsSelectors.getCreatedOrUpdatedConfiguredAddonSubmitting);
-  readonly homeBreadcrumb: MenuItem = {
-    id: '/',
-    label: this.translateService.instant('settings.addons.configureAddon.home'),
-    state: {
-      operationName: OperationNames.LIST_ROOT_ITEMS,
-    },
-  };
-
-  constructor() {
-    effect(() => {
-      const initialFolder = this.initiallySelectedFolder();
-      if (initialFolder && !this.selectedRootFolder()) {
-        this.selectedRootFolder.set(initialFolder);
-      }
-    });
-  }
-
-  ngOnInit(): void {
-    this.accountNameControl()
-      ?.valueChanges.pipe(takeUntilDestroyed(this.destroyRef))
-      .subscribe((newValue) => {
-        this.hasInputChanged.set(newValue !== this.accountName());
-      });
-  }
-
-  readonly isFormValid = computed(() => {
-    return this.isCreateMode() ? this.hasFolderChanged() : this.hasInputChanged() || this.hasFolderChanged();
-  });
-
-  handleCreateOperationInvocation(
-    operationName: OperationNames,
-    itemId: string,
-    itemName?: string,
-    mayContainRootCandidates?: boolean
-  ): void {
-    this.updateBreadcrumbs(operationName, itemId, itemName, mayContainRootCandidates);
-
-    this.operationInvoke.emit({
-      operationName,
-      itemId,
-    });
-
-    this.trimBreadcrumbs(itemId);
-  }
-
-  handleSave(): void {
-    this.selectedRootFolderId.set(this.selectedRootFolder()?.itemId || '');
-    this.save.emit();
-  }
-
-  handleCancel(): void {
-    this.cancelSelection.emit();
-  }
-
-  public handleFolderSelection = (folder: StorageItemModel): void => {
-    this.selectedRootFolder.set(folder);
-    this.hasFolderChanged.set(folder?.itemId !== this.initiallySelectedFolder()?.itemId);
-  };
-
-  private updateBreadcrumbs(
-    operationName: OperationNames,
-    itemId: string,
-    itemName?: string,
-    mayContainRootCandidates?: boolean
-  ): void {
-    if (operationName === OperationNames.LIST_ROOT_ITEMS) {
-      this.breadcrumbItems.set([]);
-      return;
-    }
-
-    if (itemName && mayContainRootCandidates) {
-      const breadcrumbs = [...this.breadcrumbItems()];
-      const item = {
-        id: itemId,
-        label: itemName,
-        state: {
-          operationName: mayContainRootCandidates ? OperationNames.LIST_CHILD_ITEMS : OperationNames.GET_ITEM_INFO,
-        },
-      };
-
-      this.breadcrumbItems.set([...breadcrumbs, item]);
-    }
-  }
-
-  private trimBreadcrumbs(itemId: string): void {
-    const currentBreadcrumbs = this.breadcrumbItems();
-
-    const targetIndex = currentBreadcrumbs.findIndex((item) => item.id === itemId);
-
-    if (targetIndex !== -1) {
-      const trimmedBreadcrumbs = currentBreadcrumbs.slice(0, targetIndex + 1);
-      this.breadcrumbItems.set(trimmedBreadcrumbs);
-    }
-  }
-}
diff --git a/src/app/shared/components/addons/index.ts b/src/app/shared/components/addons/index.ts
index 4133f4b90..ee8d4f816 100644
--- a/src/app/shared/components/addons/index.ts
+++ b/src/app/shared/components/addons/index.ts
@@ -2,4 +2,4 @@ export { AddonCardComponent } from '@shared/components/addons/addon-card/addon-c
 export { AddonCardListComponent } from '@shared/components/addons/addon-card-list/addon-card-list.component';
 export { AddonSetupAccountFormComponent } from '@shared/components/addons/addon-setup-account-form/addon-setup-account-form.component';
 export { AddonTermsComponent } from '@shared/components/addons/addon-terms/addon-terms.component';
-export { FolderSelectorComponent } from '@shared/components/addons/folder-selector/folder-selector.component';
+export { StorageItemSelectorComponent } from '@shared/components/addons/storage-item-selector/storage-item-selector.component';
diff --git a/src/app/shared/components/addons/resource-type-info-dialog/resource-type-info-dialog.component.html b/src/app/shared/components/addons/resource-type-info-dialog/resource-type-info-dialog.component.html
new file mode 100644
index 000000000..f54ca101f
--- /dev/null
+++ b/src/app/shared/components/addons/resource-type-info-dialog/resource-type-info-dialog.component.html
@@ -0,0 +1,4 @@
+<p [innerHTML]="'settings.addons.configureAddon.resourceTypeModalMessage' | translate: { link: REDIRECT_URL }"></p>
+<div class="mt-4 text-right">
+  <p-button [label]="'common.buttons.close' | translate" severity="info" (onClick)="dialogRef.close()" />
+</div>
diff --git a/src/app/shared/components/addons/resource-type-info-dialog/resource-type-info-dialog.component.scss b/src/app/shared/components/addons/resource-type-info-dialog/resource-type-info-dialog.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/shared/components/addons/resource-type-info-dialog/resource-type-info-dialog.component.spec.ts b/src/app/shared/components/addons/resource-type-info-dialog/resource-type-info-dialog.component.spec.ts
new file mode 100644
index 000000000..80e1aaca3
--- /dev/null
+++ b/src/app/shared/components/addons/resource-type-info-dialog/resource-type-info-dialog.component.spec.ts
@@ -0,0 +1,34 @@
+import { TranslateModule } from '@ngx-translate/core';
+
+import { DynamicDialogRef } from 'primeng/dynamicdialog';
+
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ResourceTypeInfoDialogComponent } from './resource-type-info-dialog.component';
+
+describe('ResourceTypeInfoDialogComponent', () => {
+  let component: ResourceTypeInfoDialogComponent;
+  let fixture: ComponentFixture<ResourceTypeInfoDialogComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [ResourceTypeInfoDialogComponent, TranslateModule.forRoot()],
+      providers: [
+        {
+          provide: DynamicDialogRef,
+          useValue: {
+            close: jest.fn(),
+          },
+        },
+      ],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(ResourceTypeInfoDialogComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/shared/components/addons/resource-type-info-dialog/resource-type-info-dialog.component.ts b/src/app/shared/components/addons/resource-type-info-dialog/resource-type-info-dialog.component.ts
new file mode 100644
index 000000000..ae4dc59b9
--- /dev/null
+++ b/src/app/shared/components/addons/resource-type-info-dialog/resource-type-info-dialog.component.ts
@@ -0,0 +1,18 @@
+import { TranslatePipe } from '@ngx-translate/core';
+
+import { Button } from 'primeng/button';
+import { DynamicDialogRef } from 'primeng/dynamicdialog';
+
+import { ChangeDetectionStrategy, Component, inject } from '@angular/core';
+
+@Component({
+  selector: 'osf-resource-type-info-dialog',
+  imports: [TranslatePipe, Button],
+  templateUrl: './resource-type-info-dialog.component.html',
+  styleUrl: './resource-type-info-dialog.component.scss',
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class ResourceTypeInfoDialogComponent {
+  readonly dialogRef = inject(DynamicDialogRef);
+  readonly REDIRECT_URL = 'https://help.osf.io/article/570-resource-types-in-osf';
+}
diff --git a/src/app/shared/components/addons/folder-selector/google-file-picker/google-file-picker.component.html b/src/app/shared/components/addons/storage-item-selector/google-file-picker/google-file-picker.component.html
similarity index 100%
rename from src/app/shared/components/addons/folder-selector/google-file-picker/google-file-picker.component.html
rename to src/app/shared/components/addons/storage-item-selector/google-file-picker/google-file-picker.component.html
diff --git a/src/app/shared/components/addons/folder-selector/google-file-picker/google-file-picker.component.scss b/src/app/shared/components/addons/storage-item-selector/google-file-picker/google-file-picker.component.scss
similarity index 100%
rename from src/app/shared/components/addons/folder-selector/google-file-picker/google-file-picker.component.scss
rename to src/app/shared/components/addons/storage-item-selector/google-file-picker/google-file-picker.component.scss
diff --git a/src/app/shared/components/addons/folder-selector/google-file-picker/google-file-picker.component.spec.ts b/src/app/shared/components/addons/storage-item-selector/google-file-picker/google-file-picker.component.spec.ts
similarity index 100%
rename from src/app/shared/components/addons/folder-selector/google-file-picker/google-file-picker.component.spec.ts
rename to src/app/shared/components/addons/storage-item-selector/google-file-picker/google-file-picker.component.spec.ts
diff --git a/src/app/shared/components/addons/folder-selector/google-file-picker/google-file-picker.component.ts b/src/app/shared/components/addons/storage-item-selector/google-file-picker/google-file-picker.component.ts
similarity index 100%
rename from src/app/shared/components/addons/folder-selector/google-file-picker/google-file-picker.component.ts
rename to src/app/shared/components/addons/storage-item-selector/google-file-picker/google-file-picker.component.ts
diff --git a/src/app/shared/components/addons/folder-selector/google-file-picker/service/google-file-picker.download.service.spec.ts b/src/app/shared/components/addons/storage-item-selector/google-file-picker/service/google-file-picker.download.service.spec.ts
similarity index 100%
rename from src/app/shared/components/addons/folder-selector/google-file-picker/service/google-file-picker.download.service.spec.ts
rename to src/app/shared/components/addons/storage-item-selector/google-file-picker/service/google-file-picker.download.service.spec.ts
diff --git a/src/app/shared/components/addons/folder-selector/google-file-picker/service/google-file-picker.download.service.ts b/src/app/shared/components/addons/storage-item-selector/google-file-picker/service/google-file-picker.download.service.ts
similarity index 100%
rename from src/app/shared/components/addons/folder-selector/google-file-picker/service/google-file-picker.download.service.ts
rename to src/app/shared/components/addons/storage-item-selector/google-file-picker/service/google-file-picker.download.service.ts
diff --git a/src/app/shared/components/addons/folder-selector/folder-selector.component.html b/src/app/shared/components/addons/storage-item-selector/storage-item-selector.component.html
similarity index 58%
rename from src/app/shared/components/addons/folder-selector/folder-selector.component.html
rename to src/app/shared/components/addons/storage-item-selector/storage-item-selector.component.html
index dfe944a76..9ca6aa910 100644
--- a/src/app/shared/components/addons/folder-selector/folder-selector.component.html
+++ b/src/app/shared/components/addons/storage-item-selector/storage-item-selector.component.html
@@ -18,10 +18,8 @@
     </p-breadcrumb>
     <p-card>
       <p>
-        {{ 'settings.addons.configureAddon.selectedFolder' | translate }}
-        <span class="font-bold">{{
-          selectedRootFolder()?.itemName || 'settings.addons.configureAddon.noFolderSelected' | translate
-        }}</span>
+        {{ selectedItemLabel() | translate }}
+        <span class="font-bold">{{ selectedStorageItem()?.itemName || (noSelectionLabel() | translate) }}</span>
       </p>
       <h3 class="mt-4 mb-2">
         {{ 'settings.addons.form.fields.accountName' | translate }}
@@ -38,7 +36,7 @@ <h3 class="mt-4 mb-2">
       [isFolderPicker]="true"
       [accountId]="accountId()"
       [handleFolderSelection]="handleFolderSelection"
-      [rootFolder]="selectedRootFolder()"
+      [rootFolder]="selectedStorageItem()"
     ></osf-google-file-picker>
   } @else {
     <div class="folders-table flex flex-column">
@@ -51,37 +49,42 @@ <h3>{{ 'settings.addons.configureAddon.selectFolder' | translate }}</h3>
           @let operationName =
             folder.mayContainRootCandidates ? OperationNames.LIST_CHILD_ITEMS : OperationNames.GET_ITEM_INFO;
           @let itemId = folder.itemId || '/';
+          @let isLinkDisabled = !folder.mayContainRootCandidates || folder.itemType !== StorageItemType.Folder;
           <div class="folders-table-row relative">
             <div class="flex gap-2 flex-1">
-              <div tabindex="0" class="flex gap-2">
-                <i class="fas fa-folder"></i>
-                <a
-                  tabindex="0"
-                  class="cursor-pointer folder-link"
-                  (keydown.enter)="
-                    handleCreateOperationInvocation(
-                      operationName,
-                      itemId,
-                      folder.itemName,
-                      folder.mayContainRootCandidates
-                    )
-                  "
-                  (click)="
-                    handleCreateOperationInvocation(
-                      operationName,
-                      itemId,
-                      folder.itemName,
-                      folder.mayContainRootCandidates
-                    )
-                  "
-                >
-                  {{ folder.itemName }}</a
-                >
+              <div tabindex="0" class="flex align-items-center gap-2">
+                <i class="{{ folder.itemType === StorageItemType.Folder ? 'fas fa-folder' : 'fas fa-file' }}"></i>
+                @if (isLinkDisabled) {
+                  <span class="folder-link-disabled">{{ folder.itemName }}</span>
+                } @else {
+                  <a
+                    tabindex="0"
+                    class="cursor-pointer folder-link"
+                    (keydown.enter)="
+                      handleCreateOperationInvocation(
+                        operationName,
+                        itemId,
+                        folder.itemName,
+                        folder.mayContainRootCandidates
+                      )
+                    "
+                    (click)="
+                      handleCreateOperationInvocation(
+                        operationName,
+                        itemId,
+                        folder.itemName,
+                        folder.mayContainRootCandidates
+                      )
+                    "
+                  >
+                    {{ folder.itemName }}</a
+                  >
+                }
               </div>
               @if (folder.canBeRoot) {
                 <p-radiobutton
                   class="ml-auto pr-3"
-                  [ngModel]="selectedRootFolder()?.itemId"
+                  [ngModel]="selectedStorageItem()?.itemId"
                   [value]="folder.itemId"
                   [inputId]="folder.itemId"
                   (ngModelChange)="handleFolderSelection(folder)"
@@ -98,6 +101,25 @@ <h3>{{ 'settings.addons.configureAddon.selectFolder' | translate }}</h3>
     </div>
   }
 
+  @if (currentAddonType() === AddonType.LINK) {
+    <div class="flex flex-column gap-1">
+      <div class="flex align-items-center">
+        <h3>
+          {{ 'settings.addons.configureAddon.resourceType' | translate }}
+        </h3>
+        <p-button icon="fas fa-info-circle blue-icon" severity="secondary" text (onClick)="openInfoDialog()"></p-button>
+      </div>
+      <div class="resource-selector">
+        <osf-select
+          [fullWidth]="!!isMobile()"
+          [placeholder]="'settings.addons.configureAddon.chooseResourceType' | translate"
+          [options]="resourceTypeOptions()"
+          [(selectedValue)]="selectedResourceType"
+        ></osf-select>
+      </div>
+    </div>
+  }
+
   <div class="flex gap-4 justify-content-between sm:align-self-end">
     <p-button
       class="btn-full-width sm:w-10rem"
diff --git a/src/app/shared/components/addons/folder-selector/folder-selector.component.scss b/src/app/shared/components/addons/storage-item-selector/storage-item-selector.component.scss
similarity index 91%
rename from src/app/shared/components/addons/folder-selector/folder-selector.component.scss
rename to src/app/shared/components/addons/storage-item-selector/storage-item-selector.component.scss
index e899f12b3..6662ea6de 100644
--- a/src/app/shared/components/addons/folder-selector/folder-selector.component.scss
+++ b/src/app/shared/components/addons/storage-item-selector/storage-item-selector.component.scss
@@ -27,6 +27,11 @@
       color: var.$dark-blue-1;
     }
 
+    .folder-link-disabled {
+      opacity: 0.6;
+      cursor: not-allowed;
+    }
+
     .table-cell {
       width: 100%;
       height: 100%;
diff --git a/src/app/shared/components/addons/folder-selector/folder-selector.component.spec.ts b/src/app/shared/components/addons/storage-item-selector/storage-item-selector.component.spec.ts
similarity index 77%
rename from src/app/shared/components/addons/folder-selector/folder-selector.component.spec.ts
rename to src/app/shared/components/addons/storage-item-selector/storage-item-selector.component.spec.ts
index f5783c2fd..f57cb843e 100644
--- a/src/app/shared/components/addons/folder-selector/folder-selector.component.spec.ts
+++ b/src/app/shared/components/addons/storage-item-selector/storage-item-selector.component.spec.ts
@@ -1,16 +1,18 @@
 import { provideStore } from '@ngxs/store';
 
+import { DialogService } from 'primeng/dynamicdialog';
+
 import { signal } from '@angular/core';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { OperationNames } from '@osf/features/project/addons/enums';
-import { FolderSelectorComponent } from '@shared/components/addons';
+import { StorageItemSelectorComponent } from '@shared/components/addons';
 import { MOCK_STORE, TranslateServiceMock } from '@shared/mocks';
 import { StorageItemModel } from '@shared/models';
 
-describe('FolderSelectorComponent', () => {
-  let component: FolderSelectorComponent;
-  let fixture: ComponentFixture<FolderSelectorComponent>;
+describe('StorageItemSelectorComponent', () => {
+  let component: StorageItemSelectorComponent;
+  let fixture: ComponentFixture<StorageItemSelectorComponent>;
 
   beforeEach(async () => {
     MOCK_STORE.selectSignal.mockImplementation((selector) => {
@@ -21,11 +23,21 @@ describe('FolderSelectorComponent', () => {
     });
 
     await TestBed.configureTestingModule({
-      imports: [FolderSelectorComponent],
-      providers: [TranslateServiceMock, provideStore([]), { provide: 'Store', useValue: MOCK_STORE }],
+      imports: [StorageItemSelectorComponent],
+      providers: [
+        TranslateServiceMock,
+        provideStore([]),
+        { provide: 'Store', useValue: MOCK_STORE },
+        {
+          provide: DialogService,
+          useValue: {
+            open: jest.fn(),
+          },
+        },
+      ],
     }).compileComponents();
 
-    fixture = TestBed.createComponent(FolderSelectorComponent);
+    fixture = TestBed.createComponent(StorageItemSelectorComponent);
     component = fixture.componentInstance;
   });
 
@@ -64,17 +76,17 @@ describe('FolderSelectorComponent', () => {
     expect(saveSpy).toHaveBeenCalled();
   });
 
-  it('should set selectedRootFolderId', () => {
+  it('should set selectedStorageItemId', () => {
     const mockFolder: StorageItemModel = {
       itemId: 'test-folder-id',
       itemName: 'Test Folder',
       itemType: 'folder',
     } as StorageItemModel;
 
-    (component as any).selectedRootFolder.set(mockFolder);
+    (component as any).selectedStorageItem.set(mockFolder);
     (component as any).handleSave();
 
-    expect(component.selectedRootFolderId()).toBe('test-folder-id');
+    expect(component.selectedStorageItemId()).toBe('test-folder-id');
   });
 
   it('should emit cancelSelection event', () => {
diff --git a/src/app/shared/components/addons/storage-item-selector/storage-item-selector.component.ts b/src/app/shared/components/addons/storage-item-selector/storage-item-selector.component.ts
new file mode 100644
index 000000000..06b15c0ca
--- /dev/null
+++ b/src/app/shared/components/addons/storage-item-selector/storage-item-selector.component.ts
@@ -0,0 +1,266 @@
+import { createDispatchMap, select } from '@ngxs/store';
+
+import { TranslatePipe, TranslateService } from '@ngx-translate/core';
+
+import { MenuItem } from 'primeng/api';
+import { BreadcrumbModule } from 'primeng/breadcrumb';
+import { Button } from 'primeng/button';
+import { Card } from 'primeng/card';
+import { DialogService } from 'primeng/dynamicdialog';
+import { InputText } from 'primeng/inputtext';
+import { RadioButton } from 'primeng/radiobutton';
+import { Skeleton } from 'primeng/skeleton';
+
+import {
+  ChangeDetectionStrategy,
+  Component,
+  computed,
+  DestroyRef,
+  effect,
+  inject,
+  input,
+  model,
+  OnInit,
+  output,
+  signal,
+} from '@angular/core';
+import { takeUntilDestroyed, toSignal } from '@angular/core/rxjs-interop';
+import { FormControl, FormsModule, ReactiveFormsModule } from '@angular/forms';
+
+import { OperationNames } from '@osf/features/project/addons/enums';
+import { SelectComponent } from '@shared/components';
+import { ResourceTypeInfoDialogComponent } from '@shared/components/addons/resource-type-info-dialog/resource-type-info-dialog.component';
+import { AddonType, StorageItemType } from '@shared/enums';
+import { convertCamelCaseToNormal, IS_MEDIUM, IS_XSMALL } from '@shared/helpers';
+import { OperationInvokeData, StorageItem } from '@shared/models';
+import { AddonsSelectors, ClearOperationInvocations } from '@shared/stores/addons';
+
+import { GoogleFilePickerComponent } from './google-file-picker/google-file-picker.component';
+
+@Component({
+  selector: 'osf-storage-item-selector',
+  templateUrl: './storage-item-selector.component.html',
+  styleUrl: './storage-item-selector.component.scss',
+  imports: [
+    BreadcrumbModule,
+    Button,
+    Card,
+    FormsModule,
+    GoogleFilePickerComponent,
+    InputText,
+    RadioButton,
+    ReactiveFormsModule,
+    Skeleton,
+    TranslatePipe,
+    SelectComponent,
+  ],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class StorageItemSelectorComponent implements OnInit {
+  private destroyRef = inject(DestroyRef);
+  private translateService = inject(TranslateService);
+  private dialogService = inject(DialogService);
+  readonly AddonType = AddonType;
+  isMedium = toSignal(inject(IS_MEDIUM));
+  isMobile = toSignal(inject(IS_XSMALL));
+
+  isGoogleFilePicker = input.required<boolean>();
+  accountName = input.required<string>();
+  accountId = input.required<string>();
+  operationInvocationResult = input.required<StorageItem[]>();
+  accountNameControl = input(new FormControl());
+  isCreateMode = input(false);
+  currentAddonType = input<string>(AddonType.STORAGE);
+  supportedResourceTypes = input<string[]>([]);
+
+  selectedStorageItemId = model<string>('/');
+  selectedStorageItemUrl = model<string>('');
+  operationInvoke = output<OperationInvokeData>();
+  save = output<void>();
+  cancelSelection = output<void>();
+  readonly OperationNames = OperationNames;
+  readonly StorageItemType = StorageItemType;
+  hasInputChanged = signal(false);
+  hasFolderChanged = signal(false);
+  hasResourceTypeChanged = signal(false);
+  selectedResourceType = model<string>('');
+  selectedStorageItem = signal<StorageItem | null>(null);
+  initialResourceType = signal<string>('');
+  breadcrumbItems = signal<MenuItem[]>([]);
+
+  selectedItemLabel = computed(() => {
+    return this.currentAddonType() === AddonType.LINK
+      ? 'settings.addons.configureAddon.linkedItem'
+      : 'settings.addons.configureAddon.selectedFolder';
+  });
+
+  noSelectionLabel = computed(() => {
+    return this.currentAddonType() === AddonType.LINK
+      ? 'settings.addons.configureAddon.noLinkedItem'
+      : 'settings.addons.configureAddon.noFolderSelected';
+  });
+
+  resourceTypeOptions = computed(() => {
+    return this.supportedResourceTypes().map((type) => ({
+      label: convertCamelCaseToNormal(type),
+      value: type,
+    }));
+  });
+  initiallySelectedStorageItem = select(AddonsSelectors.getSelectedStorageItem);
+  isOperationInvocationSubmitting = select(AddonsSelectors.getOperationInvocationSubmitting);
+  isSubmitting = select(AddonsSelectors.getCreatedOrUpdatedConfiguredAddonSubmitting);
+  readonly homeBreadcrumb: MenuItem = {
+    id: '/',
+    label: this.translateService.instant('settings.addons.configureAddon.home'),
+    state: {
+      operationName: OperationNames.LIST_ROOT_ITEMS,
+    },
+  };
+
+  actions = createDispatchMap({
+    clearOperationInvocations: ClearOperationInvocations,
+  });
+
+  constructor() {
+    effect(() => {
+      const initialFolder = this.initiallySelectedStorageItem();
+      if (initialFolder && !this.selectedStorageItem()) {
+        this.selectedStorageItem.set(initialFolder);
+      }
+    });
+
+    effect(() => {
+      const currentResourceType = this.selectedResourceType();
+      const initialType = this.initialResourceType();
+
+      if (initialType) {
+        this.hasResourceTypeChanged.set(currentResourceType !== initialType);
+      }
+    });
+
+    effect(() => {
+      this.destroyRef.onDestroy(() => {
+        this.actions.clearOperationInvocations();
+      });
+    });
+  }
+
+  ngOnInit(): void {
+    this.initializeFormState();
+    this.setupAccountNameTracking();
+  }
+
+  private initializeFormState(): void {
+    this.initialResourceType.set(this.selectedResourceType());
+    this.resetChangeFlags();
+  }
+
+  private resetChangeFlags(): void {
+    this.hasInputChanged.set(false);
+    this.hasFolderChanged.set(false);
+    this.hasResourceTypeChanged.set(false);
+  }
+
+  private setupAccountNameTracking(): void {
+    this.accountNameControl()
+      ?.valueChanges.pipe(takeUntilDestroyed(this.destroyRef))
+      .subscribe((newValue) => {
+        this.hasInputChanged.set(newValue !== this.accountName());
+      });
+  }
+
+  readonly isFormValid = computed(() => {
+    const isLinkAddon = this.currentAddonType() === AddonType.LINK;
+    const hasResourceType = isLinkAddon ? !!this.selectedResourceType() : true;
+
+    if (!hasResourceType) {
+      return false;
+    }
+
+    if (this.isCreateMode()) {
+      return this.hasFolderChanged();
+    }
+
+    return this.hasInputChanged() || this.hasFolderChanged() || this.hasResourceTypeChanged();
+  });
+
+  handleCreateOperationInvocation(
+    operationName: OperationNames,
+    itemId: string,
+    itemName?: string,
+    mayContainRootCandidates?: boolean
+  ): void {
+    this.updateBreadcrumbs(operationName, itemId, itemName, mayContainRootCandidates);
+
+    this.operationInvoke.emit({
+      operationName,
+      itemId,
+    });
+
+    this.trimBreadcrumbs(itemId);
+  }
+
+  handleSave(): void {
+    this.selectedStorageItemId.set(this.selectedStorageItem()?.itemId || '');
+    this.selectedStorageItemUrl.set(this.selectedStorageItem()?.itemLink || '');
+    this.save.emit();
+  }
+
+  handleCancel(): void {
+    this.cancelSelection.emit();
+  }
+
+  handleFolderSelection(folder: StorageItem): void {
+    this.selectedStorageItem.set(folder);
+    this.hasFolderChanged.set(folder?.itemId !== this.initiallySelectedStorageItem()?.itemId);
+  }
+
+  private updateBreadcrumbs(
+    operationName: OperationNames,
+    itemId: string,
+    itemName?: string,
+    mayContainRootCandidates?: boolean
+  ): void {
+    if (operationName === OperationNames.LIST_ROOT_ITEMS) {
+      this.breadcrumbItems.set([]);
+      return;
+    }
+
+    if (itemName && mayContainRootCandidates) {
+      const breadcrumbs = [...this.breadcrumbItems()];
+      const item = {
+        id: itemId,
+        label: itemName,
+        state: {
+          operationName: mayContainRootCandidates ? OperationNames.LIST_CHILD_ITEMS : OperationNames.GET_ITEM_INFO,
+        },
+      };
+
+      this.breadcrumbItems.set([...breadcrumbs, item]);
+    }
+  }
+
+  private trimBreadcrumbs(itemId: string): void {
+    const currentBreadcrumbs = this.breadcrumbItems();
+
+    const targetIndex = currentBreadcrumbs.findIndex((item) => item.id === itemId);
+
+    if (targetIndex !== -1) {
+      const trimmedBreadcrumbs = currentBreadcrumbs.slice(0, targetIndex + 1);
+      this.breadcrumbItems.set(trimmedBreadcrumbs);
+    }
+  }
+
+  openInfoDialog() {
+    const dialogWidth = this.isMedium() ? '850px' : '95vw';
+
+    this.dialogService.open(ResourceTypeInfoDialogComponent, {
+      width: dialogWidth,
+      focusOnShow: false,
+      header: this.translateService.instant('settings.addons.configureAddon.aboutResourceType'),
+      closeOnEscape: true,
+      modal: true,
+      closable: true,
+    });
+  }
+}
diff --git a/src/app/shared/constants/addons-category-options.const.ts b/src/app/shared/constants/addons-category-options.const.ts
index 35476bbc9..7d36a88f3 100644
--- a/src/app/shared/constants/addons-category-options.const.ts
+++ b/src/app/shared/constants/addons-category-options.const.ts
@@ -10,4 +10,8 @@ export const ADDON_CATEGORY_OPTIONS: SelectOption[] = [
     label: 'settings.addons.categories.citationManager',
     value: AddonCategory.EXTERNAL_CITATION_SERVICES,
   },
+  {
+    label: 'settings.addons.categories.linkedServices',
+    value: AddonCategory.EXTERNAL_LINK_SERVICES,
+  },
 ];
diff --git a/src/app/shared/constants/addons-tab-options.const.ts b/src/app/shared/constants/addons-tab-options.const.ts
index 088785d21..5f85df2f4 100644
--- a/src/app/shared/constants/addons-tab-options.const.ts
+++ b/src/app/shared/constants/addons-tab-options.const.ts
@@ -10,4 +10,8 @@ export const ADDON_TAB_OPTIONS: SelectOption[] = [
     label: 'settings.addons.tabs.connectedAddons',
     value: AddonTabValue.CONNECTED_ADDONS,
   },
+  {
+    label: 'settings.addons.tabs.linkedServices',
+    value: AddonTabValue.LINK_ADDONS,
+  },
 ];
diff --git a/src/app/shared/enums/addon-service-names.enum.ts b/src/app/shared/enums/addon-service-names.enum.ts
new file mode 100644
index 000000000..d0957f948
--- /dev/null
+++ b/src/app/shared/enums/addon-service-names.enum.ts
@@ -0,0 +1,16 @@
+export enum AddonServiceNames {
+  figshare = 'figshare',
+  onedrive = 'Onedrive',
+  dropbox = 'Dropbox',
+  googledrive = 'Google Drive',
+  bitbucket = 'Bitbucket',
+  s3 = 'S3',
+  box = 'Box',
+  github = 'Github',
+  dataverse = 'Dataverse',
+  gitlab = 'GitLab',
+  owncloud = 'ownCloud',
+  mendeley = 'Mendeley',
+  zotero = 'Zotero',
+  link_dataverse = 'Dataverse ',
+}
diff --git a/src/app/shared/enums/addon-tab.enum.ts b/src/app/shared/enums/addon-tab.enum.ts
index 2eea4541f..df93ce4cb 100644
--- a/src/app/shared/enums/addon-tab.enum.ts
+++ b/src/app/shared/enums/addon-tab.enum.ts
@@ -1,4 +1,5 @@
 export enum AddonTabValue {
   ALL_ADDONS = 0,
   CONNECTED_ADDONS,
+  LINK_ADDONS,
 }
diff --git a/src/app/shared/enums/addon-type.enum.ts b/src/app/shared/enums/addon-type.enum.ts
new file mode 100644
index 000000000..8b16ce88e
--- /dev/null
+++ b/src/app/shared/enums/addon-type.enum.ts
@@ -0,0 +1,17 @@
+export enum AddonType {
+  STORAGE = 'storage',
+  CITATION = 'citation',
+  LINK = 'link',
+}
+
+export enum AuthorizedAccountType {
+  STORAGE = 'authorized-storage-accounts',
+  CITATION = 'authorized-citation-accounts',
+  LINK = 'authorized-link-accounts',
+}
+
+export enum ConfiguredAddonType {
+  STORAGE = 'configured-storage-addons',
+  CITATION = 'configured-citation-addons',
+  LINK = 'configured-link-addons',
+}
diff --git a/src/app/shared/enums/addons-category.enum.ts b/src/app/shared/enums/addons-category.enum.ts
index 0e6b24b48..c08bb9358 100644
--- a/src/app/shared/enums/addons-category.enum.ts
+++ b/src/app/shared/enums/addons-category.enum.ts
@@ -1,4 +1,5 @@
 export enum AddonCategory {
   EXTERNAL_STORAGE_SERVICES = 'external-storage-services',
   EXTERNAL_CITATION_SERVICES = 'external-citation-services',
+  EXTERNAL_LINK_SERVICES = 'external-link-services',
 }
diff --git a/src/app/shared/enums/index.ts b/src/app/shared/enums/index.ts
index fdba974f2..7fa1b47a4 100644
--- a/src/app/shared/enums/index.ts
+++ b/src/app/shared/enums/index.ts
@@ -1,5 +1,7 @@
 export * from './addon-form-controls.enum';
+export * from './addon-service-names.enum';
 export * from './addon-tab.enum';
+export * from './addon-type.enum';
 export * from './addons-category.enum';
 export * from './addons-credentials-format.enum';
 export * from './block-type.enum';
@@ -29,6 +31,7 @@ export * from './revision-review-states.enum';
 export * from './share-indexing.enum';
 export * from './sort-order.enum';
 export * from './sort-type.enum';
+export * from './storage-item-type.enum';
 export * from './subscriptions';
 export * from './trigger-action.enum';
 export * from './user-permissions.enum';
diff --git a/src/app/shared/enums/storage-item-type.enum.ts b/src/app/shared/enums/storage-item-type.enum.ts
new file mode 100644
index 000000000..ece308216
--- /dev/null
+++ b/src/app/shared/enums/storage-item-type.enum.ts
@@ -0,0 +1,4 @@
+export enum StorageItemType {
+  Folder = 'FOLDER',
+  Resource = 'RESOURCE',
+}
diff --git a/src/app/shared/helpers/addon-type.helper.ts b/src/app/shared/helpers/addon-type.helper.ts
index 9374eb6bf..38adf3f89 100644
--- a/src/app/shared/helpers/addon-type.helper.ts
+++ b/src/app/shared/helpers/addon-type.helper.ts
@@ -1,49 +1,64 @@
-import { AddonModel, AuthorizedAccountModel, ConfiguredStorageAddonModel } from '@shared/models';
+import { AddonCategory, AddonType, AuthorizedAccountType, ConfiguredAddonType } from '@shared/enums';
+import { AddonModel, AuthorizedAccountModel, ConfiguredAddonModel } from '@shared/models';
 
-export function isStorageAddon(
-  addon: AddonModel | AuthorizedAccountModel | ConfiguredStorageAddonModel | null
-): boolean {
+export function isStorageAddon(addon: AddonModel | AuthorizedAccountModel | ConfiguredAddonModel | null): boolean {
   if (!addon) return false;
 
   return (
-    addon.type === 'external-storage-services' ||
-    addon.type === 'authorized-storage-accounts' ||
-    addon.type === 'configured-storage-addons'
+    addon.type === AddonCategory.EXTERNAL_STORAGE_SERVICES ||
+    addon.type === AuthorizedAccountType.STORAGE ||
+    addon.type === ConfiguredAddonType.STORAGE
   );
 }
 
-export function isCitationAddon(
-  addon: AddonModel | AuthorizedAccountModel | ConfiguredStorageAddonModel | null
-): boolean {
+export function isCitationAddon(addon: AddonModel | AuthorizedAccountModel | ConfiguredAddonModel | null): boolean {
   if (!addon) return false;
 
   return (
-    addon.type === 'external-citation-services' ||
-    addon.type === 'authorized-citation-accounts' ||
-    addon.type === 'configured-citation-addons'
+    addon.type === AddonCategory.EXTERNAL_CITATION_SERVICES ||
+    addon.type === AuthorizedAccountType.CITATION ||
+    addon.type === ConfiguredAddonType.CITATION
   );
 }
 
-export function getAddonTypeString(
-  addon: AddonModel | AuthorizedAccountModel | ConfiguredStorageAddonModel | null
-): string {
+export function isLinkAddon(addon: AddonModel | AuthorizedAccountModel | ConfiguredAddonModel | null): boolean {
+  if (!addon) return false;
+
+  return (
+    addon.type === AddonCategory.EXTERNAL_LINK_SERVICES ||
+    addon.type === AuthorizedAccountType.LINK ||
+    addon.type === ConfiguredAddonType.LINK
+  );
+}
+
+export function getAddonTypeString(addon: AddonModel | AuthorizedAccountModel | ConfiguredAddonModel | null): string {
   if (!addon) return '';
 
-  return isStorageAddon(addon) ? 'storage' : 'citation';
+  if (isStorageAddon(addon)) {
+    return AddonType.STORAGE;
+  } else if (isLinkAddon(addon)) {
+    return AddonType.LINK;
+  } else {
+    return AddonType.CITATION;
+  }
 }
 
-export function isAuthorizedAddon(
-  addon: AddonModel | AuthorizedAccountModel | ConfiguredStorageAddonModel | null
-): boolean {
+export function isAuthorizedAddon(addon: AddonModel | AuthorizedAccountModel | ConfiguredAddonModel | null): boolean {
   if (!addon) return false;
 
-  return addon.type === 'authorized-storage-accounts' || addon.type === 'authorized-citation-accounts';
+  return (
+    addon.type === AuthorizedAccountType.STORAGE ||
+    addon.type === AuthorizedAccountType.CITATION ||
+    addon.type === AuthorizedAccountType.LINK
+  );
 }
 
-export function isConfiguredAddon(
-  addon: AddonModel | AuthorizedAccountModel | ConfiguredStorageAddonModel | null
-): boolean {
+export function isConfiguredAddon(addon: AddonModel | AuthorizedAccountModel | ConfiguredAddonModel | null): boolean {
   if (!addon) return false;
 
-  return addon.type === 'configured-storage-addons' || addon.type === 'configured-citation-addons';
+  return (
+    addon.type === ConfiguredAddonType.STORAGE ||
+    addon.type === ConfiguredAddonType.CITATION ||
+    addon.type === ConfiguredAddonType.LINK
+  );
 }
diff --git a/src/app/shared/helpers/camel-case-to-normal.helper.ts b/src/app/shared/helpers/camel-case-to-normal.helper.ts
new file mode 100644
index 000000000..190fb9037
--- /dev/null
+++ b/src/app/shared/helpers/camel-case-to-normal.helper.ts
@@ -0,0 +1,6 @@
+export function convertCamelCaseToNormal(text: string): string {
+  return text
+    .replace(/([A-Z])/g, ' $1')
+    .replace(/^./, (str) => str.toUpperCase())
+    .trim();
+}
diff --git a/src/app/shared/helpers/index.ts b/src/app/shared/helpers/index.ts
index fd6aa06bf..901677ae5 100644
--- a/src/app/shared/helpers/index.ts
+++ b/src/app/shared/helpers/index.ts
@@ -2,6 +2,7 @@ export * from './addon-type.helper';
 export * from './breakpoints.tokens';
 export * from './browser-tab.helper';
 export * from './camel-case';
+export * from './camel-case-to-normal.helper';
 export * from './convert-to-snake-case.helper';
 export * from './custom-form-validators.helper';
 export * from './find-changed-fields';
diff --git a/src/app/shared/mappers/addon.mapper.ts b/src/app/shared/mappers/addon.mapper.ts
index 3594eacb6..2021d910f 100644
--- a/src/app/shared/mappers/addon.mapper.ts
+++ b/src/app/shared/mappers/addon.mapper.ts
@@ -1,10 +1,11 @@
+import { AddonCategory, AuthorizedAccountType, ConfiguredAddonType } from '../enums';
 import {
   AddonGetResponseJsonApi,
   AddonModel,
   AuthorizedAccountModel,
   AuthorizedAddonGetResponseJsonApi,
   ConfiguredAddonGetResponseJsonApi,
-  ConfiguredStorageAddonModel,
+  ConfiguredAddonModel,
   IncludedAddonData,
   OperationInvocation,
   OperationInvocationResponseJsonApi,
@@ -21,6 +22,7 @@ export class AddonMapper {
       displayName: response.attributes.display_name,
       externalServiceName: response.attributes.external_service_name,
       supportedFeatures: response.attributes.supported_features,
+      supportedResourceTypes: response.attributes.supported_resource_types,
       credentialsFormat: response.attributes.credentials_format,
       providerName: response.attributes.display_name,
     };
@@ -31,13 +33,17 @@ export class AddonMapper {
     included?: IncludedAddonData[]
   ): AuthorizedAccountModel {
     const externalServiceData =
-      response.relationships?.external_storage_service?.data || response.relationships?.external_citation_service?.data;
+      response.relationships?.external_storage_service?.data ||
+      response.relationships?.external_citation_service?.data ||
+      response.relationships?.external_link_service?.data;
 
     const externalServiceId = externalServiceData?.id;
 
     const matchingService = included?.find(
       (item) =>
-        (item.type === 'external-storage-services' || item.type === 'external-citation-services') &&
+        (item.type === AddonCategory.EXTERNAL_STORAGE_SERVICES ||
+          item.type === AddonCategory.EXTERNAL_CITATION_SERVICES ||
+          item.type === AddonCategory.EXTERNAL_LINK_SERVICES) &&
         item.id === externalServiceId
     )?.attributes;
 
@@ -56,7 +62,7 @@ export class AddonMapper {
       authorizedOperationNames: response.attributes.authorized_operation_names,
       defaultRootFolder: response.attributes.default_root_folder,
       credentialsAvailable: response.attributes.credentials_available,
-      oauthToken: response.attributes.oauth_token,
+      oauthToken: response.attributes.oauth_token || '',
       accountOwnerId: response.relationships.account_owner.data.id,
       externalStorageServiceId: externalServiceId || '',
       externalServiceName,
@@ -66,25 +72,16 @@ export class AddonMapper {
     };
   }
 
-  /**
-   * Maps a JSON:API-formatted response object into a `ConfiguredAddon` domain model.
-   *
-   * @param response - The raw API response object representing a configured addon.
-   * This must conform to the `ConfiguredAddonGetResponseJsonApi` structure.
-   *
-   * @returns A `ConfiguredAddon` object with normalized and flattened properties
-   * for application use.
-   *
-   * @example
-   * const addon = AddonMapper.fromConfiguredAddonResponse(apiResponse);
-   */
-  static fromConfiguredAddonResponse(response: ConfiguredAddonGetResponseJsonApi): ConfiguredStorageAddonModel {
+  static fromConfiguredAddonResponse(response: ConfiguredAddonGetResponseJsonApi): ConfiguredAddonModel {
+    const isLinkAddon = response.type === ConfiguredAddonType.LINK;
     return {
       type: response.type,
       id: response.id,
       displayName: response.attributes.display_name,
       externalServiceName: response.attributes.external_service_name,
-      selectedFolderId: response.attributes.root_folder,
+      selectedStorageItemId: isLinkAddon ? response.attributes.target_id || '' : response.attributes.root_folder || '',
+      resourceType: response.attributes.resource_type,
+      targetUrl: response.attributes.target_url,
       connectedCapabilities: response.attributes.connected_capabilities,
       connectedOperationNames: response.attributes.connected_operation_names,
       currentUserIsOwner: response.attributes.current_user_is_owner,
@@ -101,21 +98,25 @@ export class AddonMapper {
     // const isOperationResult = 'items' in operationResult && 'total_count' in operationResult;
     const isOperationResult = 'items' in operationResult;
 
+    const isLinkAddon = response.relationships?.thru_account?.data?.type === AuthorizedAccountType.LINK;
+
     const mappedOperationResult = isOperationResult
       ? operationResult.items.map((item: StorageItemResponseJsonApi) => ({
           itemId: item.item_id,
           itemName: item.item_name,
           itemType: item.item_type,
-          canBeRoot: item.can_be_root,
-          mayContainRootCandidates: item.may_contain_root_candidates,
+          itemLink: item.item_link,
+          canBeRoot: item.can_be_root ?? true,
+          mayContainRootCandidates: item.may_contain_root_candidates ?? isLinkAddon,
         }))
       : [
           {
             itemId: operationResult.item_id,
             itemName: operationResult.item_name,
             itemType: operationResult.item_type,
-            canBeRoot: operationResult.can_be_root,
-            mayContainRootCandidates: operationResult.may_contain_root_candidates,
+            itemLink: operationResult.item_link,
+            canBeRoot: operationResult.can_be_root ?? true,
+            mayContainRootCandidates: operationResult.may_contain_root_candidates ?? isLinkAddon,
           },
         ];
     return {
diff --git a/src/app/shared/models/addons/addons.models.ts b/src/app/shared/models/addons/addons.models.ts
index acd5d0a57..5f3590524 100644
--- a/src/app/shared/models/addons/addons.models.ts
+++ b/src/app/shared/models/addons/addons.models.ts
@@ -1,67 +1,20 @@
-/**
- * JSON:API response structure for a single external addon.
- */
 export interface AddonGetResponseJsonApi {
-  /**
-   * Resource type (e.g., 'external-storage-services').
-   */
   type: string;
-  /**
-   * Unique identifier for the addon.
-   */
   id: string;
-  /**
-   * Addon metadata fields returned from the API.
-   */
   attributes: {
-    /**
-     * OAuth authorization URI for the external provider.
-     */
     auth_uri: string;
-    /**
-     * Human-readable name of the addon (e.g., "Google Drive").
-     */
     display_name: string;
-    /**
-     * List of supported capabilities for this addon
-     * (e.g., 'DOWNLOAD_AS_ZIP', 'PERMISSIONS').
-     */
     supported_features: string[];
-    /**
-     * Internal identifier for the external provider
-     * (e.g., 'googledrive', 'figshare').
-     */
+    supported_resource_types?: string[];
     external_service_name: string;
-    /**
-     * Type of credentials used to authenticate
-     * (e.g., 'OAUTH2', 'S3').
-     */
     credentials_format: string;
-    /**
-     * Internal WaterButler key used for routing and integration.
-     */
     wb_key: string;
-    /**
-     * Additional provider-specific fields (if present).
-     */
     [key: string]: unknown;
   };
-  /**
-   * Object relationships to other API resources.
-   */
   relationships: {
-    /**
-     * Reference to the associated addon implementation.
-     */
     addon_imp: {
       data: {
-        /**
-         * Resource type of the related addon implementation.
-         */
         type: string;
-        /**
-         * Resource ID of the related addon implementation.
-         */
         id: string;
       };
     };
@@ -79,7 +32,7 @@ export interface AuthorizedAddonGetResponseJsonApi {
     authorized_operation_names: string[];
     default_root_folder: string;
     credentials_available: boolean;
-    oauth_token: string;
+    oauth_token?: string;
   };
   relationships: {
     account_owner: {
@@ -100,131 +53,55 @@ export interface AuthorizedAddonGetResponseJsonApi {
         id: string;
       };
     };
+    external_link_service?: {
+      data: {
+        type: string;
+        id: string;
+      };
+    };
   };
 }
 
-/**
- * Interface representing the JSON:API response shape for a configured addon.
- *
- * This structure is returned from the backend when querying for configured addons
- * related to a specific resource or user. It conforms to the JSON:API specification.
- */
 export interface ConfiguredAddonGetResponseJsonApi {
-  /**
-   * The resource type (e.g., "configured-storage-addons").
-   */
   type: string;
-  /**
-   * Unique identifier of the configured addon.
-   */
   id: string;
-  /**
-   * Attributes associated with the configured addon.
-   */
   attributes: {
-    /**
-     * Display name shown to users (e.g., "Google Drive").
-     */
     display_name: string;
-    /**
-     * Internal identifier of the external storage service (e.g., "googledrive").
-     */
     external_service_name: string;
-    /**
-     * ID of the root folder selected during configuration.
-     */
-    root_folder: string;
-    /**
-     * List of capabilities enabled for this addon (e.g., "DOWNLOAD", "UPLOAD").
-     */
+    root_folder?: string;
+    resource_type?: string;
+    target_id?: string;
+    target_url?: string;
     connected_capabilities: string[];
-    /**
-     * List of operation names tied to the addon configuration.
-     */
     connected_operation_names: string[];
-    /**
-     * Indicates whether the current user is the owner of this addon configuration.
-     */
     current_user_is_owner: boolean;
   };
-
-  /**
-   * Relationships to other entities, such as accounts or external services.
-   */
   relationships: {
-    /**
-     * Reference to the base account used for this addon.
-     */
     base_account: {
       data: {
-        /**
-         * Resource type of the account (e.g., "accounts").
-         */
         type: string;
-        /**
-         * Unique identifier of the account.
-         */
         id: string;
       };
     };
-
-    /**
-     * Reference to the underlying external storage service (e.g., Dropbox, Drive).
-     */
     external_storage_service: {
       data: {
-        /**
-         * Resource type of the storage service.
-         */
         type: string;
-        /**
-         * Unique identifier of the storage service.
-         */
         id: string;
       };
     };
   };
 }
 
-/**
- * Normalized model representing an external addon provider.
- */
 export interface AddonModel {
-  /**
-   * Resource type, typically 'external-storage-services'.
-   */
   type: string;
-  /**
-   * Unique identifier of the addon instance.
-   */
   id: string;
-  /**
-   * OAuth authorization URI for initiating credential flow.
-   */
   authUrl: string;
-  /**
-   * Human-friendly name of the addon (e.g., 'Google Drive').
-   */
   displayName: string;
-  /**
-   * Machine-friendly name of the addon (e.g., 'googledrive').
-   */
   externalServiceName: string;
-  /**
-   * List of supported features or capabilities the addon provides.
-   */
   supportedFeatures: string[];
-  /**
-   * Credential mechanism used by the addon (e.g., 'OAUTH2', 'S3').
-   */
+  supportedResourceTypes?: string[];
   credentialsFormat: string;
-  /**
-   * Provider key used internally (e.g., for icon or routing).
-   */
   providerName: string;
-  /**
-   * Internal WaterButler key used for addon routing.
-   */
   wbKey: string;
 }
 
@@ -290,6 +167,12 @@ export interface AuthorizedAddonRequestJsonApi {
           id: string;
         };
       };
+      external_link_service?: {
+        data: {
+          type: string;
+          id: string;
+        };
+      };
     };
     type: string;
   };
@@ -314,7 +197,19 @@ export interface AuthorizedAddonResponseJsonApi {
         id: string;
       };
     };
-    external_storage_service: {
+    external_storage_service?: {
+      data: {
+        type: string;
+        id: string;
+      };
+    };
+    external_citation_service?: {
+      data: {
+        type: string;
+        id: string;
+      };
+    };
+    external_link_service?: {
       data: {
         type: string;
         id: string;
@@ -330,7 +225,9 @@ export interface ConfiguredAddonRequestJsonApi {
       display_name: string;
       connected_capabilities: string[];
       connected_operation_names: string[];
-      root_folder: string;
+      root_folder?: string | null;
+      target_id?: string | null;
+      target_url?: string | null;
       external_service_name: string;
     };
     relationships: {
@@ -377,6 +274,9 @@ export interface ConfiguredAddonResponseJsonApi {
     attributes: {
       display_name: string;
       root_folder: string;
+      resource_type?: string;
+      target_id?: string;
+      target_url?: string;
       connected_capabilities: string[];
       connected_operation_names: string[];
       current_user_is_owner: boolean;
diff --git a/src/app/shared/models/addons/configured-addon.model.ts b/src/app/shared/models/addons/configured-addon.model.ts
new file mode 100644
index 000000000..b1bf1bac3
--- /dev/null
+++ b/src/app/shared/models/addons/configured-addon.model.ts
@@ -0,0 +1,16 @@
+export interface ConfiguredAddonModel {
+  type: string;
+  id: string;
+  displayName: string;
+  externalServiceName: string;
+  selectedStorageItemId: string;
+  resourceType?: string;
+  targetUrl?: string;
+  connectedCapabilities: string[];
+  connectedOperationNames: string[];
+  currentUserIsOwner: boolean;
+  baseAccountId: string;
+  baseAccountType: string;
+  externalStorageServiceId?: string;
+  rootFolderId?: string;
+}
diff --git a/src/app/shared/models/addons/configured-storage-addon.model.ts b/src/app/shared/models/addons/configured-storage-addon.model.ts
deleted file mode 100644
index d3e907e4d..000000000
--- a/src/app/shared/models/addons/configured-storage-addon.model.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-/**
- * Represents a configured external addon instance for a resource (e.g., a linked storage service).
- *
- * This model is used after an addon has been fully authorized and configured for a specific project
- * or user in the OSF system. It includes metadata about the integration, ownership, and operational capabilities.
- */
-export interface ConfiguredStorageAddonModel {
-  /**
-   * The JSON:API resource type (typically "configured-storage-addons").
-   */
-  type: string;
-  /**
-   * The unique identifier for the configured addon instance.
-   */
-  id: string;
-  /**
-   * The human-readable name of the external service (e.g., "Google Drive").
-   */
-  displayName: string;
-  /**
-   * The internal key used to identify the service provider (e.g., "googledrive").
-   */
-  externalServiceName: string;
-  /**
-   * The ID of the folder selected as the root for the addon connection.
-   */
-  selectedFolderId: string;
-  /**
-   * A list of capabilities supported by this addon (e.g., ADD_UPDATE_FILES, PERMISSIONS).
-   */
-  connectedCapabilities: string[];
-  /**
-   * A list of connected operation names available through this addon (e.g., UPLOAD_FILE).
-   */
-  connectedOperationNames: string[];
-  /**
-   * Indicates whether the current user is the owner of the configured addon.
-   */
-  currentUserIsOwner: boolean;
-  /**
-   * The ID of the base account associated with this addon configuration.
-   */
-  baseAccountId: string;
-  /**
-   * The resource type of the base account (e.g., "external-storage-accounts").
-   */
-  baseAccountType: string;
-  /**
-   * Optional: If linked to a parent storage service, provides its ID and name.
-   */
-  externalStorageServiceId?: string;
-  /**
-   * Optional: The root folder id
-   */
-  rootFolderId?: string;
-}
diff --git a/src/app/shared/models/addons/index.ts b/src/app/shared/models/addons/index.ts
index 0c82ab2fb..5d227d4cf 100644
--- a/src/app/shared/models/addons/index.ts
+++ b/src/app/shared/models/addons/index.ts
@@ -2,7 +2,7 @@ export * from './addon-form.model';
 export * from './addon-terms.model';
 export * from './addons.models';
 export * from './authorized-account.model';
-export * from './configured-storage-addon.model';
+export * from './configured-addon.model';
 export * from './operation-invocation.models';
 export * from './operation-invoke-data.model';
 export * from './strorage-item.model';
diff --git a/src/app/shared/models/addons/operation-invocation.models.ts b/src/app/shared/models/addons/operation-invocation.models.ts
index 2dfc69763..4ce3707d3 100644
--- a/src/app/shared/models/addons/operation-invocation.models.ts
+++ b/src/app/shared/models/addons/operation-invocation.models.ts
@@ -4,6 +4,7 @@ export interface StorageItemResponseJsonApi {
   item_id?: string;
   item_name?: string;
   item_type?: string;
+  item_link?: string;
   can_be_root?: boolean;
   may_contain_root_candidates?: boolean;
 }
@@ -52,11 +53,34 @@ export interface OperationInvocationResponseJsonApi {
     modified: string;
     operation_name: string;
   };
+  relationships?: {
+    thru_account?: {
+      data: {
+        type: string;
+        id: string;
+      };
+    };
+    thru_addon?: {
+      data: {
+        type: string;
+        id: string;
+      } | null;
+    };
+  };
   links: {
     self: string;
   };
 }
 
+export interface StorageItem {
+  itemId?: string;
+  itemName?: string;
+  itemType?: string;
+  itemLink?: string;
+  canBeRoot?: boolean;
+  mayContainRootCandidates?: boolean;
+}
+
 export interface OperationInvocation {
   id: string;
   type: string;
diff --git a/src/app/shared/services/activity-logs/activity-log-display.service.ts b/src/app/shared/services/activity-logs/activity-log-display.service.ts
index 9b32f126b..01b3ee112 100644
--- a/src/app/shared/services/activity-logs/activity-log-display.service.ts
+++ b/src/app/shared/services/activity-logs/activity-log-display.service.ts
@@ -28,7 +28,7 @@ export class ActivityLogDisplayService {
 
   private buildTranslationParams(log: ActivityLog): Record<string, unknown> {
     return {
-      addon: log.params.addon,
+      addon: log.params.addon || '',
       anonymousLink: this.formatter.buildAnonymous(log),
       commentLocation: this.formatter.buildCommentLocation(log),
       contributors: this.formatter.buildContributorsList(log),
diff --git a/src/app/shared/services/addons/addon-dialog.service.ts b/src/app/shared/services/addons/addon-dialog.service.ts
index c49fa3831..42205c03a 100644
--- a/src/app/shared/services/addons/addon-dialog.service.ts
+++ b/src/app/shared/services/addons/addon-dialog.service.ts
@@ -8,7 +8,8 @@ import { inject, Injectable } from '@angular/core';
 
 import { ConfirmAccountConnectionModalComponent } from '@osf/features/project/addons/components/confirm-account-connection-modal/confirm-account-connection-modal.component';
 import { DisconnectAddonModalComponent } from '@osf/features/project/addons/components/disconnect-addon-modal/disconnect-addon-modal.component';
-import { AuthorizedAccountModel, ConfiguredStorageAddonModel } from '@shared/models';
+import { AddonServiceNames } from '@shared/enums';
+import { AuthorizedAccountModel, ConfiguredAddonModel } from '@shared/models';
 
 @Injectable({
   providedIn: 'root',
@@ -17,11 +18,11 @@ export class AddonDialogService {
   private dialogService = inject(DialogService);
   private translateService = inject(TranslateService);
 
-  openDisconnectDialog(addon: ConfiguredStorageAddonModel): Observable<{ success: boolean }> {
+  openDisconnectDialog(addon: ConfiguredAddonModel): Observable<{ success: boolean }> {
     const dialogRef = this.dialogService.open(DisconnectAddonModalComponent, {
       focusOnShow: false,
       header: this.translateService.instant('settings.addons.configureAddon.disconnect', {
-        addonName: addon.externalServiceName,
+        addonName: AddonServiceNames[addon.externalServiceName as keyof typeof AddonServiceNames],
       }),
       closeOnEscape: true,
       modal: true,
diff --git a/src/app/shared/services/addons/addon-form.service.ts b/src/app/shared/services/addons/addon-form.service.ts
index d4ad7f373..a2e0c79da 100644
--- a/src/app/shared/services/addons/addon-form.service.ts
+++ b/src/app/shared/services/addons/addon-form.service.ts
@@ -2,14 +2,14 @@ import { inject, Injectable } from '@angular/core';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 
 import { isAuthorizedAddon } from '@osf/shared/helpers';
-import { AddonFormControls, CredentialsFormat } from '@shared/enums';
+import { AddonFormControls, AddonType, CredentialsFormat } from '@shared/enums';
 import {
   AddonForm,
   AddonModel,
   AuthorizedAccountModel,
   AuthorizedAddonRequestJsonApi,
+  ConfiguredAddonModel,
   ConfiguredAddonRequestJsonApi,
-  ConfiguredStorageAddonModel,
 } from '@shared/models';
 
 @Injectable({
@@ -119,8 +119,10 @@ export class AddonFormService {
     userReferenceId: string,
     resourceUri: string,
     displayName: string,
-    rootFolderId: string,
-    addonTypeString: string
+    selectedStorageItemId: string,
+    addonTypeString: string,
+    resourceType?: string,
+    selectedStorageItemUrl?: string
   ): ConfiguredAddonRequestJsonApi {
     return {
       data: {
@@ -128,10 +130,13 @@ export class AddonFormService {
         attributes: {
           authorized_resource_uri: resourceUri,
           display_name: displayName,
-          root_folder: rootFolderId,
+          ...(addonTypeString !== AddonType.LINK && { root_folder: selectedStorageItemId }),
           connected_capabilities: ['UPDATE', 'ACCESS'],
           connected_operation_names: ['list_child_items', 'list_root_items', 'get_item_info'],
           external_service_name: addon.externalServiceName,
+          ...(resourceType && { resource_type: resourceType }),
+          ...(addonTypeString === AddonType.LINK && { target_id: selectedStorageItemId }),
+          ...(addonTypeString === AddonType.LINK && { target_url: selectedStorageItemUrl }),
         },
         relationships: {
           account_owner: {
@@ -158,12 +163,14 @@ export class AddonFormService {
   }
 
   generateConfiguredAddonUpdatePayload(
-    addon: ConfiguredStorageAddonModel,
+    addon: ConfiguredAddonModel,
     userReferenceId: string,
     resourceUri: string,
     displayName: string,
-    rootFolderId: string,
-    addonTypeString: string
+    selectedStorageItemId: string,
+    addonTypeString: string,
+    resourceType?: string,
+    selectedStorageItemUrl?: string
   ): ConfiguredAddonRequestJsonApi {
     return {
       data: {
@@ -172,10 +179,13 @@ export class AddonFormService {
         attributes: {
           authorized_resource_uri: resourceUri,
           display_name: displayName,
-          root_folder: rootFolderId,
           connected_capabilities: ['UPDATE', 'ACCESS'],
           connected_operation_names: ['list_child_items', 'list_root_items', 'get_item_info'],
           external_service_name: addon.externalServiceName,
+          ...(resourceType && { resource_type: resourceType }),
+          ...(addonTypeString !== AddonType.LINK && { root_folder: selectedStorageItemId }),
+          ...(addonTypeString === AddonType.LINK && { target_id: selectedStorageItemId }),
+          target_url: selectedStorageItemUrl || null,
         },
         relationships: {
           account_owner: {
diff --git a/src/app/shared/services/addons/addon-operation-invocation.service.ts b/src/app/shared/services/addons/addon-operation-invocation.service.ts
index f468b07dc..1053d2e79 100644
--- a/src/app/shared/services/addons/addon-operation-invocation.service.ts
+++ b/src/app/shared/services/addons/addon-operation-invocation.service.ts
@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 
 import { OperationNames } from '@osf/features/project/addons/enums';
-import { AuthorizedAccountModel, ConfiguredStorageAddonModel, OperationInvocationRequestJsonApi } from '@shared/models';
+import { AuthorizedAccountModel, ConfiguredAddonModel, OperationInvocationRequestJsonApi } from '@shared/models';
 
 @Injectable({
   providedIn: 'root',
@@ -38,7 +38,7 @@ export class AddonOperationInvocationService {
   }
 
   createOperationInvocationPayload(
-    addon: ConfiguredStorageAddonModel,
+    addon: ConfiguredAddonModel,
     operationName: OperationNames,
     itemId: string
   ): OperationInvocationRequestJsonApi {
diff --git a/src/app/shared/services/addons/addons.service.spec.ts b/src/app/shared/services/addons/addons.service.spec.ts
index 3cacb9053..9920d2444 100644
--- a/src/app/shared/services/addons/addons.service.spec.ts
+++ b/src/app/shared/services/addons/addons.service.spec.ts
@@ -71,7 +71,9 @@ describe('Service: Addons', () => {
         rootFolderId: '0AIl0aR4C9JAFUk9PVA',
         externalServiceName: 'googledrive',
         id: '756579dc-3a24-4849-8866-698a60846ac3',
-        selectedFolderId: '0AIl0aR4C9JAFUk9PVA',
+        resourceType: undefined,
+        selectedStorageItemId: '0AIl0aR4C9JAFUk9PVA',
+        targetUrl: undefined,
         type: 'configured-storage-addons',
       })
     );
@@ -79,9 +81,9 @@ describe('Service: Addons', () => {
     expect(httpMock.verify).toBeTruthy();
   }));
 
-  it('should test getAuthorizedStorageAddons', inject([HttpTestingController], (httpMock: HttpTestingController) => {
+  it('should test getAuthorizedAddons', inject([HttpTestingController], (httpMock: HttpTestingController) => {
     let results: any[] = [];
-    service.getAuthorizedStorageAddons('storage', 'reference-id').subscribe((result) => {
+    service.getAuthorizedAddons('storage', 'reference-id').subscribe((result) => {
       results = result;
     });
 
diff --git a/src/app/shared/services/addons/addons.service.ts b/src/app/shared/services/addons/addons.service.ts
index 4e0d4baf1..05e317e8c 100644
--- a/src/app/shared/services/addons/addons.service.ts
+++ b/src/app/shared/services/addons/addons.service.ts
@@ -14,9 +14,9 @@ import {
   AuthorizedAddonRequestJsonApi,
   AuthorizedAddonResponseJsonApi,
   ConfiguredAddonGetResponseJsonApi,
+  ConfiguredAddonModel,
   ConfiguredAddonRequestJsonApi,
   ConfiguredAddonResponseJsonApi,
-  ConfiguredStorageAddonModel,
   IncludedAddonData,
   JsonApiResponse,
   OperationInvocation,
@@ -29,45 +29,22 @@ import { JsonApiService } from '@shared/services';
 
 import { environment } from 'src/environments/environment';
 
-/**
- * Service for managing addon-related operations within the OSF platform.
- *
- * This service provides methods for retrieving, configuring, and interacting
- * with external storage service addons (e.g., Google Drive, Dropbox).
- * It communicates with the OSF Addons API and maps responses into domain models.
- *
- * Used by components and state layers to facilitate addon workflows such as
- * integration configuration, credential management, and supported feature handling.
- *
- */
 @Injectable({
   providedIn: 'root',
 })
 export class AddonsService {
-  /**
-   * Injected instance of the JSON:API service used for making API requests.
-   * This service handles standardized JSON:API request and response formatting.
-   */
   private jsonApiService = inject(JsonApiService);
   private apiUrl = environment.addonsApiUrl;
-
-  /**
-   * Signal holding the current authenticated user from the global NGXS store.
-   * Typically used for access control, display logic, or personalized API calls.
-   */
   private currentUser = select(UserSelectors.getCurrentUser);
 
-  /**
-   * Retrieves a list of external storage service addons by type.
-   *
-   * @param addonType - The addon type to fetch (e.g., 'storage').
-   * @returns Observable emitting an array of mapped Addon objects.
-   *
-   */
   getAddons(addonType: string): Observable<AddonModel[]> {
     return this.jsonApiService
       .get<JsonApiResponse<AddonGetResponseJsonApi[], null>>(`${this.apiUrl}/external-${addonType}-services`)
-      .pipe(map((response) => response.data.map((item) => AddonMapper.fromResponse(item))));
+      .pipe(
+        map((response) => {
+          return response.data.map((item) => AddonMapper.fromResponse(item));
+        })
+      );
   }
 
   getAddonsUserReference(): Observable<UserReferenceJsonApi[]> {
@@ -91,15 +68,18 @@ export class AddonsService {
       .pipe(map((response) => response.data));
   }
 
-  getAuthorizedStorageAddons(addonType: string, referenceId: string): Observable<AuthorizedAccountModel[]> {
-    const params = { [`fields[external-${addonType}-services]`]: 'external_service_name' };
-
+  getAuthorizedAddons(addonType: string, referenceId: string): Observable<AuthorizedAccountModel[]> {
+    const params = {
+      [`fields[external-${addonType}-services]`]: 'external_service_name',
+    };
     return this.jsonApiService
       .get<
         JsonApiResponse<AuthorizedAddonGetResponseJsonApi[], IncludedAddonData[]>
       >(`${this.apiUrl}/user-references/${referenceId}/authorized_${addonType}_accounts/?include=external-${addonType}-service`, params)
       .pipe(
-        map((response) => response.data.map((item) => AddonMapper.fromAuthorizedAddonResponse(item, response.included)))
+        map((response) => {
+          return response.data.map((item) => AddonMapper.fromAuthorizedAddonResponse(item, response.included));
+        })
       );
   }
 
@@ -112,45 +92,46 @@ export class AddonsService {
           attributes: { serialize_oauth_token: 'true' },
         },
       })
-      .pipe(map((response) => AddonMapper.fromAuthorizedAddonResponse(response as AuthorizedAddonGetResponseJsonApi)));
+      .pipe(
+        map((response) => {
+          return AddonMapper.fromAuthorizedAddonResponse(response as AuthorizedAddonGetResponseJsonApi);
+        })
+      );
   }
 
-  /**
-   * Retrieves the list of configured addons for a given resource reference.
-   *
-   * @param addonType - The addon category to retrieve. Valid values: `'citation'` or `'storage'`.
-   * @param referenceId - The unique identifier of the resource (e.g., node, registration) that the addons are configured for.
-   * @returns An observable that emits an array of {@link ConfiguredStorageAddonModel} objects.
-   *
-   */
-  getConfiguredAddons(addonType: string, referenceId: string): Observable<ConfiguredStorageAddonModel[]> {
+  getConfiguredAddons(addonType: string, referenceId: string): Observable<ConfiguredAddonModel[]> {
     return this.jsonApiService
       .get<
         JsonApiResponse<ConfiguredAddonGetResponseJsonApi[], null>
       >(`${this.apiUrl}/resource-references/${referenceId}/configured_${addonType}_addons/`)
-      .pipe(map((response) => response.data.map((item) => AddonMapper.fromConfiguredAddonResponse(item))));
+      .pipe(
+        map((response) => {
+          return response.data.map((item) => AddonMapper.fromConfiguredAddonResponse(item));
+        })
+      );
   }
 
   createAuthorizedAddon(
     addonRequestPayload: AuthorizedAddonRequestJsonApi,
     addonType: string
-  ): Observable<AuthorizedAddonResponseJsonApi> {
+  ): Observable<AuthorizedAccountModel> {
     return this.jsonApiService
       .post<
-        JsonApiResponse<AuthorizedAddonResponseJsonApi, null>
-      >(`${this.apiUrl}/authorized-${addonType}-accounts/`, addonRequestPayload)
-      .pipe(map((response) => response.data));
+        JsonApiResponse<AuthorizedAddonResponseJsonApi, IncludedAddonData[]>
+      >(`${this.apiUrl}/authorized-${addonType}-accounts/?include=external-${addonType}-service`, addonRequestPayload)
+      .pipe(map((response) => AddonMapper.fromAuthorizedAddonResponse(response.data, response.included)));
   }
 
   updateAuthorizedAddon(
     addonRequestPayload: AuthorizedAddonRequestJsonApi,
     addonType: string,
     addonId: string
-  ): Observable<AuthorizedAddonResponseJsonApi> {
-    return this.jsonApiService.patch<AuthorizedAddonResponseJsonApi>(
-      `${this.apiUrl}/authorized-${addonType}-accounts/${addonId}/`,
-      addonRequestPayload
-    );
+  ): Observable<AuthorizedAccountModel> {
+    return this.jsonApiService.http
+      .patch<
+        JsonApiResponse<AuthorizedAddonResponseJsonApi, IncludedAddonData[]>
+      >(`${this.apiUrl}/authorized-${addonType}-accounts/${addonId}/?include=external-${addonType}-service`, addonRequestPayload)
+      .pipe(map((response) => AddonMapper.fromAuthorizedAddonResponse(response.data, response.included)));
   }
 
   createConfiguredAddon(
diff --git a/src/app/shared/services/files.service.spec.ts b/src/app/shared/services/files.service.spec.ts
index 239dfa9f5..977512c72 100644
--- a/src/app/shared/services/files.service.spec.ts
+++ b/src/app/shared/services/files.service.spec.ts
@@ -66,9 +66,11 @@ describe('Service: Files', () => {
         externalServiceName: 'googledrive',
         externalStorageServiceId: '8aeb85e9-3a73-426f-a89b-5624b4b9d418',
         id: '756579dc-3a24-4849-8866-698a60846ac3',
-        selectedFolderId: '0AIl0aR4C9JAFUk9PVA',
-        type: 'configured-storage-addons',
+        resourceType: undefined,
         rootFolderId: '0AIl0aR4C9JAFUk9PVA',
+        selectedStorageItemId: '0AIl0aR4C9JAFUk9PVA',
+        targetUrl: undefined,
+        type: 'configured-storage-addons',
       })
     );
 
diff --git a/src/app/shared/services/files.service.ts b/src/app/shared/services/files.service.ts
index 205faef92..441e6cb55 100644
--- a/src/app/shared/services/files.service.ts
+++ b/src/app/shared/services/files.service.ts
@@ -22,7 +22,7 @@ import {
   AddFileResponse,
   ApiData,
   ConfiguredAddonGetResponseJsonApi,
-  ConfiguredStorageAddonModel,
+  ConfiguredAddonModel,
   ContributorModel,
   ContributorResponse,
   FileLinks,
@@ -303,7 +303,7 @@ export class FilesService {
       .pipe(map((response) => response.data?.[0]?.links?.self ?? ''));
   }
 
-  getConfiguredStorageAddons(resourceUri: string): Observable<ConfiguredStorageAddonModel[]> {
+  getConfiguredStorageAddons(resourceUri: string): Observable<ConfiguredAddonModel[]> {
     return this.getResourceReferences(resourceUri).pipe(
       switchMap((referenceUrl: string) => {
         if (!referenceUrl) return of([]);
diff --git a/src/app/shared/stores/addons/addons.actions.ts b/src/app/shared/stores/addons/addons.actions.ts
index 9861a9baf..4e7a40d17 100644
--- a/src/app/shared/stores/addons/addons.actions.ts
+++ b/src/app/shared/stores/addons/addons.actions.ts
@@ -4,17 +4,6 @@ import {
   OperationInvocationRequestJsonApi,
 } from '@shared/models';
 
-/**
- * NGXS Action to initiate loading of all available storage addon types.
- *
- * This action is handled by the `AddonsState` and triggers an HTTP
- * request to retrieve external storage addon definitions (e.g., Google Drive, Dropbox).
- *
- * @example
- * store.dispatch(new GetStorageAddons());
- *
- * @see AddonsState.getStorageAddons
- */
 export class GetStorageAddons {
   static readonly type = '[Addons] Get Storage Addons';
 }
@@ -23,6 +12,10 @@ export class GetCitationAddons {
   static readonly type = '[Addons] Get Citation Addons';
 }
 
+export class GetLinkAddons {
+  static readonly type = '[Addons] Get Link Addons';
+}
+
 export class GetAuthorizedStorageAddons {
   static readonly type = '[Addons] Get Authorized Storage Addons';
 
@@ -41,18 +34,12 @@ export class GetAuthorizedCitationAddons {
   constructor(public referenceId: string) {}
 }
 
-/**
- * NGXS Action to initiate loading of configured storage addons
- * for a specific resource reference (e.g., node, registration).
- *
- * This action is handled by the `AddonsState` and triggers an HTTP
- * request to fetch addons configured for the given `referenceId`.
- *
- * @example
- * store.dispatch(new GetConfiguredStorageAddons('abc123'));
- *
- * @see AddonsState.getConfiguredStorageAddons
- */
+export class GetAuthorizedLinkAddons {
+  static readonly type = '[Addons] Get Authorized Link Addons';
+
+  constructor(public referenceId: string) {}
+}
+
 export class GetConfiguredStorageAddons {
   static readonly type = '[Addons] Get Configured Storage Addons';
 
@@ -65,6 +52,12 @@ export class GetConfiguredCitationAddons {
   constructor(public referenceId: string) {}
 }
 
+export class GetConfiguredLinkAddons {
+  static readonly type = '[Addons] Get Configured Link Addons';
+
+  constructor(public referenceId: string) {}
+}
+
 export class CreateAuthorizedAddon {
   static readonly type = '[Addons] Create Authorized Addon';
 
diff --git a/src/app/shared/stores/addons/addons.models.ts b/src/app/shared/stores/addons/addons.models.ts
index da54b5d40..f5e2ef440 100644
--- a/src/app/shared/stores/addons/addons.models.ts
+++ b/src/app/shared/stores/addons/addons.models.ts
@@ -2,84 +2,29 @@ import {
   AddonModel,
   AsyncStateModel,
   AuthorizedAccountModel,
-  AuthorizedAddonResponseJsonApi,
+  ConfiguredAddonModel,
   ConfiguredAddonResponseJsonApi,
-  ConfiguredStorageAddonModel,
   OperationInvocation,
   ResourceReferenceJsonApi,
   UserReferenceJsonApi,
 } from '@osf/shared/models';
 
-/**
- * Represents the full NGXS state model for addon-related data within the application.
- *
- * This state structure manages async lifecycle and data for all addon types,
- * including storage and citation addons, both authorized and configured.
- * It also includes references for addon-user and addon-resource relationships
- * as well as operation invocation results.
- *
- * Each field is wrapped in `AsyncStateModel<T>` to track loading, success, and error states.
- */
 export interface AddonsStateModel {
-  /**
-   * Async state for available external storage addons (e.g., Google Drive, Dropbox).
-   */
   storageAddons: AsyncStateModel<AddonModel[]>;
-
-  /**
-   * Async state for available external citation addons (e.g., Zotero, Mendeley).
-   */
   citationAddons: AsyncStateModel<AddonModel[]>;
-
-  /**
-   * Async state for authorized external storage addons linked to the current user.
-   */
+  linkAddons: AsyncStateModel<AddonModel[]>;
   authorizedStorageAddons: AsyncStateModel<AuthorizedAccountModel[]>;
-
-  /**
-   * Async state for authorized external citation addons linked to the current user.
-   */
   authorizedCitationAddons: AsyncStateModel<AuthorizedAccountModel[]>;
-
-  /**
-   * Async state for storage addons that have been configured on a resource (e.g., project, node).
-   */
-  configuredStorageAddons: AsyncStateModel<ConfiguredStorageAddonModel[]>;
-
-  /**
-   * Async state for citation addons that have been configured on a resource (e.g., project, node).
-   */
-  configuredCitationAddons: AsyncStateModel<ConfiguredStorageAddonModel[]>;
-
-  /**
-   * Async state holding user-level references for addon configuration.
-   */
+  authorizedLinkAddons: AsyncStateModel<AuthorizedAccountModel[]>;
+  configuredStorageAddons: AsyncStateModel<ConfiguredAddonModel[]>;
+  configuredCitationAddons: AsyncStateModel<ConfiguredAddonModel[]>;
+  configuredLinkAddons: AsyncStateModel<ConfiguredAddonModel[]>;
   addonsUserReference: AsyncStateModel<UserReferenceJsonApi[]>;
-
-  /**
-   * Async state holding resource-level references for addon configuration.
-   */
   addonsResourceReference: AsyncStateModel<ResourceReferenceJsonApi[]>;
-
-  /**
-   * Async state for the result of a create or update action on an authorized addon.
-   */
-  createdUpdatedAuthorizedAddon: AsyncStateModel<AuthorizedAddonResponseJsonApi | null>;
-
-  /**
-   * Async state for the result of a create or update action on a configured addon.
-   */
+  createdUpdatedAuthorizedAddon: AsyncStateModel<AuthorizedAccountModel | null>;
   createdUpdatedConfiguredAddon: AsyncStateModel<ConfiguredAddonResponseJsonApi | null>;
-
-  /**
-   * Async state for the result of a generic operation invocation (e.g., folder list, disconnect).
-   */
   operationInvocation: AsyncStateModel<OperationInvocation | null>;
-
-  /**
-   * Async state for a folder selection operation invocation (e.g., choosing a root folder).
-   */
-  selectedFolderOperationInvocation: AsyncStateModel<OperationInvocation | null>;
+  selectedItemOperationInvocation: AsyncStateModel<OperationInvocation | null>;
 }
 
 export const ADDONS_DEFAULTS: AddonsStateModel = {
@@ -93,6 +38,11 @@ export const ADDONS_DEFAULTS: AddonsStateModel = {
     isLoading: false,
     error: null,
   },
+  linkAddons: {
+    data: [],
+    isLoading: false,
+    error: null,
+  },
   authorizedStorageAddons: {
     data: [],
     isLoading: false,
@@ -105,6 +55,12 @@ export const ADDONS_DEFAULTS: AddonsStateModel = {
     isSubmitting: false,
     error: null,
   },
+  authorizedLinkAddons: {
+    data: [],
+    isLoading: false,
+    isSubmitting: false,
+    error: null,
+  },
   configuredStorageAddons: {
     data: [],
     isLoading: false,
@@ -115,6 +71,11 @@ export const ADDONS_DEFAULTS: AddonsStateModel = {
     isLoading: false,
     error: null,
   },
+  configuredLinkAddons: {
+    data: [],
+    isLoading: false,
+    error: null,
+  },
   addonsUserReference: {
     data: [],
     isLoading: false,
@@ -143,7 +104,7 @@ export const ADDONS_DEFAULTS: AddonsStateModel = {
     isSubmitting: false,
     error: null,
   },
-  selectedFolderOperationInvocation: {
+  selectedItemOperationInvocation: {
     data: null,
     isLoading: false,
     isSubmitting: false,
diff --git a/src/app/shared/stores/addons/addons.selectors.ts b/src/app/shared/stores/addons/addons.selectors.ts
index 24b78702f..f63dd78e8 100644
--- a/src/app/shared/stores/addons/addons.selectors.ts
+++ b/src/app/shared/stores/addons/addons.selectors.ts
@@ -3,9 +3,8 @@ import { createSelector, Selector } from '@ngxs/store';
 import {
   AddonModel,
   AuthorizedAccountModel,
-  AuthorizedAddonResponseJsonApi,
+  ConfiguredAddonModel,
   ConfiguredAddonResponseJsonApi,
-  ConfiguredStorageAddonModel,
   OperationInvocation,
   ResourceReferenceJsonApi,
   StorageItemModel,
@@ -15,49 +14,18 @@ import {
 import { AddonsStateModel } from './addons.models';
 import { AddonsState } from './addons.state';
 
-/**
- * A static utility class containing NGXS selectors for accessing various slices
- * of the `AddonsStateModel` in the NGXS store.
- *
- * This class provides typed, reusable selectors to extract addon-related state such as
- * storage, citation, authorized, and configured addon collections. It supports structured
- * access to application state and encourages consistency across components.
- *
- * All selectors in this class operate on the `AddonsStateModel`.
- */
 export class AddonsSelectors {
-  /**
-   * Selector to retrieve the list of available external storage addons from the NGXS state.
-   *
-   * These are public addon services (e.g., Google Drive, Dropbox) available for configuration.
-   * The data is retrieved from the `storageAddons` portion of the `AddonsStateModel`.
-   *
-   * @param state - The current `AddonsStateModel` from the NGXS store.
-   * @returns An array of available `Addon` objects representing storage providers.
-   */
   @Selector([AddonsState])
   static getStorageAddons(state: AddonsStateModel): AddonModel[] {
     return state.storageAddons.data;
   }
 
-  /**
-   * Selector to retrieve a specific storage addon by its ID from the NGXS state.
-   *
-   * @param state The current state of the Addons NGXS store.
-   * @param id The unique identifier of the storage addon to retrieve.
-   * @returns The matched Addon object if found, otherwise undefined.
-   */
   static getStorageAddon(id: string): (state: AddonsStateModel) => AddonModel | null {
     return createSelector([AddonsState], (state: AddonsStateModel): AddonModel | null => {
       return state.storageAddons.data.find((addon: AddonModel) => addon.id === id) || null;
     });
   }
-  /**
-   * Selector to retrieve the loading status of storage addons from the AddonsState.
-   *
-   * @param state The current state of the Addons feature.
-   * @returns A boolean indicating whether storage addons are currently being loaded.
-   */
+
   @Selector([AddonsState])
   static getStorageAddonsLoading(state: AddonsStateModel): boolean {
     return state.storageAddons.isLoading;
@@ -73,6 +41,16 @@ export class AddonsSelectors {
     return state.citationAddons.isLoading;
   }
 
+  @Selector([AddonsState])
+  static getLinkAddons(state: AddonsStateModel): AddonModel[] {
+    return state.linkAddons.data;
+  }
+
+  @Selector([AddonsState])
+  static getLinkAddonsLoading(state: AddonsStateModel): boolean {
+    return state.linkAddons.isLoading;
+  }
+
   @Selector([AddonsState])
   static getAuthorizedStorageAddons(state: AddonsStateModel): AuthorizedAccountModel[] {
     return state.authorizedStorageAddons.data;
@@ -101,36 +79,28 @@ export class AddonsSelectors {
     return state.authorizedCitationAddons.isLoading;
   }
 
-  /**
-   * Selector to retrieve the list of configured storage addons from the NGXS state.
-   *
-   * @param state - The current state of the AddonsStateModel.
-   * @returns An array of configured storage addons.
-   *
-   * @example
-   * const addons = this.store.selectSnapshot(AddonsSelectors.getConfiguredStorageAddons);
-   */
   @Selector([AddonsState])
-  static getConfiguredStorageAddons(state: AddonsStateModel): ConfiguredStorageAddonModel[] {
+  static getAuthorizedLinkAddons(state: AddonsStateModel): AuthorizedAccountModel[] {
+    return state.authorizedLinkAddons.data;
+  }
+
+  @Selector([AddonsState])
+  static getAuthorizedLinkAddonsLoading(state: AddonsStateModel): boolean {
+    return state.authorizedLinkAddons.isLoading;
+  }
+
+  @Selector([AddonsState])
+  static getConfiguredStorageAddons(state: AddonsStateModel): ConfiguredAddonModel[] {
     return state.configuredStorageAddons.data;
   }
 
-  /**
-   * Selector to determine whether the configured storage addons are currently being loaded.
-   *
-   * @param state - The current state of the AddonsStateModel.
-   * @returns A boolean indicating if the addons are loading.
-   *
-   * @example
-   * const isLoading = this.store.selectSnapshot(AddonsSelectors.getConfiguredStorageAddonsLoading);
-   */
   @Selector([AddonsState])
   static getConfiguredStorageAddonsLoading(state: AddonsStateModel): boolean {
     return state.configuredStorageAddons.isLoading;
   }
 
   @Selector([AddonsState])
-  static getConfiguredCitationAddons(state: AddonsStateModel): ConfiguredStorageAddonModel[] {
+  static getConfiguredCitationAddons(state: AddonsStateModel): ConfiguredAddonModel[] {
     return state.configuredCitationAddons.data;
   }
 
@@ -139,6 +109,16 @@ export class AddonsSelectors {
     return state.configuredCitationAddons.isLoading;
   }
 
+  @Selector([AddonsState])
+  static getConfiguredLinkAddons(state: AddonsStateModel): ConfiguredAddonModel[] {
+    return state.configuredLinkAddons.data;
+  }
+
+  @Selector([AddonsState])
+  static getConfiguredLinkAddonsLoading(state: AddonsStateModel): boolean {
+    return state.configuredLinkAddons.isLoading;
+  }
+
   @Selector([AddonsState])
   static getAddonsUserReference(state: AddonsStateModel): UserReferenceJsonApi[] {
     return state.addonsUserReference.data;
@@ -160,7 +140,7 @@ export class AddonsSelectors {
   }
 
   @Selector([AddonsState])
-  static getCreatedOrUpdatedAuthorizedAddon(state: AddonsStateModel): AuthorizedAddonResponseJsonApi | null {
+  static getCreatedOrUpdatedAuthorizedAddon(state: AddonsStateModel): AuthorizedAccountModel | null {
     return state.createdUpdatedAuthorizedAddon.data;
   }
 
@@ -191,12 +171,12 @@ export class AddonsSelectors {
 
   @Selector([AddonsState])
   static getSelectedFolderOperationInvocation(state: AddonsStateModel): OperationInvocation | null {
-    return state.selectedFolderOperationInvocation.data;
+    return state.selectedItemOperationInvocation.data;
   }
 
   @Selector([AddonsState])
-  static getSelectedFolder(state: AddonsStateModel): StorageItemModel | null {
-    return state.selectedFolderOperationInvocation.data?.operationResult[0] || null;
+  static getSelectedStorageItem(state: AddonsStateModel): StorageItemModel | null {
+    return state.selectedItemOperationInvocation.data?.operationResult[0] || null;
   }
 
   @Selector([AddonsState])
diff --git a/src/app/shared/stores/addons/addons.state.spec.ts b/src/app/shared/stores/addons/addons.state.spec.ts
index e984b6779..573c561dd 100644
--- a/src/app/shared/stores/addons/addons.state.spec.ts
+++ b/src/app/shared/stores/addons/addons.state.spec.ts
@@ -141,8 +141,10 @@ describe('State: Addons', () => {
             displayName: 'Google Drive',
             externalServiceName: 'googledrive',
             id: '756579dc-3a24-4849-8866-698a60846ac3',
+            resourceType: undefined,
             rootFolderId: '0AIl0aR4C9JAFUk9PVA',
-            selectedFolderId: '0AIl0aR4C9JAFUk9PVA',
+            selectedStorageItemId: '0AIl0aR4C9JAFUk9PVA',
+            targetUrl: undefined,
             type: 'configured-storage-addons',
             externalStorageServiceId: '8aeb85e9-3a73-426f-a89b-5624b4b9d418',
           })
diff --git a/src/app/shared/stores/addons/addons.state.ts b/src/app/shared/stores/addons/addons.state.ts
index 43644f554..840ec4661 100644
--- a/src/app/shared/stores/addons/addons.state.ts
+++ b/src/app/shared/stores/addons/addons.state.ts
@@ -4,6 +4,7 @@ import { catchError, switchMap, tap } from 'rxjs';
 
 import { inject, Injectable } from '@angular/core';
 
+import { AddonType } from '@osf/shared/enums';
 import { handleSectionError } from '@osf/shared/helpers';
 import { AuthorizedAccountModel } from '@osf/shared/models';
 import { AddonsService } from '@osf/shared/services';
@@ -19,66 +20,28 @@ import {
   GetAddonsResourceReference,
   GetAddonsUserReference,
   GetAuthorizedCitationAddons,
+  GetAuthorizedLinkAddons,
   GetAuthorizedStorageAddons,
   GetAuthorizedStorageOauthToken,
   GetCitationAddons,
   GetConfiguredCitationAddons,
+  GetConfiguredLinkAddons,
   GetConfiguredStorageAddons,
+  GetLinkAddons,
   GetStorageAddons,
   UpdateAuthorizedAddon,
   UpdateConfiguredAddon,
 } from './addons.actions';
 import { ADDONS_DEFAULTS, AddonsStateModel } from './addons.models';
 
-/**
- * NGXS state class for managing addon-related data and actions.
- *
- * Handles loading and storing both storage and citation addons as well as their configurations.
- * This state includes logic for retrieving addons, patching loading states, handling errors,
- * and providing selectors for access within the application.
- *
- * @see AddonsStateModel
- * @see ADDONS_DEFAULTS
- * @see addons.actions.ts
- * @see addons.selectors.ts
- */
 @State<AddonsStateModel>({
   name: 'addons',
   defaults: ADDONS_DEFAULTS,
 })
 @Injectable()
 export class AddonsState {
-  /**
-   * Injected instance of {@link AddonsService}, used to interact with the addons API.
-   *
-   * Provides methods for retrieving and mapping addon configurations, including
-   * storage and citation addon types.
-   *
-   * @see AddonsService
-   */
   addonsService = inject(AddonsService);
 
-  /**
-   * NGXS action handler for retrieving the list of storage addons.
-   *
-   * Dispatching this action sets the `storageAddons` slice of state into a loading state,
-   * then asynchronously fetches storage addon configurations from the `AddonsService`.
-   *
-   * On success:
-   * - The retrieved addon list is stored in `storageAddons.data`.
-   * - `isLoading` is set to `false` and `error` is cleared.
-   *
-   * On failure:
-   * - Invokes `handleError` to populate the `error` state and stop the loading flag.
-   *
-   * @param ctx - NGXS `StateContext` instance for `AddonsStateModel`.
-   * Used to read and mutate the application state.
-   *
-   * @returns An observable that completes once the addon data has been loaded or the error is handled.
-   *
-   * @example
-   * this.store.dispatch(new GetStorageAddons());
-   */
   @Action(GetStorageAddons)
   getStorageAddons(ctx: StateContext<AddonsStateModel>) {
     const state = ctx.getState();
@@ -89,7 +52,7 @@ export class AddonsState {
       },
     });
 
-    return this.addonsService.getAddons('storage').pipe(
+    return this.addonsService.getAddons(AddonType.STORAGE).pipe(
       tap((addons) => {
         ctx.patchState({
           storageAddons: {
@@ -113,7 +76,7 @@ export class AddonsState {
       },
     });
 
-    return this.addonsService.getAddons('citation').pipe(
+    return this.addonsService.getAddons(AddonType.CITATION).pipe(
       tap((addons) => {
         ctx.patchState({
           citationAddons: {
@@ -127,6 +90,30 @@ export class AddonsState {
     );
   }
 
+  @Action(GetLinkAddons)
+  getLinkedAddons(ctx: StateContext<AddonsStateModel>) {
+    const state = ctx.getState();
+    ctx.patchState({
+      linkAddons: {
+        ...state.linkAddons,
+        isLoading: true,
+      },
+    });
+
+    return this.addonsService.getAddons(AddonType.LINK).pipe(
+      tap((addons) => {
+        ctx.patchState({
+          linkAddons: {
+            data: addons,
+            isLoading: false,
+            error: null,
+          },
+        });
+      }),
+      catchError((error) => handleSectionError(ctx, 'linkAddons', error))
+    );
+  }
+
   @Action(GetAuthorizedStorageAddons)
   getAuthorizedStorageAddons(ctx: StateContext<AddonsStateModel>, action: GetAuthorizedStorageAddons) {
     const state = ctx.getState();
@@ -137,7 +124,7 @@ export class AddonsState {
       },
     });
 
-    return this.addonsService.getAuthorizedStorageAddons('storage', action.referenceId).pipe(
+    return this.addonsService.getAuthorizedAddons(AddonType.STORAGE, action.referenceId).pipe(
       tap((addons) => {
         ctx.patchState({
           authorizedStorageAddons: {
@@ -198,7 +185,7 @@ export class AddonsState {
       },
     });
 
-    return this.addonsService.getAuthorizedStorageAddons('citation', action.referenceId).pipe(
+    return this.addonsService.getAuthorizedAddons(AddonType.CITATION, action.referenceId).pipe(
       tap((addons) => {
         ctx.patchState({
           authorizedCitationAddons: {
@@ -212,22 +199,30 @@ export class AddonsState {
     );
   }
 
-  /**
-   * Handles the NGXS action `GetConfiguredStorageAddons`.
-   *
-   * This method is responsible for retrieving a list of configured storage addons
-   * associated with a specific `referenceId` (e.g., a node or registration).
-   *
-   * It sets the loading state before initiating the request and patches the store
-   * with the resulting data or error upon completion.
-   *
-   * @param ctx - The NGXS `StateContext` used to read and mutate the `AddonsStateModel`.
-   * @param action - The dispatched `GetConfiguredStorageAddons` action, which contains the `referenceId` used to fetch data.
-   * @returns An `Observable` that emits when the addons are successfully fetched or an error is handled.
-   *
-   * @example
-   * store.dispatch(new GetConfiguredStorageAddons('abc123'));
-   */
+  @Action(GetAuthorizedLinkAddons)
+  getAuthorizedLinkAddons(ctx: StateContext<AddonsStateModel>, action: GetAuthorizedLinkAddons) {
+    const state = ctx.getState();
+    ctx.patchState({
+      authorizedLinkAddons: {
+        ...state.authorizedLinkAddons,
+        isLoading: true,
+      },
+    });
+
+    return this.addonsService.getAuthorizedAddons(AddonType.LINK, action.referenceId).pipe(
+      tap((addons) => {
+        ctx.patchState({
+          authorizedLinkAddons: {
+            data: addons,
+            isLoading: false,
+            error: null,
+          },
+        });
+      }),
+      catchError((error) => handleSectionError(ctx, 'authorizedLinkAddons', error))
+    );
+  }
+
   @Action(GetConfiguredStorageAddons)
   getConfiguredStorageAddons(ctx: StateContext<AddonsStateModel>, action: GetConfiguredStorageAddons) {
     const state = ctx.getState();
@@ -238,7 +233,7 @@ export class AddonsState {
       },
     });
 
-    return this.addonsService.getConfiguredAddons('storage', action.referenceId).pipe(
+    return this.addonsService.getConfiguredAddons(AddonType.STORAGE, action.referenceId).pipe(
       tap((addons) => {
         ctx.patchState({
           configuredStorageAddons: {
@@ -262,7 +257,7 @@ export class AddonsState {
       },
     });
 
-    return this.addonsService.getConfiguredAddons('citation', action.referenceId).pipe(
+    return this.addonsService.getConfiguredAddons(AddonType.CITATION, action.referenceId).pipe(
       tap((addons) => {
         ctx.patchState({
           configuredCitationAddons: {
@@ -276,6 +271,30 @@ export class AddonsState {
     );
   }
 
+  @Action(GetConfiguredLinkAddons)
+  getConfiguredLinkAddons(ctx: StateContext<AddonsStateModel>, action: GetConfiguredLinkAddons) {
+    const state = ctx.getState();
+    ctx.patchState({
+      configuredLinkAddons: {
+        ...state.configuredLinkAddons,
+        isLoading: true,
+      },
+    });
+
+    return this.addonsService.getConfiguredAddons(AddonType.LINK, action.referenceId).pipe(
+      tap((addons) => {
+        ctx.patchState({
+          configuredLinkAddons: {
+            data: addons,
+            isLoading: false,
+            error: null,
+          },
+        });
+      }),
+      catchError((error) => handleSectionError(ctx, 'configuredLinkAddons', error))
+    );
+  }
+
   @Action(CreateAuthorizedAddon)
   createAuthorizedAddon(ctx: StateContext<AddonsStateModel>, action: CreateAuthorizedAddon) {
     const state = ctx.getState();
@@ -298,11 +317,13 @@ export class AddonsState {
         });
         const referenceId = state.addonsUserReference.data[0]?.id;
         if (referenceId) {
-          ctx.dispatch(
-            action.addonType === 'storage'
-              ? new GetAuthorizedStorageAddons(referenceId)
-              : new GetAuthorizedCitationAddons(referenceId)
-          );
+          if (action.addonType === AddonType.STORAGE) {
+            ctx.dispatch(new GetAuthorizedStorageAddons(referenceId));
+          } else if (action.addonType === AddonType.CITATION) {
+            ctx.dispatch(new GetAuthorizedCitationAddons(referenceId));
+          } else if (action.addonType === AddonType.LINK) {
+            ctx.dispatch(new GetAuthorizedLinkAddons(referenceId));
+          }
         }
       }),
       catchError((error) => handleSectionError(ctx, 'createdUpdatedAuthorizedAddon', error))
@@ -331,11 +352,13 @@ export class AddonsState {
         });
         const referenceId = state.addonsUserReference.data[0]?.id;
         if (referenceId) {
-          ctx.dispatch(
-            action.addonType === 'storage'
-              ? new GetAuthorizedStorageAddons(referenceId)
-              : new GetAuthorizedCitationAddons(referenceId)
-          );
+          if (action.addonType === AddonType.STORAGE) {
+            ctx.dispatch(new GetAuthorizedStorageAddons(referenceId));
+          } else if (action.addonType === AddonType.CITATION) {
+            ctx.dispatch(new GetAuthorizedCitationAddons(referenceId));
+          } else if (action.addonType === AddonType.LINK) {
+            ctx.dispatch(new GetAuthorizedLinkAddons(referenceId));
+          }
         }
       }),
       catchError((error) => handleSectionError(ctx, 'createdUpdatedAuthorizedAddon', error))
@@ -410,7 +433,7 @@ export class AddonsState {
             isSubmitting: false,
             error: null,
           },
-          selectedFolderOperationInvocation: {
+          selectedItemOperationInvocation: {
             data: null,
             isLoading: false,
             isSubmitting: false,
@@ -420,7 +443,7 @@ export class AddonsState {
         const referenceId = state.addonsResourceReference.data[0]?.id;
         if (referenceId) {
           ctx.dispatch(
-            action.addonType === 'storage'
+            action.addonType === AddonType.STORAGE
               ? new GetConfiguredStorageAddons(referenceId)
               : new GetConfiguredCitationAddons(referenceId)
           );
@@ -457,7 +480,12 @@ export class AddonsState {
   @Action(DeleteAuthorizedAddon)
   deleteAuthorizedAddon(ctx: StateContext<AddonsStateModel>, action: DeleteAuthorizedAddon) {
     const state = ctx.getState();
-    const stateKey = action.addonType === 'storage' ? 'authorizedStorageAddons' : 'authorizedCitationAddons';
+    const stateKey =
+      action.addonType === AddonType.STORAGE
+        ? 'authorizedStorageAddons'
+        : action.addonType === AddonType.CITATION
+          ? 'authorizedCitationAddons'
+          : 'authorizedLinkAddons';
     ctx.patchState({
       [stateKey]: {
         ...state[stateKey],
@@ -469,9 +497,13 @@ export class AddonsState {
       switchMap(() => {
         const referenceId = state.addonsUserReference.data[0]?.id;
         if (referenceId) {
-          return action.addonType === 'storage'
-            ? ctx.dispatch(new GetAuthorizedStorageAddons(referenceId))
-            : ctx.dispatch(new GetAuthorizedCitationAddons(referenceId));
+          if (action.addonType === AddonType.STORAGE) {
+            return ctx.dispatch(new GetAuthorizedStorageAddons(referenceId));
+          } else if (action.addonType === AddonType.CITATION) {
+            return ctx.dispatch(new GetAuthorizedCitationAddons(referenceId));
+          } else if (action.addonType === AddonType.LINK) {
+            return ctx.dispatch(new GetAuthorizedLinkAddons(referenceId));
+          }
         }
         return [];
       }),
@@ -500,9 +532,13 @@ export class AddonsState {
         });
         const referenceId = state.addonsResourceReference.data[0]?.id;
         if (referenceId) {
-          return action.addonType === 'configured-storage-addons'
-            ? ctx.dispatch(new GetConfiguredStorageAddons(referenceId))
-            : ctx.dispatch(new GetConfiguredCitationAddons(referenceId));
+          if (action.addonType === AddonType.STORAGE) {
+            ctx.dispatch(new GetConfiguredStorageAddons(referenceId));
+          } else if (action.addonType === AddonType.CITATION) {
+            ctx.dispatch(new GetConfiguredCitationAddons(referenceId));
+          } else if (action.addonType === AddonType.LINK) {
+            ctx.dispatch(new GetConfiguredLinkAddons(referenceId));
+          }
         }
         return [];
       }),
@@ -533,7 +569,7 @@ export class AddonsState {
 
         if (response.operationName === 'get_item_info' && response.operationResult[0]?.itemName) {
           ctx.patchState({
-            selectedFolderOperationInvocation: {
+            selectedItemOperationInvocation: {
               data: response,
               isLoading: false,
               isSubmitting: false,
@@ -575,7 +611,7 @@ export class AddonsState {
         isLoading: false,
         error: null,
       },
-      selectedFolderOperationInvocation: {
+      selectedItemOperationInvocation: {
         data: null,
         isLoading: false,
         error: null,
diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
index 07b186f8e..f7d818057 100644
--- a/src/assets/i18n/en.json
+++ b/src/assets/i18n/en.json
@@ -179,6 +179,7 @@
     "contributors": "Contributors",
     "analytics": "Analytics",
     "addons": "Add-ons",
+    "linkedServices": "Linked Services",
     "resources": "Resources",
     "components": "Components",
     "links": "Links",
@@ -946,6 +947,20 @@
       "title": "Delete institution",
       "message": "Are you sure you want to delete <b>{{name}}</b> from this project?",
       "success": "Institution has been successfully deleted."
+    },
+    "linkedServices": {
+      "title": "Linked Services",
+      "table": {
+        "linkedService": "Linked Service",
+        "displayName": "Display Name",
+        "resourceType": "Resource Type",
+        "link": "Link",
+        "noLink": "No link available"
+      },
+              "noLinkedServices": "This project has no configured linked services at the moment.",
+        "redirectMessage": "Visit",
+        "addonsLink": "Add-ons",
+        "redirectMessageSuffix": "to add a linked service."
     }
   },
   "files": {
@@ -1485,7 +1500,8 @@
       },
       "categories": {
         "additionalService": "Additional Storage",
-        "citationManager": "Citation Manager"
+        "citationManager": "Citation Manager",
+        "linkedServices": "Linked Services"
       },
       "toast": {
         "updateSuccess": "Successfully updated {{addonName}} add-on configuration",
@@ -1502,10 +1518,16 @@
         "title": "Configure Add-on",
         "noFolders": "No folders",
         "noFolderSelected": "No selected folder",
+        "noLinkedItem": "No linked item",
+        "resourceType": "Resource type",
+        "aboutResourceType": "About resource type",
+        "chooseResourceType": "Choose a resource type",
+        "resourceTypeModalMessage": "This helps others understand what kind of material you're sharing. Choosing the right resource type makes it easier for search engines and research tools to find and share your work—both on OSF and in other scholarly indexes.<br><br>For example, selecting <strong>“Dataset”</strong> tells tools and repositories that your files are research data, which helps your work appear in places that specialize in datasets.<br><br>Pick the option that best describes most of the files you're linking.<br><br>OSF uses resource types from <strong>DataCite</strong>, a standard used by many research platforms. <a target='_blank' href={{link}}>(Learn more)</a>",
         "disconnect": "Disconnect {{addonName}}",
         "disconnectMessage": "You are about to disconnect the following addon from the project:",
         "account": "Account:",
         "selectedFolder": "Selected folder:",
+        "linkedItem": "Linked item:",
         "folderName": "Folder name:",
         "selectFolder": "Select",
         "connectedAccount": "Connected to account:",
diff --git a/src/assets/icons/addons/link_dataverse.svg b/src/assets/icons/addons/link_dataverse.svg
new file mode 100644
index 000000000..959ae3ecc
--- /dev/null
+++ b/src/assets/icons/addons/link_dataverse.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+	 viewBox="0 0 262.4 500" style="enable-background:new 0 0 262.4 500;" xml:space="preserve">
+<style type="text/css">
+	.st0{display:none;}
+	.st1{fill:none;stroke:#DEBAA0;stroke-miterlimit:10;}
+	.st2{display:inline;fill:none;stroke:#B76138;stroke-width:0.25;stroke-miterlimit:10;}
+	.st3{fill:#B86138;}
+</style>
+<g id="Layer_1" class="st0">
+	<path class="st1" d="M245.4,472.9"/>
+	<path class="st2" d="M245.4,472.9c-4.8-3.5-9.2-7.4-13.4-11.6c-21.5-21.5-34.9-51.4-34.8-84.2c0-32.8,13.3-62.7,34.8-84.2
+		c13.9-13.9,31.3-24.4,50.8-30.1l-21.2-95.3c-0.9,0-1.8,0.1-2.8,0.1c-22.7,0-43.4-9.2-58.3-24.1c-14.9-14.9-24.2-35.6-24.1-58.3
+		c0-22.7,9.2-43.4,24.1-58.3C215.4,12.2,236.1,3,258.8,3s43.4,9.3,58.3,24.1C332,42,341.2,62.7,341.2,85.4
+		c0,22.7-9.3,43.4-24.1,58.3c-6.6,6.6-14.4,12-22.9,16.1l21.9,98.4c0,0,0.1,0,0.1,0c32.8,0,62.7,13.4,84.2,34.9
+		c21.5,21.5,34.9,51.4,34.9,84.2s-13.4,62.7-34.9,84.2c-21.5,21.5-51.4,34.9-84.2,34.9c-14.5,0-28.4-2.6-41.2-7.3l0,0
+		C264.3,485,254.4,479.6,245.4,472.9z M201.5,85.4c0-15.8,6.4-30.1,16.8-40.5c10.4-10.4,24.6-16.8,40.5-16.8
+		c15.9,0,30.1,6.4,40.5,16.8c10.4,10.4,16.8,24.6,16.8,40.5c0,15.9-6.4,30.1-16.8,40.5c-10.4,10.4-24.6,16.8-40.5,16.8
+		c-15.9,0-30.1-6.4-40.5-16.8C207.9,115.5,201.5,101.3,201.5,85.4z M376.6,437.7c-15.5,15.5-36.8,25-60.5,25
+		c-23.7,0-44.9-9.5-60.4-25c-15.5-15.5-25-36.8-25-60.5c0-23.7,9.5-44.9,25-60.5c15.5-15.5,36.8-25,60.4-25c23.7,0,44.9,9.5,60.5,25
+		c15.5,15.5,25,36.8,25,60.5C401.6,400.9,392.1,422.1,376.6,437.7z"/>
+</g>
+<g id="Layer_2">
+	<path class="st3" d="M142.1,258.7c0,0-0.1,0-0.1,0l0,0l-22-99.3c28-13.4,47.4-42,47.4-75.1c0-46-37.3-83.2-83.2-83.2S1,38.3,1,84.2
+		s37.3,83.2,83.2,83.2c1,0,1.9,0,2.9-0.1l21.3,96.1C58.4,278.1,22,324.2,22,378.8C22,445.2,75.8,499,142.1,499
+		s120.2-53.8,120.2-120.2S208.5,258.7,142.1,258.7z M84.2,142c-31.9,0-57.8-25.9-57.8-57.8c0-31.9,25.9-57.8,57.8-57.8
+		c31.9,0,57.8,25.9,57.8,57.8C142,116.1,116.1,142,84.2,142z M142.1,465.1c-47.7,0-86.3-38.6-86.3-86.3s38.6-86.3,86.3-86.3
+		s86.3,38.6,86.3,86.3S189.8,465.1,142.1,465.1z"/>
+</g>
+</svg>
diff --git a/src/styles/overrides/select.scss b/src/styles/overrides/select.scss
index 2cfc0e49d..92375d05c 100644
--- a/src/styles/overrides/select.scss
+++ b/src/styles/overrides/select.scss
@@ -18,7 +18,6 @@
 }
 
 .p-select-option {
-  --p-select-option-focus-background: var(--bg-blue-2);
   --p-select-option-focus-background: var(--bg-blue-3);
   --p-select-option-focus-color: var(--dark-blue-1);
   --p-select-option-selected-focus-background: var(--bg-blue-2);
@@ -40,3 +39,9 @@
     }
   }
 }
+
+.resource-selector {
+  .p-select {
+    min-width: 16rem;
+  }
+}