diff --git a/ProcessMaker/Http/Controllers/Api/DevLinkController.php b/ProcessMaker/Http/Controllers/Api/DevLinkController.php
index 8994184d1a..b7ec2297b7 100644
--- a/ProcessMaker/Http/Controllers/Api/DevLinkController.php
+++ b/ProcessMaker/Http/Controllers/Api/DevLinkController.php
@@ -3,15 +3,16 @@
 namespace ProcessMaker\Http\Controllers\Api;
 
 use Illuminate\Database\Eloquent\ModelNotFoundException;
+use Illuminate\Http\Client\ConnectionException;
+use Illuminate\Http\Client\RequestException;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Notification;
 use Illuminate\Validation\Rule;
 use ProcessMaker\Events\CustomizeUiUpdated;
 use ProcessMaker\Exception\ValidationException;
 use ProcessMaker\Http\Controllers\Controller;
+use ProcessMaker\Http\Requests\DevLinkStoreRequest;
 use ProcessMaker\Http\Resources\ApiCollection;
-use ProcessMaker\Jobs\CompileSass;
 use ProcessMaker\Jobs\CompileUI;
 use ProcessMaker\Jobs\DevLinkInstall;
 use ProcessMaker\Models\Bundle;
@@ -23,6 +24,8 @@
 use ProcessMaker\Models\SettingsMenus;
 use ProcessMaker\Models\User;
 use ProcessMaker\Notifications\BundleUpdatedNotification;
+use ProcessMaker\Package\PackageDynamicUI\Models\Dashboard;
+use ProcessMaker\Package\PackageDynamicUI\Models\Menu;
 
 class DevLinkController extends Controller
 {
@@ -56,20 +59,24 @@ public function show(DevLink $devLink)
         return $devLink;
     }
 
-    public function store(Request $request)
+    public function store(DevLinkStoreRequest $request)
     {
-        $request->validate([
-            'name' => ['required'],
-            'url' => ['required', 'url'],
-        ]);
-        $devLink = DevLink::where('name', $request->input('name'))->first();
-        if ($devLink) {
-            $devLink->url = $request->input('url');
-        } else {
-            $devLink = new DevLink();
-            $devLink->name = $request->input('name');
-            $devLink->url = $request->input('url');
+        $normalizedUrl = $this->normalizeUrl($request->input('url'));
+        $existingDevLink = DevLink::query()
+            ->get(['id', 'name', 'url'])
+            ->first(fn (DevLink $devLink) => $this->normalizeUrl($devLink->url) === $normalizedUrl);
+        if ($existingDevLink) {
+            throw ValidationException::withMessages([
+                'url' => __(
+                    'This instance is already linked as :name. Open or reconnect the existing connection.',
+                    ['name' => $existingDevLink->name]
+                ),
+            ]);
         }
+
+        $devLink = new DevLink();
+        $devLink->name = $request->input('name');
+        $devLink->url = $normalizedUrl;
         $devLink->saveOrFail();
 
         return $devLink;
@@ -77,6 +84,13 @@ public function store(Request $request)
 
     public function update(Request $request, DevLink $devLink)
     {
+        $request->merge([
+            'name' => trim((string) $request->input('name')),
+        ]);
+        $request->validate([
+            'name' => ['required', 'string', Rule::unique('dev_links', 'name')->ignore($devLink->id)],
+        ]);
+
         $devLink->name = $request->input('name');
         $devLink->saveOrFail();
 
@@ -180,7 +194,7 @@ public function increaseBundleVersion(Bundle $bundle)
         return $bundle;
     }
 
-    public function bundleUpdated($bundleId, $token)
+    public function bundleUpdated(int $bundleId, string $token)
     {
         try {
             $bundle = Bundle::where('remote_id', $bundleId)->firstOrFail();
@@ -208,7 +222,7 @@ public function deleteBundle(Bundle $bundle)
         $bundle->delete();
     }
 
-    public function installRemoteBundle(Request $request, DevLink $devLink, $remoteBundleId)
+    public function installRemoteBundle(Request $request, DevLink $devLink, int $remoteBundleId)
     {
         $updateType = $request->input('updateType', DevLinkInstall::MODE_UPDATE);
         DevLinkInstall::dispatch(
@@ -342,7 +356,7 @@ public function addSharedAsset(Request $request)
         $sharedAsset->saveOrFail();
     }
 
-    public function removeSharedAsset($id)
+    public function removeSharedAsset(int $id)
     {
         $deleted = Setting::destroy($id);
 
@@ -371,9 +385,41 @@ public function installRemoteAsset(Request $request, DevLink $devLink)
         ];
     }
 
-    public function remoteBundleVersion(DevLink $devLink, $remoteBundleId)
+    public function remoteBundleVersion(DevLink $devLink, int $remoteBundleId)
+    {
+        try {
+            $payload = $devLink->remoteBundle($remoteBundleId)->json();
+        } catch (RequestException|ConnectionException $e) {
+            return [
+                'available' => false,
+                'version' => null,
+            ];
+        }
+
+        if (!is_array($payload)) {
+            return [
+                'available' => false,
+                'version' => null,
+            ];
+        }
+
+        $payload['available'] = true;
+
+        return $payload;
+    }
+
+    private function normalizeUrl(string $url): string
     {
-        return $devLink->remoteBundle($remoteBundleId);
+        $parts = parse_url(trim($url));
+        $scheme = strtolower($parts['scheme']);
+        $host = strtolower($parts['host']);
+        $port = $parts['port'] ?? null;
+
+        if (($scheme === 'http' && $port === 80) || ($scheme === 'https' && $port === 443)) {
+            $port = null;
+        }
+
+        return $scheme . '://' . $host . ($port === null ? '' : ':' . $port);
     }
 
     public function deleteBundleAsset(BundleAsset $bundleAsset)
@@ -390,80 +436,70 @@ public function deleteBundleSetting(BundleSetting $bundleSetting)
         return response()->json(['message' => 'Bundle setting deleted.'], 200);
     }
 
-    public function getBundleSetting(Bundle $bundle, $settingKey)
+    public function getBundleSetting(Bundle $bundle, string $settingKey)
+    {
+        return $bundle->settings()->where('setting', $settingKey)->first();
+    }
+
+    public function getBundleSettingPreview(Bundle $bundle, string $settingKey): array
     {
-        $setting = $bundle->settings()->where('setting', $settingKey)->first();
+        abort_unless(in_array($settingKey, ['ui_dashboards', 'ui_menus'], true), 404);
 
-        return $setting;
+        return $bundle->settingPreview($settingKey);
     }
 
-    public function getBundleAllSettings($settingKey)
+    public function getBundleAllSettings(string $settingKey)
     {
-        if ($settingKey === 'ui_settings') {
-            return Setting::whereIn('key', ['css-override', 'login-footer', 'logo-alt-text'])
-                         ->get();
+        return match ($settingKey) {
+            'ui_dashboards' => $this->getAvailableDashboards(),
+            'ui_menus' => $this->getAvailableMenus(),
+            'ui_settings' => Setting::whereIn('key', ['css-override', 'login-footer', 'logo-alt-text'])->get(),
+            default => Setting::where([
+                ['group_id', SettingsMenus::getId($settingKey)],
+                ['hidden', 0],
+            ])->get(),
+        };
+    }
+
+    private function getAvailableDashboards()
+    {
+        if (!class_exists(Dashboard::class)) {
+            return [];
         }
 
-        return Setting::where([
-            ['group_id', SettingsMenus::getId($settingKey)],
-            ['hidden', 0],
-        ])->get();
+        return Dashboard::query()
+            ->orderBy('title')
+            ->get(['id', 'title'])
+            ->map(function (Dashboard $dashboard) {
+                return [
+                    'key' => $dashboard->id,
+                    'name' => $dashboard->title,
+                ];
+            })
+            ->values();
     }
 
-    public function refreshUi()
+    private function getAvailableMenus()
     {
-        CompileUI::dispatch(auth()->user()?->id);
-        CustomizeUiUpdated::dispatch([], [], false);
+        if (!class_exists(Menu::class)) {
+            return [];
+        }
+
+        return Menu::query()
+            ->orderBy('name')
+            ->get(['id', 'name'])
+            ->map(function (Menu $menu) {
+                return [
+                    'key' => $menu->id,
+                    'name' => $menu->name,
+                ];
+            })
+            ->values();
     }
 
-    private function writeColors($data)
+    public function refreshUi(Request $request)
     {
-        // Now generate the _colors.scss file
-        $contents = "// Changed theme colors\n";
-        foreach ($data as $value) {
-            $contents .= $value->id . ': ' . $value->value . ";\n";
-        }
-        File::put(app()->resourcePath('sass') . '/_colors.scss', $contents);
-    }
-
-    /**
-     * Write variables font in file
-     *
-     * @param $sansSerif
-     * @param $serif
-     */
-    private function writeFonts($sansSerif)
-    {
-        $sansSerif = $sansSerif ? $sansSerif : $this->sansSerifFontDefault();
-        // Generate the _fonts.scss file
-        $contents = "// Changed theme fonts\n";
-        $contents .= '$font-family-sans-serif: ' . $sansSerif['id'] . " !default;\n";
-        File::put(app()->resourcePath('sass') . '/_fonts.scss', $contents);
-    }
-
-    /**
-     * run jobs compile
-     */
-    private function compileSass($userId)
-    {
-        // Compile the Sass files
-        $this->dispatch(new CompileSass([
-            'tag' => 'sidebar',
-            'origin' => 'resources/sass/sidebar/sidebar.scss',
-            'target' => 'public/css/sidebar.css',
-            'user' => $userId,
-        ]));
-        $this->dispatch(new CompileSass([
-            'tag' => 'app',
-            'origin' => 'resources/sass/app.scss',
-            'target' => 'public/css/app.css',
-            'user' => $userId,
-        ]));
-        $this->dispatch(new CompileSass([
-            'tag' => 'queues',
-            'origin' => 'resources/sass/admin/queues.scss',
-            'target' => 'public/css/admin/queues.css',
-            'user' => $userId,
-        ]));
+        CompileUI::dispatch($request->user()?->id);
+        CustomizeUiUpdated::dispatch([], [], false);
     }
 }
diff --git a/ProcessMaker/Http/Requests/DevLinkStoreRequest.php b/ProcessMaker/Http/Requests/DevLinkStoreRequest.php
new file mode 100644
index 0000000000..6d6c1d5115
--- /dev/null
+++ b/ProcessMaker/Http/Requests/DevLinkStoreRequest.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace ProcessMaker\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Validation\Rule;
+use ProcessMaker\Rules\HttpOrigin;
+
+class DevLinkStoreRequest extends FormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    protected function prepareForValidation(): void
+    {
+        $this->merge([
+            'name' => trim((string) $this->input('name')),
+            'url' => trim((string) $this->input('url')),
+        ]);
+    }
+
+    public function rules(): array
+    {
+        return [
+            'name' => ['required', 'string', Rule::unique('dev_links', 'name')],
+            'url' => ['bail', 'required', 'url', new HttpOrigin()],
+        ];
+    }
+}
diff --git a/ProcessMaker/ImportExport/Options.php b/ProcessMaker/ImportExport/Options.php
index f70dcce89c..084489c4fc 100644
--- a/ProcessMaker/ImportExport/Options.php
+++ b/ProcessMaker/ImportExport/Options.php
@@ -34,9 +34,12 @@ class Options
 
     public $options;
 
-    public function __construct(array $options)
+    public ?int $importingUserId;
+
+    public function __construct(array $options, ?int $importingUserId = null)
     {
         $this->options = $options;
+        $this->importingUserId = $importingUserId;
     }
 
     public function get($name, $uuid)
diff --git a/ProcessMaker/Models/Bundle.php b/ProcessMaker/Models/Bundle.php
index a62545e499..98f6328ab5 100644
--- a/ProcessMaker/Models/Bundle.php
+++ b/ProcessMaker/Models/Bundle.php
@@ -20,6 +20,13 @@ class Bundle extends ProcessMakerModel implements HasMedia
     use HasFactory;
     use InteractsWithMedia;
 
+    private const SETTING_PREVIEW_PAYLOAD_TYPES = [
+        'ui_dashboards' => 'dashboard_package',
+        'ui_menus' => 'menu_package',
+    ];
+
+    private const SETTINGS_PAYLOADS_COMPLETE_PROPERTY = 'settings_payloads_complete';
+
     protected $guarded = ['id'];
 
     protected $appends = ['asset_count'];
@@ -104,6 +111,92 @@ public function exportSettingPayloads()
         });
     }
 
+    public function settingPreview(string $settingKey): array
+    {
+        if (!array_key_exists($settingKey, self::SETTING_PREVIEW_PAYLOAD_TYPES)) {
+            throw new \InvalidArgumentException('Unsupported bundle setting preview.');
+        }
+
+        $bundleSetting = $this->settings()->where('setting', $settingKey)->first();
+        $selection = match (true) {
+            $bundleSetting === null => 'none',
+            $bundleSetting->config === null => 'all',
+            default => 'partial',
+        };
+
+        $preview = [
+            'setting' => $settingKey,
+            'selection' => $selection,
+            'available' => true,
+            'items' => [],
+        ];
+
+        if ($selection === 'none') {
+            return $preview;
+        }
+
+        $payloads = $this->readNewestPayloads();
+        if ($payloads === null) {
+            $preview['available'] = false;
+
+            return $preview;
+        }
+
+        $payloadType = self::SETTING_PREVIEW_PAYLOAD_TYPES[$settingKey];
+        $items = [];
+        foreach ($payloads as $payload) {
+            if (!is_array($payload) || ($payload['type'] ?? null) !== $payloadType) {
+                continue;
+            }
+
+            $key = $payload['root'] ?? null;
+            $name = $payload['name'] ?? null;
+            if (!is_string($key) || !is_string($name)) {
+                continue;
+            }
+
+            $items[$key] = [
+                'key' => $key,
+                'name' => $name,
+            ];
+        }
+
+        $preview['items'] = array_values($items);
+        usort($preview['items'], function (array $left, array $right) {
+            return strcasecmp($left['name'], $right['name'])
+                ?: strcmp($left['key'], $right['key']);
+        });
+
+        return $preview;
+    }
+
+    private function readNewestPayloads(): ?array
+    {
+        $media = $this->newestVersionFile();
+        if (
+            $media === null
+            || $media->getCustomProperty(self::SETTINGS_PAYLOADS_COMPLETE_PROPERTY) !== true
+            || !is_readable($media->getPath())
+        ) {
+            return null;
+        }
+
+        $compressedPayloads = file_get_contents($media->getPath());
+        $payloads = null;
+        if ($compressedPayloads !== false && str_starts_with($compressedPayloads, "\x1f\x8b")) {
+            $decodedPayloads = gzdecode($compressedPayloads);
+            if ($decodedPayloads !== false) {
+                try {
+                    $payloads = json_decode($decodedPayloads, true, flags: JSON_THROW_ON_ERROR);
+                } catch (\JsonException) {
+                    $payloads = null;
+                }
+            }
+        }
+
+        return is_array($payloads) ? $payloads : null;
+    }
+
     public function syncAssets($assets)
     {
         $assetKeys = [];
@@ -322,8 +415,9 @@ public function filesSortedByVersion()
                 $media->getCustomProperty('version'),
             ];
         })->sort(function ($a, $b) {
-            // newest versions first
-            return version_compare($a[1], $b[1]) * -1;
+            $versionComparison = version_compare($a[1], $b[1]) * -1;
+
+            return $versionComparison ?: $b[0]->getKey() <=> $a[0]->getKey();
         })->map(function ($item) {
             return $item[0];
         });
@@ -341,18 +435,10 @@ public function savePayloadsToFile(array $payloads, array $payloadsSettings, $lo
         }
         $logger->status('Saving the bundle locally');
 
-        // Filter and extract export payloads from nested array
-        $exportPayloads = array_filter($payloadsSettings, function ($payload) {
-            return !empty($payload[0]) && isset($payload[0]['export']);
-        });
-
-        // Extract payloads from nested array structure
-        $flattenedExportPayloads = array_map(function ($payload) {
-            return $payload[0];  // Tomar solo el primer elemento del array anidado
-        }, array_values($exportPayloads));
+        $exportPayloads = $this->extractSettingExportPayloads($payloadsSettings);
 
-        if (!empty($flattenedExportPayloads)) {
-            $payloads = array_merge($payloads, $flattenedExportPayloads);
+        if (!empty($exportPayloads)) {
+            $payloads = array_merge($payloads, $exportPayloads);
         }
 
         $this->addMediaFromString(
@@ -360,10 +446,13 @@ public function savePayloadsToFile(array $payloads, array $payloadsSettings, $lo
                 json_encode($payloads)
             ),
         )->usingFileName('payloads.json.gz')
-        ->withCustomProperties(['version' => $this->version])
+        ->withCustomProperties([
+            'version' => $this->version,
+            self::SETTINGS_PAYLOADS_COMPLETE_PROPERTY => true,
+        ])
         ->toMediaCollection();
 
-        // Keep only the 3 most recent versions
+        // Keep only the 3 most recent snapshots
         $count = 0;
         foreach ($this->filesSortedByVersion() as $media) {
             if ($count >= 3) {
@@ -388,27 +477,50 @@ public function installSettings($settings)
 
     public function installSettingsPayloads(array $payloads, $mode, $logger = null)
     {
+        if ($logger === null) {
+            $logger = new Logger();
+        }
+
         $options = new Options([
             'mode' => $mode,
-        ]);
+        ], $logger->userId);
 
-        $assets = [];
-        foreach ($payloads as $payload) {
-            // Verify the type of payload without considering the order
-            if (!empty($payload) && is_array($payload[0])) {
-                // If it is a settings payload
-                if (isset($payload[0]['setting_type'])) {
-                    $this->processSettingsPayload($payload);
-                }
+        foreach ($payloads as $payloadGroup) {
+            $settingPayloads = array_filter($payloadGroup, function ($payload) {
+                return is_array($payload) && isset($payload['setting_type']);
+            });
+
+            if (!empty($settingPayloads)) {
+                $this->processSettingsPayload($settingPayloads);
+            }
+        }
+
+        $exportPayloads = $this->extractSettingExportPayloads($payloads);
+        if (empty($exportPayloads)) {
+            return;
+        }
+
+        $logger->status('Installing bundle settings on the this instance');
+        $logger->setSteps($exportPayloads);
 
-                // If it is an export payload (it can be the same or another element)
-                if (isset($payload[0]['export'])) {
-                    $logger->status('Installing bundle settings on the this instance');
-                    $logger->setSteps($payload);
-                    $assets[] = DevLink::import($payload[0], $options, $logger);
+        foreach ($exportPayloads as $payload) {
+            DevLink::import($payload, $options, $logger);
+        }
+    }
+
+    private function extractSettingExportPayloads(array $payloadGroups): array
+    {
+        $exportPayloads = [];
+
+        foreach ($payloadGroups as $payloadGroup) {
+            foreach ($payloadGroup as $payload) {
+                if (is_array($payload) && isset($payload['export'])) {
+                    $exportPayloads[] = $payload;
                 }
             }
         }
+
+        return $exportPayloads;
     }
 
     // Auxiliary method to process the settings
@@ -463,7 +575,7 @@ public function install(array $payloads, $mode, $logger = null, $reinstall = fal
 
         $options = new Options([
             'mode' => $mode,
-        ]);
+        ], $logger->userId);
         $assets = [];
         foreach ($payloads as $payload) {
             $assets[] = DevLink::import($payload, $options, $logger);
diff --git a/ProcessMaker/Rules/HttpOrigin.php b/ProcessMaker/Rules/HttpOrigin.php
new file mode 100644
index 0000000000..461fafd3ff
--- /dev/null
+++ b/ProcessMaker/Rules/HttpOrigin.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace ProcessMaker\Rules;
+
+use Closure;
+use Illuminate\Contracts\Validation\ValidationRule;
+
+class HttpOrigin implements ValidationRule
+{
+    public function validate(string $attribute, mixed $value, Closure $fail): void
+    {
+        $parts = parse_url($value);
+        if ($parts === false) {
+            $fail(__('The instance URL must contain only an HTTP or HTTPS origin.'));
+
+            return;
+        }
+
+        $path = $parts['path'] ?? '';
+        if (
+            !isset($parts['scheme'], $parts['host'])
+            || !in_array(strtolower($parts['scheme']), ['http', 'https'], true)
+            || !in_array($path, ['', '/'], true)
+            || isset($parts['query'])
+            || isset($parts['fragment'])
+            || isset($parts['user'])
+            || isset($parts['pass'])
+        ) {
+            $fail(__('The instance URL must contain only an HTTP or HTTPS origin.'));
+        }
+    }
+}
diff --git a/resources/js/admin/devlink/components/BundleConfigurations.vue b/resources/js/admin/devlink/components/BundleConfigurations.vue
index 4d347a1cf5..9bb9978249 100644
--- a/resources/js/admin/devlink/components/BundleConfigurations.vue
+++ b/resources/js/admin/devlink/components/BundleConfigurations.vue
@@ -4,14 +4,22 @@
       {{ $t(title) }}
     </div>
     <div class="card-grid">
-      <div v-for="config in configurations || []" :key="config.type" class="card">
+      <div
+        v-for="config in configurations || []"
+        :key="config.type"
+        class="card"
+      >
         <div class="config-info">
-          <div class="config-label">{{ $t(config.name) }}</div>
-          <div class="config-status">{{ status(config) }}</div>
+          <div class="config-label">
+            {{ $t(config.name) }}
+          </div>
+          <div class="config-status">
+            {{ status(config) }}
+          </div>
         </div>
         <div class="config-action">
           <button
-            v-if="props.type"
+            v-if="props.type || config.configurable"
             class="config-action-button"
             @click="$emit('open-settings-modal', {
               key: config.type,
@@ -40,47 +48,42 @@
 </template>
 
 <script setup>
-import { getCurrentInstance } from 'vue';
+import { getCurrentInstance } from "vue";
 
 const vue = getCurrentInstance().proxy;
 const props = defineProps({
   configurations: {
     type: Array,
-    required: true,
-    default: () => []
+    default: () => [],
   },
   values: {
     type: Array,
-    required: true,
-    default: () => []
+    default: () => [],
   },
   title: {
     type: String,
-    required: true
+    required: true,
   },
   type: {
     type: String,
-    required: false
+    default: null,
   },
   disabled: {
     type: Boolean,
-    required: false,
-    default: false
-  }
+    default: false,
+  },
 });
 
-defineEmits(['config-change', 'open-settings-modal']);
+defineEmits(["config-change", "open-settings-modal"]);
 
-const isInSettings = (type) => {
-  return (props.values || []).find(value => value.setting === type.type);
-};
+const isInSettings = (type) => (props.values || []).find((value) => value.setting === type.type);
 
 const status = (type) => {
-  const settingValue = (props.values || []).find(value => value.setting === type.type);
+  const settingValue = (props.values || []).find((value) => value.setting === type.type);
 
-  if (!settingValue) return vue.$t('Not shared');
-  if (settingValue.config === null) return vue.$t('All');
-  return vue.$t('Shared');
+  if (!settingValue) return vue.$t("Not shared");
+  if (settingValue.config === null) return vue.$t("All");
+  return vue.$t("Shared");
 };
 </script>
 
diff --git a/resources/js/admin/devlink/components/BundleDetail.vue b/resources/js/admin/devlink/components/BundleDetail.vue
index b92b82b46b..fe2f7d822d 100644
--- a/resources/js/admin/devlink/components/BundleDetail.vue
+++ b/resources/js/admin/devlink/components/BundleDetail.vue
@@ -1,22 +1,35 @@
 <template>
   <div class="main-content">
-    <div class="tw-flex tw-items-center tw-justify-center" v-if="loading">
-      <div class="spinner-border text-primary" role="status" />
+    <div
+      v-if="loading"
+      class="tw-flex tw-items-center tw-justify-center"
+    >
+      <div
+        class="spinner-border text-primary"
+        role="status"
+      />
       <span class="visually-hidden">Loading...</span>
     </div>
     <!-- Header -->
-    <div v-else class="content-header">
+    <div
+      v-else
+      class="content-header"
+    >
       <div class="content-header-title">
         {{ bundle.name }}
-        <VersionCheck @updateAvailable="updateAvailable = $event" :dev-link="bundle"></VersionCheck>
+        <VersionCheck
+          :dev-link="bundle"
+          @updateAvailable="updateAvailable = $event"
+          @availabilityChanged="remoteAvailable = $event"
+        />
       </div>
       <div class="header-actions">
         <b-button
           v-if="bundle.dev_link_id === null"
+          v-b-tooltip.hover
           class="btn text-secondary icon-button"
           variant="light"
           :aria-label="$t('Edit Bundle')"
-          v-b-tooltip.hover
           :title="$t('Edit Bundle')"
           @click.prevent="openBundleModalForEdit()"
         >
@@ -25,6 +38,7 @@
         <button
           v-if="bundle.dev_link_id !== null"
           class="btn btn-outline-secondary mr-2 dropdown-toggle"
+          :disabled="remoteAvailable !== true"
           data-toggle="dropdown"
           data-offset="5, 5"
           aria-haspopup="true"
@@ -32,9 +46,12 @@
         >
           {{ $t('Reinstall') }}
         </button>
-        <div class="dropdown-menu dropdown-menu-right" id="dropdown">
+        <div
+          id="dropdown"
+          class="dropdown-menu dropdown-menu-right"
+        >
           <a
-            v-if="updateAvailable"
+            v-if="updateAvailable && remoteAvailable"
             class="dropdown-item"
             href="#"
             @click.prevent="reinstallBundle.show(bundle)"
@@ -43,7 +60,7 @@
             {{ $t('Update Bundle') }}
           </a>
           <a
-            v-if="bundle.dev_link_id !== null"
+            v-if="bundle.dev_link_id !== null && remoteAvailable"
             class="dropdown-item"
             href="#"
             @click.prevent="executeReinstall('copy')"
@@ -52,7 +69,7 @@
             {{ $t('Add a Copy') }}
           </a>
           <a
-            v-if="bundle.dev_link_id !== null"
+            v-if="bundle.dev_link_id !== null && remoteAvailable"
             class="dropdown-item"
             href="#"
             @click.prevent="executeReinstall('update')"
@@ -77,7 +94,9 @@
       <div class="description-section-title">
         {{ $t('Description:') }}
       </div>
-      <p class="description-section-text">{{ bundle.description || $t('No description available') }}</p>
+      <p class="description-section-text">
+        {{ bundle.description || $t('No description available') }}
+      </p>
     </div>
 
     <div class="divider" />
@@ -94,18 +113,19 @@
       :configurations="platformConfigurations"
       :values="bundle.settings"
       :disabled="bundle.dev_link_id !== null"
-      @config-change="handleConfigChange"
       title="Platform Configurations"
+      @config-change="handleConfigChange"
+      @open-settings-modal="openSettingsModal"
     />
 
     <BundleConfigurations
       :configurations="settings"
       :values="bundle.settings"
       :disabled="bundle.dev_link_id !== null"
-      @config-change="handleConfigChange"
-      @open-settings-modal="openSettingsModal"
       title="Settings"
       type="settings"
+      @config-change="handleConfigChange"
+      @open-settings-modal="openSettingsModal"
     />
 
     <BundleModal
@@ -131,22 +151,24 @@
       title="Publish New Version"
       @ok="executeIncrease"
     >
-      <p v-html="confirmPublishNewVersionText"></p>
+      <p v-html="confirmPublishNewVersionText" />
     </b-modal>
   </div>
 </template>
 
 <script setup>
-import { ref, onMounted, computed, getCurrentInstance } from 'vue';
-import { useRoute } from 'vue-router/composables';
-import BundleModal, { show as showBundleModal, hide as hideBundleModal } from './BundleModal.vue';
-import UpdateBundle from './UpdateBundle.vue';
-import BundleSettingsModal from './BundleSettingsModal.vue';
-import BundleAssets from './BundleAssets.vue';
-import BundleConfigurations from './BundleConfigurations.vue';
-import VersionCheck from './VersionCheck.vue';
-import platformConfigurations from './platformConfigurations';
-import settings from './settings';
+import {
+  ref, onMounted, computed, getCurrentInstance,
+} from "vue";
+import { useRoute } from "vue-router/composables";
+import BundleModal from "./BundleModal.vue";
+import UpdateBundle from "./UpdateBundle.vue";
+import BundleSettingsModal from "./BundleSettingsModal.vue";
+import BundleAssets from "./BundleAssets.vue";
+import BundleConfigurations from "./BundleConfigurations.vue";
+import VersionCheck from "./VersionCheck.vue";
+import platformConfigurations from "./platformConfigurations";
+import settings from "./settings";
 
 const vue = getCurrentInstance().proxy;
 const bundle = ref({});
@@ -158,6 +180,7 @@ const route = useRoute();
 const bundleId = route.params.id;
 const bundleForEdit = ref({});
 const updateAvailable = ref(false);
+const remoteAvailable = ref(null);
 const selected = ref(null);
 const confirmPublishNewVersion = ref(null);
 
@@ -190,9 +213,10 @@ const updateBundle = () => {
     });
 };
 
-const confirmPublishNewVersionText = computed(() => {
-  return vue.$t('Are you sure you increase the version of <strong>{{ bundleName }}</strong>?', { bundleName: bundle.value?.name });
-});
+const confirmPublishNewVersionText = computed(() => vue.$t(
+  "Are you sure you increase the version of <strong>{{ bundleName }}</strong>?",
+  { bundleName: bundle.value?.name },
+));
 
 const publishBundle = () => {
   selected.value = bundle.value;
@@ -202,7 +226,7 @@ const publishBundle = () => {
 const executeIncrease = () => {
   ProcessMaker.apiClient
     .post(`devlink/local-bundles/${selected.value.id}/increase-version`)
-    .then((result) => {
+    .then(() => {
       confirmPublishNewVersion.value.hide();
     });
 };
diff --git a/resources/js/admin/devlink/components/BundleSettingsModal.vue b/resources/js/admin/devlink/components/BundleSettingsModal.vue
index ad17d88aa8..ad640af35d 100644
--- a/resources/js/admin/devlink/components/BundleSettingsModal.vue
+++ b/resources/js/admin/devlink/components/BundleSettingsModal.vue
@@ -4,37 +4,49 @@
     centered
     size="lg"
     :title="modalTitle"
-    @ok="onOk"
     ok-title="Save"
     :cancel-title="'Cancel'"
-    :ok-disabled="!editable"
+    :ok-disabled="!editable || loading"
+    @ok="onOk"
   >
     <p>
-      {{ $t("These settings will be saved as they are now in the platform. Future changes to the platform's settings won't affect them, as this is a snapshot of the current configuration.") }}
+      {{ $t(modalDescription) }}
     </p>
     <div class="card settings-listing-card">
       <b-table
         :items="settings"
         :fields="computedFields"
+        :busy="loading"
         responsive="sm"
+        show-empty
+        :empty-text="$t(emptyText)"
         class="asset-listing-table"
       >
         <template #head(toggle)>
           <b-form-checkbox
             v-model="allSelected"
-            :disabled="!editable"
-            @change="toggleAll"
+            :disabled="!editable || loading || settings.length === 0"
             switch
+            @change="toggleAll"
           />
         </template>
         <template #cell(toggle)="data">
           <b-form-checkbox
             v-model="data.item.enabled"
-            :disabled="!editable"
-            @change="toggleSetting(data.item.key)"
+            :disabled="!editable || loading"
             switch
+            @change="toggleSetting(data.item.key, $event)"
           />
         </template>
+        <template #table-busy>
+          <div class="text-center my-3">
+            <b-spinner
+              small
+              class="mr-2"
+            />
+            {{ $t("Loading") }}
+          </div>
+        </template>
       </b-table>
     </div>
     <button
@@ -47,10 +59,10 @@
   </b-modal>
 </template>
 <script setup>
-import { ref, computed } from 'vue';
-import { useRoute } from 'vue-router/composables';
+import { ref, computed } from "vue";
+import { useRoute } from "vue-router/composables";
 
-const emit = defineEmits(['settings-saved']);
+const emit = defineEmits(["settings-saved"]);
 
 const props = defineProps({
   editable: {
@@ -59,102 +71,219 @@ const props = defineProps({
   },
 });
 
+const bundleSettingsModal = ref(null);
+const route = useRoute();
+const bundleId = route.params.id;
+const settings = ref([]);
+const modalTitle = ref("");
+const settingKey = ref("");
+const selectedIds = ref([]);
+const allSelected = ref(false);
+const loading = ref(false);
+const bundleSettingExists = ref(false);
+const previewAvailable = ref(true);
+
 const computedFields = computed(() => [
-  { 
-    key: 'name', 
-    label: 'Name',
+  {
+    key: "name",
+    label: "Name",
     formatter: (value, key, item) => {
-      if (settingKey.value === 'ui_settings') {
+      if (settingKey.value === "ui_settings") {
         return item.key;
       }
       // Concatena el nombre con el grupo si existe
       return item.group ? `${value} (${item.group})` : value;
-    }
+    },
   },
-  { key: 'toggle', label: '', class: 'text-center' },
+  { key: "toggle", label: "", class: "text-center" },
 ]);
 
-const bundleSettingsModal = ref(null);
-const route = useRoute();
-const bundleId = route.params.id;
-const settings = ref([]);
-const modalTitle = ref('');
-const settingKey = ref('');
-const configs = ref({});
-const selectedIds = ref([]);
-const allSelected = ref(false);
+const platformConfigurationLabels = {
+  ui_dashboards: "Dashboards",
+  ui_menus: "Menus",
+};
+const isPlatformConfiguration = computed(() => (
+  Object.prototype.hasOwnProperty.call(platformConfigurationLabels, settingKey.value)
+));
+
+const modalDescription = computed(() => {
+  if (isPlatformConfiguration.value && !props.editable) {
+    return `These ${modalTitle.value.toLowerCase()} are included in the installed bundle.`;
+  }
+
+  if (settingKey.value === "ui_dashboards") {
+    return [
+      "Select the dashboards to include in this bundle.",
+      "Selecting all includes every dashboard available when the bundle is exported.",
+    ].join(" ");
+  }
+  if (settingKey.value === "ui_menus") {
+    return [
+      "Select the menus to include in this bundle.",
+      "Selecting all includes every menu available when the bundle is exported.",
+    ].join(" ");
+  }
+
+  return [
+    "These settings will be saved as they are now in the platform.",
+    "Future changes to the platform's settings won't affect them, as this is a snapshot of the current configuration.",
+  ].join(" ");
+});
+
+const emptyText = computed(() => {
+  if (isPlatformConfiguration.value && !props.editable && !previewAvailable.value) {
+    return "Bundle content preview is unavailable for this version";
+  }
+  if (settingKey.value === "ui_dashboards" && !props.editable) {
+    return "No dashboards included";
+  }
+  if (settingKey.value === "ui_menus" && !props.editable) {
+    return "No menus included";
+  }
+  if (settingKey.value === "ui_dashboards") {
+    return "No dashboards available";
+  }
+  if (settingKey.value === "ui_menus") {
+    return "No menus available";
+  }
+
+  return "No settings available";
+});
+
+const hide = () => {
+  if (bundleSettingsModal.value) {
+    bundleSettingsModal.value.hide();
+  }
+};
+
+const loadSettingPreview = async () => {
+  const response = await window.ProcessMaker.apiClient.get(
+    `devlink/local-bundles/${bundleId}/setting-preview/${settingKey.value}`,
+  );
+  const preview = response.data;
+
+  previewAvailable.value = preview.available;
+  bundleSettingExists.value = preview.selection !== "none";
+  settings.value = (preview.items || []).map((setting) => ({
+    ...setting,
+    enabled: true,
+  }));
+  selectedIds.value = settings.value.map((setting) => setting.key);
+  allSelected.value = preview.selection === "all" && settings.value.length > 0;
+};
+
+const loadSettings = async () => {
+  loading.value = true;
+
+  try {
+    if (isPlatformConfiguration.value && !props.editable) {
+      await loadSettingPreview();
+      return;
+    }
+
+    const [response, settingsResponse] = await Promise.all([
+      window.ProcessMaker.apiClient.get(`devlink/local-bundles/${bundleId}/setting/${settingKey.value}`),
+      window.ProcessMaker.apiClient.get(`devlink/local-bundles/all-settings/${settingKey.value}`),
+    ]);
+
+    const bundleSetting = response.data && response.data.id ? response.data : null;
+    bundleSettingExists.value = !!bundleSetting;
+    const availableSettings = settingsResponse.data || [];
+
+    if (isPlatformConfiguration.value && bundleSetting && bundleSetting.config === null) {
+      selectedIds.value = availableSettings.map((setting) => setting.key);
+    } else {
+      let configData = { id: [] };
+      if (bundleSetting?.config) {
+        configData = typeof bundleSetting.config === "string"
+          ? JSON.parse(bundleSetting.config)
+          : bundleSetting.config;
+      }
+      selectedIds.value = configData.id || [];
+    }
+
+    settings.value = availableSettings.map((setting) => ({
+      ...setting,
+      enabled: selectedIds.value.includes(setting.key),
+    }));
+    selectedIds.value = settings.value
+      .filter((setting) => setting.enabled)
+      .map((setting) => setting.key);
+    allSelected.value = settings.value.length > 0
+      && selectedIds.value.length === settings.value.length;
+  } finally {
+    loading.value = false;
+  }
+};
 
 const onOk = async () => {
-  configs.value = {
-    id: selectedIds.value,
-  };
+  if (!props.editable) {
+    hide();
+    return;
+  }
+
+  if (selectedIds.value.length === 0 && !bundleSettingExists.value) {
+    hide();
+    return;
+  }
+
+  const config = isPlatformConfiguration.value
+    && allSelected.value
+    && settings.value.length > 0
+    ? null
+    : JSON.stringify({ id: selectedIds.value });
+
   await window.ProcessMaker.apiClient.post(`devlink/local-bundles/${bundleId}/add-settings`, {
     setting: settingKey.value,
-    config: JSON.stringify(configs.value),
+    config,
     type: null,
-    replaceIds: true
+    replaceIds: true,
   });
-  window.ProcessMaker.alert('Settings saved', 'success');
-  emit('settings-saved');
+  const successMessage = isPlatformConfiguration.value
+    ? `${modalTitle.value} saved`
+    : "Settings saved";
+  window.ProcessMaker.alert(successMessage, "success");
+  emit("settings-saved");
   hide();
 };
 
 const show = (config) => {
-  modalTitle.value = config.key === 'ui_settings' ? 'UI Settings' : config.key;
   settingKey.value = config.key;
+  modalTitle.value = platformConfigurationLabels[config.key]
+    || (config.key === "ui_settings" ? "UI Settings" : config.key);
+  settings.value = [];
+  selectedIds.value = [];
+  allSelected.value = false;
+  bundleSettingExists.value = false;
+  previewAvailable.value = true;
   if (bundleSettingsModal.value) {
     bundleSettingsModal.value.show();
     loadSettings();
   }
 };
 
-const hide = () => {
-  if (bundleSettingsModal.value) {
-    bundleSettingsModal.value.hide();
-  }
-};
-
-const loadSettings = async () => {
-  const response = await window.ProcessMaker.apiClient.get(`devlink/local-bundles/${bundleId}/setting/${settingKey.value}`);
-  const settingsResponse = await window.ProcessMaker.apiClient.get(`devlink/local-bundles/all-settings/${settingKey.value}`);
-  // Check if response.data.config is not empty before parsing
-  const configData = response.data.config ? JSON.parse(response.data.config) : { id: [] };
-  selectedIds.value = configData.id || [];
-
-  // Check if settings are enabled if their key is in selectedIds
-  settings.value = settingsResponse.data.map((setting) => ({
-    ...setting,
-    enabled: selectedIds.value.includes(setting.key),
-  }));
-
-  // Update the state of allSelected
-  allSelected.value = settings.value.every(setting => setting.enabled);
-};
-
 const refreshUi = async () => {
-  await window.ProcessMaker.apiClient.post(`devlink/local-bundles/setting/refresh-ui`);
-  window.ProcessMaker.alert('UI refreshed', 'success');
-  emit('settings-saved');
+  await window.ProcessMaker.apiClient.post("devlink/local-bundles/setting/refresh-ui");
+  window.ProcessMaker.alert("UI refreshed", "success");
+  emit("settings-saved");
 };
 
-const toggleSetting = (key) => {
-  if (selectedIds.value.includes(key)) {
-    selectedIds.value = selectedIds.value.filter(id => id !== key);
-  } else {
+const toggleSetting = (key, enabled) => {
+  if (enabled && !selectedIds.value.includes(key)) {
     selectedIds.value.push(key);
+  } else if (!enabled) {
+    selectedIds.value = selectedIds.value.filter((id) => id !== key);
   }
-  allSelected.value = settings.value.every(setting => setting.enabled);
+  allSelected.value = settings.value.length > 0
+    && selectedIds.value.length === settings.value.length;
 };
 
-const toggleAll = () => {
-  settings.value.forEach(setting => {
-    setting.enabled = allSelected.value;
-    if (allSelected.value && !selectedIds.value.includes(setting.key)) {
-      selectedIds.value.push(setting.key);
-    } else if (!allSelected.value) {
-      selectedIds.value = selectedIds.value.filter(id => id !== setting.key);
-    }
-  });
+const toggleAll = (enabled) => {
+  settings.value = settings.value.map((setting) => ({
+    ...setting,
+    enabled,
+  }));
+  selectedIds.value = enabled ? settings.value.map((setting) => setting.key) : [];
 };
 
 defineExpose({
diff --git a/resources/js/admin/devlink/components/CreateDevLinkModal.vue b/resources/js/admin/devlink/components/CreateDevLinkModal.vue
index bfa0ad89a5..4afae6df2e 100644
--- a/resources/js/admin/devlink/components/CreateDevLinkModal.vue
+++ b/resources/js/admin/devlink/components/CreateDevLinkModal.vue
@@ -10,7 +10,13 @@
       :ok-title="$t('Create')"
       :cancel-title="$t('Cancel')"
     >
-      <div v-if="status === 'error'" class="alert alert-danger" role="alert">
+      <div v-if="errorMessage" class="alert alert-danger" role="alert">
+        <div class="alert-header">
+          <span class="icon">!</span>
+          <strong>{{ errorMessage }}</strong>
+        </div>
+      </div>
+      <div v-else-if="status === 'error'" class="alert alert-danger" role="alert">
         <div class="alert-header">
           <span class="icon">!</span>
           <strong>Connection Error</strong>
@@ -58,6 +64,10 @@ const props = defineProps({
     type: String,
     default: ''
   },
+  errorMessage: {
+    type: String,
+    default: ''
+  },
   showDetails: {
     type: Boolean,
     default: false
diff --git a/resources/js/admin/devlink/components/Index.vue b/resources/js/admin/devlink/components/Index.vue
index 3f5e0e962f..60088ad3b0 100644
--- a/resources/js/admin/devlink/components/Index.vue
+++ b/resources/js/admin/devlink/components/Index.vue
@@ -56,6 +56,7 @@ onMounted(() => {
 const newName = ref('');
 const newUrl = ref('');
 const status = ref('');
+const createError = ref('');
 
 const load = () => {
   ProcessMaker.apiClient
@@ -79,10 +80,12 @@ const onNavigate = (action, data, index) => {
 const clear = () => {
   newName.value = '';
   newUrl.value = '';
+  createError.value = '';
 }
 
 const create = (name, url) => {
   status.value = '';
+  createError.value = '';
   ProcessMaker.apiClient
     .post('/devlink', {
       name: name,
@@ -112,6 +115,13 @@ const create = (name, url) => {
             status.value = 'error';
           }
         });
+    })
+    .catch((error) => {
+      createError.value = error.response?.data?.errors?.url?.[0]
+        || error.response?.data?.errors?.name?.[0]
+        || error.response?.data?.error?.message
+        || error.response?.data?.message
+        || vue.$t('Unable to create the linked instance.');
     });
 };
 
@@ -162,6 +172,7 @@ const handleFilterChange = () => {
 
 const showCreateModal = () => {
   status.value = '';
+  createError.value = '';
   createDevLinkModal.value.show();
 };
 
@@ -169,8 +180,27 @@ const handleNewUrlUpdate = (newValue) => {
   newUrl.value = newValue;
 };
 
+const isValidInstanceUrl = (value) => {
+  const trimmedValue = value.trim();
+  if (trimmedValue.includes('?') || trimmedValue.includes('#')) {
+    return false;
+  }
+
+  try {
+    const url = new URL(trimmedValue);
+
+    return ['http:', 'https:'].includes(url.protocol)
+      && url.hostname !== ''
+      && url.pathname === '/'
+      && url.username === ''
+      && url.password === '';
+  } catch {
+    return false;
+  }
+};
+
 const urlIsValid = computed(() => {
-  return /^(https?:\/\/[a-zA-Z0-9.-]+\.[a-zA-Z]{2,})(:\d{1,5})?$/.test(newUrl.value);
+  return isValidInstanceUrl(newUrl.value);
 });
 
 </script>
@@ -218,6 +248,7 @@ const urlIsValid = computed(() => {
       :newUrl="newUrl"
       :urlIsValid="urlIsValid"
       :status="status"
+      :errorMessage="createError"
       @clear="clear"
       @create="create"
       @update:newUrl="handleNewUrlUpdate"
diff --git a/resources/js/admin/devlink/components/InstallProgress.vue b/resources/js/admin/devlink/components/InstallProgress.vue
index 400efe0a83..e96c14f3ca 100644
--- a/resources/js/admin/devlink/components/InstallProgress.vue
+++ b/resources/js/admin/devlink/components/InstallProgress.vue
@@ -33,7 +33,20 @@
 </template>
 
 <script setup>
-import { ref, onMounted, onUnmounted, getCurrentInstance } from 'vue';
+import {
+  ref,
+  watch,
+  onMounted,
+  onUnmounted,
+  getCurrentInstance,
+} from "vue";
+
+const props = defineProps({
+  requestError: {
+    type: String,
+    default: "",
+  },
+});
 
 const vue = getCurrentInstance().proxy;
 const progress = ref(0);
@@ -45,8 +58,27 @@ const showSpinner = ref(true);
 const error = ref('');
 const emit = defineEmits(['installation-complete']);
 
+watch(
+  () => props.requestError,
+  (message) => {
+    if (!message) {
+      return;
+    }
+
+    showSpinner.value = false;
+    currentMessage.value = "";
+    error.value = message;
+    done.value = true;
+  },
+  {
+    immediate: true,
+  },
+);
+
 onMounted(() => {
-  currentMessage.value = vue.$t('Initializing') + '...';
+  if (!props.requestError) {
+    currentMessage.value = vue.$t('Initializing') + '...';
+  }
   window.Echo.private(`ProcessMaker.Models.User.${userId}`).listen(
     '.ImportLog',
     (response) => {
diff --git a/resources/js/admin/devlink/components/LocalBundles.vue b/resources/js/admin/devlink/components/LocalBundles.vue
index 6a57f68285..8e9c54a84a 100644
--- a/resources/js/admin/devlink/components/LocalBundles.vue
+++ b/resources/js/admin/devlink/components/LocalBundles.vue
@@ -22,13 +22,14 @@ const bundleModal = ref(null);
 const updateBundle = ref(null);
 const deleteWarningTitle = ref(vue.$t("Delete Confirmation"));
 const updatesAvailable = reactive({});
+const remoteAvailability = reactive({});
 const refreshKey = ref(0);
 
 const actions = [
   { value: "open-item", content: "Open" },
   { value: "increase-item", content: "Publish New Version", conditional: "if(not(dev_link_id), true, false)" },
   { value: "update-item", content: "Update Bundle", conditional: "if(update_available, true, false)" },
-  { value: "reinstall-item", content: "Reinstall Bundle", conditional: "if(dev_link_id, true, false)" },
+  { value: "reinstall-item", content: "Reinstall Bundle", conditional: "if(dev_link_id, remote_available, false)" },
   { value: "edit-item", content: "Edit", conditional: "if(not(dev_link_id) , true, false)" },
   { value: "delete-item", content: "Delete" },
 ]
@@ -44,6 +45,10 @@ const setUpdateAvailable = (bundle, updateAvailable) => {
   set(updatesAvailable, bundle.id, updateAvailable);
 };
 
+const setRemoteAvailability = (bundle, available) => {
+  set(remoteAvailability, bundle.id, available);
+};
+
 onMounted(() => {
   load();
 })
@@ -280,9 +285,10 @@ const handleInstallationComplete = () => {
           <Origin :dev-link="data.item.dev_link"></Origin>
         </template>
         <template #cell(version)="data">
-          {{ data.item.version }} <VersionCheck 
-            :key="`version-check-${data.item.id}-${refreshKey}`" 
-            @updateAvailable="setUpdateAvailable(data.item, $event)" 
+          {{ data.item.version }} <VersionCheck
+            :key="`version-check-${data.item.id}-${refreshKey}`"
+            @updateAvailable="setUpdateAvailable(data.item, $event)"
+            @availabilityChanged="setRemoteAvailability(data.item, $event)"
             :dev-link="data.item">
           </VersionCheck>
         </template>
@@ -290,7 +296,11 @@ const handleInstallationComplete = () => {
           <EllipsisMenu
             class="ellipsis-devlink"
             :actions="actions"
-            :data="{ ...data.item, update_available: updatesAvailable[data.item.id] ?? false }"
+            :data="{
+              ...data.item,
+              update_available: updatesAvailable[data.item.id] ?? false,
+              remote_available: remoteAvailability[data.item.id] ?? false,
+            }"
             :custom-button="customButton"
             @navigate="onNavigate"
           />
diff --git a/resources/js/admin/devlink/components/UpdateBundle.vue b/resources/js/admin/devlink/components/UpdateBundle.vue
index f601099fdf..5b62f1d6fc 100644
--- a/resources/js/admin/devlink/components/UpdateBundle.vue
+++ b/resources/js/admin/devlink/components/UpdateBundle.vue
@@ -7,6 +7,9 @@ const confirmUpdateVersion = ref(null);
 const selected = ref(null);
 const selectedOption = ref('update');
 const showInstallModal = ref(false);
+const installationInProgress = ref(false);
+const installationAttempt = ref(0);
+const requestError = ref("");
 const reinstall = ref(false);
 const title = computed(() => {
   if (reinstall.value) {
@@ -40,6 +43,13 @@ const updateBundleText = computed(() => {
 });
 
 const executeUpdate = (updateType) => {
+  if (installationInProgress.value) {
+    return;
+  }
+
+  installationInProgress.value = true;
+  installationAttempt.value += 1;
+  requestError.value = "";
   showInstallModal.value = true;
   let url;
   if (reinstall.value) {
@@ -52,12 +62,18 @@ const executeUpdate = (updateType) => {
     .post(url, {
       updateType,
     })
-    .then((response) => {
-      // Handle the response as needed
+    .catch((error) => {
+      const message = error?.response?.data?.message || error?.message;
+      requestError.value = typeof message === "string"
+        ? message
+        : vue.$t("Unable to start installation.");
     });
 };
 
 const handleInstallationComplete = () => {
+  installationInProgress.value = false;
+  showInstallModal.value = false;
+  requestError.value = "";
   emit('installation-complete');
 };
 
@@ -98,8 +114,21 @@ const handleInstallationComplete = () => {
       </div>
     </b-modal>
 
-    <b-modal id="install-progress" size="lg" v-model="showInstallModal" :title="$t('Installation Progress')" hide-footer>
-      <install-progress @installation-complete="handleInstallationComplete" />
+    <b-modal
+      id="install-progress"
+      v-model="showInstallModal"
+      size="lg"
+      :title="$t('Installation Progress')"
+      hide-footer
+      hide-header-close
+      no-close-on-backdrop
+      no-close-on-esc
+    >
+      <install-progress
+        :key="installationAttempt"
+        :request-error="requestError"
+        @installation-complete="handleInstallationComplete"
+      />
     </b-modal>
   </div>
-</template>
\ No newline at end of file
+</template>
diff --git a/resources/js/admin/devlink/components/VersionCheck.vue b/resources/js/admin/devlink/components/VersionCheck.vue
index 2513cc1efc..87f62c3ef9 100644
--- a/resources/js/admin/devlink/components/VersionCheck.vue
+++ b/resources/js/admin/devlink/components/VersionCheck.vue
@@ -1,26 +1,47 @@
 <script setup>
 import { ref, onMounted, defineEmits } from 'vue';
-import { useRouter, useRoute } from 'vue-router/composables';
 
-const router = useRouter();
-const emit = defineEmits(['updateAvailable']);
+const emit = defineEmits(['updateAvailable', 'availabilityChanged']);
 
 const checkNewVersion = ref(false);
+const loading = ref(false);
+const connectionAvailable = ref(null);
 
 const props = defineProps({
   devLink: { type: Object },
 });
 
 const remote = () => {
+  loading.value = true;
   ProcessMaker.apiClient
     .get(`/devlink/${props.devLink.dev_link_id}/remote-version/${props.devLink.remote_id}`)
     .then((response) => {
+      if (response.data.available === false) {
+        connectionAvailable.value = false;
+        checkNewVersion.value = false;
+        emit('updateAvailable', false);
+        emit('availabilityChanged', false);
+        return;
+      }
+
+      connectionAvailable.value = true;
+      emit('availabilityChanged', true);
       if (Number(response.data.version) > Number(props.devLink.version)) {
         checkNewVersion.value = true;
         emit('updateAvailable', true);
       } else {
+        checkNewVersion.value = false;
         emit('updateAvailable', false);
       }
+    })
+    .catch(() => {
+      connectionAvailable.value = false;
+      checkNewVersion.value = false;
+      emit('updateAvailable', false);
+      emit('availabilityChanged', false);
+    })
+    .finally(() => {
+      loading.value = false;
     });
 };
 
@@ -35,10 +56,16 @@ onMounted(() => {
 
 <template>
   <span
-    v-if="checkNewVersion"
+    v-if="!loading && connectionAvailable === false"
+    class="badge badge-unavailable"
+  >
+    {{ $t('Connection unavailable') }}
+  </span>
+  <span
+    v-else-if="!loading && checkNewVersion"
     class="badge badge-update"
   >
-    Update Available
+    {{ $t('Update Available') }}
   </span>
 </template>
 
@@ -51,4 +78,13 @@ onMounted(() => {
     border-radius: 6px;
     height: 24px;
 }
+
+.badge-unavailable {
+    background-color: #F3F5F7;
+    color: #596372;
+    font-size: 14px;
+    font-weight: 500;
+    border-radius: 6px;
+    height: 24px;
+}
 </style>
diff --git a/resources/js/admin/devlink/components/platformConfigurations.js b/resources/js/admin/devlink/components/platformConfigurations.js
index 85ad3d3cf8..cb44be16f0 100644
--- a/resources/js/admin/devlink/components/platformConfigurations.js
+++ b/resources/js/admin/devlink/components/platformConfigurations.js
@@ -10,10 +10,12 @@ export default [
   {
     type: "ui_dashboards",
     name: "Dashboards",
+    configurable: true,
   },
   {
     type: "ui_menus",
     name: "Menus",
+    configurable: true,
   },
   {
     type: "script_executors",
@@ -23,4 +25,4 @@ export default [
     type: "public_files",
     name: "Public Files",
   },
-];
\ No newline at end of file
+];
diff --git a/resources/lang/en.json b/resources/lang/en.json
index f5747fc4d6..c80d4cc1b8 100644
--- a/resources/lang/en.json
+++ b/resources/lang/en.json
@@ -457,6 +457,7 @@
   "Congratulations": "Congratulations",
   "Connecting Driver": "Connecting Driver",
   "Connection Type": "Connection Type",
+  "Connection unavailable": "Connection unavailable",
   "Contact Information": "Contact Information",
   "Contact your administrator for more information": "Contact your administrator for more information",
   "Contains a number or symbol": "Contains a number or symbol",
@@ -2251,6 +2252,7 @@
   "The image was deleted": "The image was deleted",
   "The inbox rule '{{name}}' was created.": "The inbox rule '{{name}}' was created.",
   "The inbox rule '{{name}}' was updated.": "The inbox rule '{{name}}' was updated.",
+  "The instance URL must contain only an HTTP or HTTPS origin.": "The instance URL must contain only an HTTP or HTTPS origin.",
   "The Input Data field is required": "The Input Data field is required",
   "The label describes the button's text": "The label describes the button's text",
   "The label describes the field's name": "The label describes the field's name",
@@ -2364,6 +2366,7 @@
   "This field accepts mustache syntax": "This field accepts mustache syntax",
   "This field is required!": "This field is required!",
   "This file is password protected. Enter the password below to continue with the import.": "This file is password protected. Enter the password below to continue with the import.",
+  "This instance is already linked as :name. Open or reconnect the existing connection.": "This instance is already linked as :name. Open or reconnect the existing connection.",
   "This is a Beta version and when using Quickfill, it may replace the pre-filled information in the form.": "This is a Beta version and when using Quickfill, it may replace the pre-filled information in the form.",
   "This is an AI feature and can provide inaccurate or biased responses.": "This is an AI feature and can provide inaccurate or biased responses.",
   "This is the only time you will be able to view the client secret. Keep it in a safe place.": "This is the only time you will be able to view the client secret. Keep it in a safe place.",
@@ -2444,6 +2447,7 @@
   "Type to search": "Type to search",
   "Type value": "Type value",
   "Type": "Type",
+  "Unable to create the linked instance.": "Unable to create the linked instance.",
   "Unable to import the process.": "Unable to import the process.",
   "Unable to import": "Unable to import",
   "Unable to save: Verify your internet connection.": "Unable to save: Verify your internet connection.",
diff --git a/routes/api.php b/routes/api.php
index b3e7891063..9cc716d4d4 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -423,6 +423,10 @@
         Route::get('devlink/local-bundles', [DevLinkController::class, 'localBundles'])->name('devlink.local-bundles');
         Route::get('devlink/local-bundles/{bundle}', [DevLinkController::class, 'showBundle'])->name('devlink.local-bundle');
         Route::get('devlink/local-bundles/{bundle}/setting/{settingKey}', [DevLinkController::class, 'getBundleSetting'])->name('devlink.local-bundle-setting');
+        Route::get(
+            'devlink/local-bundles/{bundle}/setting-preview/{settingKey}',
+            [DevLinkController::class, 'getBundleSettingPreview']
+        )->name('devlink.local-bundle-setting-preview');
         Route::get('devlink/local-bundles/all-settings/{settingKey}', [DevLinkController::class, 'getBundleAllSettings'])->name('devlink.local-bundle-all-settings');
         Route::post('devlink/local-bundles/setting/refresh-ui', [DevLinkController::class, 'refreshUi'])->name('devlink.local-bundle-setting-refresh-ui');
         Route::post('devlink/local-bundles', [DevLinkController::class, 'createBundle'])->name('devlink.create-bundle');
diff --git a/tests/Feature/Api/DevLinkTest.php b/tests/Feature/Api/DevLinkTest.php
index 9bed587b88..f0a0af7b0e 100644
--- a/tests/Feature/Api/DevLinkTest.php
+++ b/tests/Feature/Api/DevLinkTest.php
@@ -2,11 +2,16 @@
 
 namespace Tests\Feature\Api;
 
+use Illuminate\Http\Client\ConnectionException;
 use Illuminate\Support\Facades\Http;
+use Illuminate\Support\Facades\Storage;
+use PHPUnit\Framework\Attributes\DataProvider;
 use ProcessMaker\Http\Controllers\Api\DevLinkController;
 use ProcessMaker\Models\Bundle;
 use ProcessMaker\Models\DevLink;
 use ProcessMaker\Models\Screen;
+use ProcessMaker\Package\PackageDynamicUI\Models\Dashboard;
+use ProcessMaker\Package\PackageDynamicUI\Models\Menu;
 use Tests\Feature\Shared\RequestHelper;
 use Tests\TestCase;
 
@@ -14,6 +19,235 @@ class DevLinkTest extends TestCase
 {
     use RequestHelper;
 
+    private const REMOTE_QA_NAME = 'Remote QA';
+
+    private const REMOTE_INSTANCE_URL = 'https://remote-instance.test';
+
+    private const EXISTING_LINK_NAME = 'Existing Link';
+
+    private const FIRST_LINK_NAME = 'First Link';
+
+    private const SECOND_LINK_NAME = 'Second Link';
+
+    private const FIRST_INSTANCE_URL = 'https://first-instance.test';
+
+    private const SECOND_INSTANCE_URL = 'https://second-instance.test';
+
+    public function testStoreCreatesADevLinkWithANormalizedUrl()
+    {
+        $response = $this->apiCall('POST', route('api.devlink.store'), [
+            'name' => self::REMOTE_QA_NAME,
+            'url' => ' https://REMOTE-INSTANCE.test:443/ ',
+        ]);
+
+        $response->assertCreated()->assertJson([
+            'name' => self::REMOTE_QA_NAME,
+            'url' => self::REMOTE_INSTANCE_URL,
+        ]);
+        $this->assertDatabaseHas('dev_links', [
+            'name' => self::REMOTE_QA_NAME,
+            'url' => self::REMOTE_INSTANCE_URL,
+        ]);
+    }
+
+    #[DataProvider('duplicateUrlProvider')]
+    public function testStoreRejectsNormalizedDuplicateUrls(string $storedUrl, string $duplicateUrl)
+    {
+        DevLink::factory()->create([
+            'name' => self::EXISTING_LINK_NAME,
+            'url' => $storedUrl,
+        ]);
+
+        $response = $this->apiCall('POST', route('api.devlink.store'), [
+            'name' => 'Duplicate Link',
+            'url' => $duplicateUrl,
+        ]);
+
+        $response->assertUnprocessable()->assertJsonPath(
+            'errors.url.0',
+            'This instance is already linked as Existing Link. Open or reconnect the existing connection.'
+        );
+        $this->assertDatabaseCount('dev_links', 1);
+    }
+
+    public static function duplicateUrlProvider(): array
+    {
+        return [
+            'host case and trailing slash' => [
+                self::REMOTE_INSTANCE_URL,
+                'https://REMOTE-INSTANCE.test/',
+            ],
+            'default HTTPS port' => [
+                self::REMOTE_INSTANCE_URL,
+                'https://remote-instance.test:443',
+            ],
+            'default HTTP port' => [
+                'http://remote-instance.test',
+                'http://remote-instance.test:80/',
+            ],
+        ];
+    }
+
+    #[DataProvider('nonOriginUrlProvider')]
+    public function testStoreRejectsUrlsThatAreNotHttpOrigins(string $url)
+    {
+        $response = $this->apiCall('POST', route('api.devlink.store'), [
+            'name' => self::REMOTE_QA_NAME,
+            'url' => $url,
+        ]);
+
+        $response->assertUnprocessable()->assertJsonValidationErrors('url');
+        $this->assertDatabaseCount('dev_links', 0);
+    }
+
+    public static function nonOriginUrlProvider(): array
+    {
+        return [
+            'path' => [self::REMOTE_INSTANCE_URL . '/api'],
+            'query' => [self::REMOTE_INSTANCE_URL . '?x=1'],
+            'fragment' => [self::REMOTE_INSTANCE_URL . '#section'],
+            'username' => ['https://user@remote-instance.test'],
+            'username and password' => ['https://user:password@remote-instance.test'],
+        ];
+    }
+
+    public function testStoreRejectsAnExistingNameWithoutUpdatingItsUrl()
+    {
+        $devLink = DevLink::factory()->create([
+            'name' => self::EXISTING_LINK_NAME,
+            'url' => self::FIRST_INSTANCE_URL,
+        ]);
+
+        $response = $this->apiCall('POST', route('api.devlink.store'), [
+            'name' => self::EXISTING_LINK_NAME,
+            'url' => self::SECOND_INSTANCE_URL,
+        ]);
+
+        $response->assertUnprocessable()->assertJsonValidationErrors('name');
+        $this->assertSame(self::FIRST_INSTANCE_URL, $devLink->fresh()->url);
+        $this->assertDatabaseMissing('dev_links', ['url' => self::SECOND_INSTANCE_URL]);
+    }
+
+    public function testStoreAllowsDifferentNormalizedUrls()
+    {
+        DevLink::factory()->create([
+            'name' => self::FIRST_LINK_NAME,
+            'url' => self::FIRST_INSTANCE_URL,
+        ]);
+
+        $response = $this->apiCall('POST', route('api.devlink.store'), [
+            'name' => self::SECOND_LINK_NAME,
+            'url' => self::SECOND_INSTANCE_URL,
+        ]);
+
+        $response->assertCreated();
+        $this->assertDatabaseCount('dev_links', 2);
+    }
+
+    public function testUpdateRejectsANameUsedByAnotherDevLink()
+    {
+        DevLink::factory()->create([
+            'name' => self::FIRST_LINK_NAME,
+            'url' => self::FIRST_INSTANCE_URL,
+        ]);
+        $secondDevLink = DevLink::factory()->create([
+            'name' => self::SECOND_LINK_NAME,
+            'url' => self::SECOND_INSTANCE_URL,
+        ]);
+
+        $response = $this->apiCall('PUT', route('api.devlink.update', [
+            'devLink' => $secondDevLink->id,
+        ]), [
+            'name' => self::FIRST_LINK_NAME,
+        ]);
+
+        $response->assertUnprocessable()->assertJsonValidationErrors('name');
+        $this->assertSame(self::SECOND_LINK_NAME, $secondDevLink->fresh()->name);
+    }
+
+    public function testRemoteBundleVersionReportsAnAvailableRemoteBundle()
+    {
+        Http::preventStrayRequests();
+        $devLink = DevLink::factory()->create([
+            'url' => self::REMOTE_INSTANCE_URL,
+            'access_token' => 'valid-token',
+        ]);
+        Http::fake([
+            'https://remote-instance.test/api/1.0/devlink/local-bundles/123' => Http::response([
+                'id' => 123,
+                'name' => 'Remote Bundle',
+                'version' => '4',
+            ]),
+        ]);
+
+        $response = $this->apiCall('GET', route('api.devlink.remote-version', [
+            'devLink' => $devLink->id,
+            'bundle' => 123,
+        ]));
+
+        $response->assertOk()->assertJson([
+            'id' => 123,
+            'name' => 'Remote Bundle',
+            'version' => '4',
+            'available' => true,
+        ]);
+    }
+
+    #[DataProvider('unavailableRemoteStatusProvider')]
+    public function testRemoteBundleVersionHandlesRemoteHttpErrors(int $status)
+    {
+        Http::preventStrayRequests();
+        $devLink = DevLink::factory()->create([
+            'url' => self::REMOTE_INSTANCE_URL,
+            'access_token' => 'revoked-token',
+        ]);
+        Http::fake([
+            'https://remote-instance.test/api/1.0/devlink/local-bundles/123' => Http::response([], $status),
+        ]);
+
+        $response = $this->apiCall('GET', route('api.devlink.remote-version', [
+            'devLink' => $devLink->id,
+            'bundle' => 123,
+        ]));
+
+        $response->assertOk()->assertExactJson([
+            'available' => false,
+            'version' => null,
+        ]);
+    }
+
+    public static function unavailableRemoteStatusProvider(): array
+    {
+        return [
+            'unauthorized' => [401],
+            'forbidden' => [403],
+            'missing bundle' => [404],
+            'remote server error' => [500],
+        ];
+    }
+
+    public function testRemoteBundleVersionHandlesConnectionErrors()
+    {
+        Http::preventStrayRequests();
+        $devLink = DevLink::factory()->create([
+            'url' => self::REMOTE_INSTANCE_URL,
+            'access_token' => 'unreachable-token',
+        ]);
+        Http::fake(function () {
+            throw new ConnectionException('Unable to connect to remote instance.');
+        });
+
+        $response = $this->apiCall('GET', route('api.devlink.remote-version', [
+            'devLink' => $devLink->id,
+            'bundle' => 123,
+        ]));
+
+        $response->assertOk()->assertExactJson([
+            'available' => false,
+            'version' => null,
+        ]);
+    }
+
     public function testShowBundle()
     {
         $bundle = Bundle::factory()->create();
@@ -23,6 +257,162 @@ public function testShowBundle()
         $this->assertEquals($bundle->id, $response->json()['id']);
     }
 
+    public function testGetBundleAllSettingsReturnsDashboardAndMenuOptions()
+    {
+        if (!hasPackage('package-dynamic-ui')) {
+            $this->markTestSkipped('package-dynamic-ui is not installed');
+        }
+
+        $dashboardZeta = Dashboard::factory()->create(['title' => 'ZZ DevLink Dashboard']);
+        $dashboardAlpha = Dashboard::factory()->create(['title' => 'AA DevLink Dashboard']);
+        $menuZeta = Menu::factory()->create(['name' => 'ZZ DevLink Menu']);
+        $menuAlpha = Menu::factory()->create(['name' => 'AA DevLink Menu']);
+
+        $dashboardResponse = $this->apiCall(
+            'GET',
+            route('api.devlink.local-bundle-all-settings', ['settingKey' => 'ui_dashboards'])
+        );
+        $dashboardResponse->assertOk();
+
+        $dashboardOptions = collect($dashboardResponse->json())
+            ->whereIn('key', [$dashboardAlpha->id, $dashboardZeta->id])
+            ->values()
+            ->all();
+        $this->assertSame([
+            ['key' => $dashboardAlpha->id, 'name' => $dashboardAlpha->title],
+            ['key' => $dashboardZeta->id, 'name' => $dashboardZeta->title],
+        ], $dashboardOptions);
+
+        $menuResponse = $this->apiCall(
+            'GET',
+            route('api.devlink.local-bundle-all-settings', ['settingKey' => 'ui_menus'])
+        );
+        $menuResponse->assertOk();
+
+        $menuOptions = collect($menuResponse->json())
+            ->whereIn('key', [$menuAlpha->id, $menuZeta->id])
+            ->values()
+            ->all();
+        $this->assertSame([
+            ['key' => $menuAlpha->id, 'name' => $menuAlpha->name],
+            ['key' => $menuZeta->id, 'name' => $menuZeta->name],
+        ], $menuOptions);
+    }
+
+    public function testGetBundleSettingPreviewReturnsInstalledSourceMetadata()
+    {
+        Storage::fake(config('media-library.disk_name'));
+
+        $bundle = Bundle::factory()->create(['version' => 1]);
+        $bundle->addSettings('ui_dashboards', json_encode(['id' => [9001, 9002]]));
+        $bundle->savePayloadsToFile([], [[
+            [
+                'type' => 'dashboard_package',
+                'version' => '2',
+                'root' => 'dashboard-zulu',
+                'name' => 'Zulu Dashboard',
+                'export' => [],
+            ],
+            [
+                'type' => 'dashboard_package',
+                'version' => '2',
+                'root' => 'dashboard-alpha',
+                'name' => 'Alpha Dashboard',
+                'export' => [],
+            ],
+        ]]);
+
+        $response = $this->apiCall(
+            'GET',
+            route('api.devlink.local-bundle-setting-preview', [
+                'bundle' => $bundle->id,
+                'settingKey' => 'ui_dashboards',
+            ])
+        );
+
+        $response->assertOk()->assertExactJson([
+            'setting' => 'ui_dashboards',
+            'selection' => 'partial',
+            'available' => true,
+            'items' => [
+                ['key' => 'dashboard-alpha', 'name' => 'Alpha Dashboard'],
+                ['key' => 'dashboard-zulu', 'name' => 'Zulu Dashboard'],
+            ],
+        ]);
+
+        $bundleWithoutSnapshot = Bundle::factory()->create();
+        $bundleWithoutSnapshot->addSettings('ui_menus', null);
+        $unavailableResponse = $this->apiCall(
+            'GET',
+            route('api.devlink.local-bundle-setting-preview', [
+                'bundle' => $bundleWithoutSnapshot->id,
+                'settingKey' => 'ui_menus',
+            ])
+        );
+        $unavailableResponse->assertOk()->assertJson([
+            'selection' => 'all',
+            'available' => false,
+            'items' => [],
+        ]);
+
+        $unsupportedResponse = $this->apiCall(
+            'GET',
+            route('api.devlink.local-bundle-setting-preview', [
+                'bundle' => $bundle->id,
+                'settingKey' => 'users',
+            ])
+        );
+        $unsupportedResponse->assertNotFound();
+    }
+
+    #[DataProvider('selectableUiSettingsProvider')]
+    public function testAddSettingsPersistsPartialAllAndEmptySelections(string $settingKey)
+    {
+        $bundle = Bundle::factory()->create();
+        $url = route('api.devlink.add-settings', ['bundle' => $bundle->id]);
+
+        $partialSelection = [41, 42];
+        $response = $this->apiCall('POST', $url, [
+            'setting' => $settingKey,
+            'config' => json_encode(['id' => $partialSelection]),
+            'type' => null,
+            'replaceIds' => true,
+        ]);
+        $response->assertOk();
+
+        $bundleSetting = $bundle->settings()->where('setting', $settingKey)->firstOrFail();
+        $this->assertSame($partialSelection, json_decode($bundleSetting->config, true)['id']);
+
+        $response = $this->apiCall('POST', $url, [
+            'setting' => $settingKey,
+            'config' => null,
+            'type' => null,
+            'replaceIds' => true,
+        ]);
+        $response->assertOk();
+        $this->assertNull($bundleSetting->refresh()->config);
+
+        $response = $this->apiCall('POST', $url, [
+            'setting' => $settingKey,
+            'config' => json_encode(['id' => []]),
+            'type' => null,
+            'replaceIds' => true,
+        ]);
+        $response->assertOk();
+        $this->assertDatabaseMissing('bundle_settings', [
+            'bundle_id' => $bundle->id,
+            'setting' => $settingKey,
+        ]);
+    }
+
+    public static function selectableUiSettingsProvider(): array
+    {
+        return [
+            'Dashboards' => ['ui_dashboards'],
+            'Menus' => ['ui_menus'],
+        ];
+    }
+
     public function testAddAssets()
     {
         $screen1 = Screen::factory()->create();
@@ -47,7 +437,7 @@ public function testInstallRemoteAsset()
     {
         $screen = Screen::factory()->create();
         $devLink = DevLink::factory()->create([
-            'url' => 'https://remote-instance.test',
+            'url' => self::REMOTE_INSTANCE_URL,
         ]);
 
         Http::fake([
diff --git a/tests/Feature/ImportExport/OptionsTest.php b/tests/Feature/ImportExport/OptionsTest.php
new file mode 100644
index 0000000000..e5615ec4d8
--- /dev/null
+++ b/tests/Feature/ImportExport/OptionsTest.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Tests\Feature\ImportExport;
+
+use ProcessMaker\ImportExport\Options;
+use Tests\TestCase;
+
+class OptionsTest extends TestCase
+{
+    public function testImportingUserIdIsOptionalImportContext()
+    {
+        $this->assertNull((new Options([]))->importingUserId);
+        $this->assertSame(123, (new Options([], 123))->importingUserId);
+    }
+}
diff --git a/tests/Model/BundleTest.php b/tests/Model/BundleTest.php
index cd0b31ff3f..d0bee366ee 100644
--- a/tests/Model/BundleTest.php
+++ b/tests/Model/BundleTest.php
@@ -2,10 +2,14 @@
 
 namespace Tests\Model;
 
+use Illuminate\Support\Facades\Storage;
+use ProcessMaker\ImportExport\Exporters\ScreenExporter;
+use ProcessMaker\ImportExport\Logger;
 use ProcessMaker\Models\Bundle;
 use ProcessMaker\Models\BundleAsset;
 use ProcessMaker\Models\Process;
 use ProcessMaker\Models\Screen;
+use ProcessMaker\Models\User;
 use Tests\Feature\ImportExport\HelperTrait;
 use Tests\TestCase;
 
@@ -76,6 +80,11 @@ public function testReinstallBundle()
         $bundle = Bundle::factory()->create();
         $bundle->install($payloads, 'update');
         $bundle->savePayloadsToFile($payloads, [0 => []], null);
+        $media = $bundle->newestVersionFile();
+        $media->forgetCustomProperty('settings_payloads_complete');
+        $media->save();
+
+        $this->assertNull($media->refresh()->getCustomProperty('settings_payloads_complete'));
 
         $screen = Screen::where('uuid', $screenUuid)->firstOrFail();
         $screen->title = 'New Screen Name';
@@ -85,4 +94,281 @@ public function testReinstallBundle()
         $bundle->reinstall('update');
         $this->assertEquals('Original Screen Name', $screen->refresh()->title);
     }
+
+    public function testReinstallUsesNewestSnapshotWhenVersionsMatch()
+    {
+        Storage::fake(config('media-library.disk_name'));
+
+        $screen = Screen::factory()->create(['title' => 'First Snapshot']);
+        $screenUuid = $screen->uuid;
+        $remoteBundle = Bundle::factory()->create(['version' => 1]);
+        $remoteBundle->syncAssets([$screen]);
+        $firstPayloads = $remoteBundle->export();
+
+        $screen->title = 'Second Snapshot';
+        $screen->save();
+        $remoteBundle = $remoteBundle->fresh();
+        $secondPayloads = $remoteBundle->export();
+
+        $remoteBundle->delete();
+        $screen->delete();
+
+        $localBundle = Bundle::factory()->create(['version' => 1]);
+        $localBundle->install($firstPayloads, 'update');
+        $localBundle->savePayloadsToFile($firstPayloads, []);
+
+        $localBundle = $localBundle->fresh();
+        $localBundle->savePayloadsToFile($secondPayloads, []);
+
+        $screen = Screen::where('uuid', $screenUuid)->firstOrFail();
+        $screen->title = 'Local Change';
+        $screen->save();
+
+        $localBundle->reinstall('update');
+
+        $this->assertSame('Second Snapshot', $screen->refresh()->title);
+    }
+
+    public function testReinstallPassesImportingUserIdToExporter()
+    {
+        $screen = Screen::factory()->create();
+        $screenUuid = $screen->uuid;
+        $remoteBundle = Bundle::factory()->create();
+        $remoteBundle->syncAssets([$screen]);
+        $payloads = $remoteBundle->export();
+        $payloads[0]['export'][$screenUuid]['exporter'] = ReinstallContextScreenExporter::class;
+
+        $remoteBundle->delete();
+        $screen->delete();
+
+        $localBundle = Bundle::factory()->create();
+        $localBundle->install($payloads, 'update');
+        $localBundle->savePayloadsToFile($payloads, [0 => []], null);
+
+        $importingUser = User::factory()->create();
+        ReinstallContextScreenExporter::$receivedImportingUserId = null;
+
+        $localBundle->reinstall('update', new Logger($importingUser->id));
+
+        $this->assertSame(
+            $importingUser->id,
+            ReinstallContextScreenExporter::$receivedImportingUserId
+        );
+    }
+
+    public function testSettingPreviewUsesInstalledPayloadMetadata()
+    {
+        Storage::fake(config('media-library.disk_name'));
+
+        $bundle = Bundle::factory()->create(['version' => 1]);
+        $bundle->addSettings('ui_dashboards', json_encode(['id' => [9001, 9002]]));
+        $bundle->addSettings('ui_menus', null);
+        $bundle->savePayloadsToFile([], [[
+            self::settingPayload('dashboard_package', 'dashboard-zulu', 'Zulu Dashboard'),
+            self::settingPayload('menu_package', 'menu-bravo', 'Bravo Menu'),
+            self::settingPayload('dashboard_package', 'dashboard-alpha', 'Alpha Dashboard'),
+            self::settingPayload('menu_package', 'menu-alpha', 'Alpha Menu'),
+        ]]);
+
+        $this->assertTrue($bundle->newestVersionFile()->getCustomProperty('settings_payloads_complete'));
+
+        $this->assertSame([
+            'setting' => 'ui_dashboards',
+            'selection' => 'partial',
+            'available' => true,
+            'items' => [
+                ['key' => 'dashboard-alpha', 'name' => 'Alpha Dashboard'],
+                ['key' => 'dashboard-zulu', 'name' => 'Zulu Dashboard'],
+            ],
+        ], $bundle->settingPreview('ui_dashboards'));
+
+        $this->assertSame([
+            'setting' => 'ui_menus',
+            'selection' => 'all',
+            'available' => true,
+            'items' => [
+                ['key' => 'menu-alpha', 'name' => 'Alpha Menu'],
+                ['key' => 'menu-bravo', 'name' => 'Bravo Menu'],
+            ],
+        ], $bundle->settingPreview('ui_menus'));
+    }
+
+    public function testSettingPreviewReturnsNoneWhenSettingIsNotShared()
+    {
+        $bundle = Bundle::factory()->create();
+
+        $this->assertSame([
+            'setting' => 'ui_dashboards',
+            'selection' => 'none',
+            'available' => true,
+            'items' => [],
+        ], $bundle->settingPreview('ui_dashboards'));
+    }
+
+    public function testSettingPreviewIsUnavailableForUnmarkedLegacySnapshot()
+    {
+        Storage::fake(config('media-library.disk_name'));
+
+        $bundle = Bundle::factory()->create(['version' => 1]);
+        $bundle->addSettings('ui_dashboards', null);
+        $bundle->addSettings('ui_menus', json_encode(['id' => [9001]]));
+        $bundle->addMediaFromString(gzencode(json_encode([
+            self::settingPayload('dashboard_package', 'dashboard-alpha', 'Alpha Dashboard'),
+            self::settingPayload('menu_package', 'menu-alpha', 'Alpha Menu'),
+        ])))
+            ->usingFileName('payloads.json.gz')
+            ->withCustomProperties(['version' => $bundle->version])
+            ->toMediaCollection();
+
+        $this->assertSame([
+            'setting' => 'ui_dashboards',
+            'selection' => 'all',
+            'available' => false,
+            'items' => [],
+        ], $bundle->settingPreview('ui_dashboards'));
+
+        $this->assertSame([
+            'setting' => 'ui_menus',
+            'selection' => 'partial',
+            'available' => false,
+            'items' => [],
+        ], $bundle->settingPreview('ui_menus'));
+    }
+
+    public function testSettingPreviewUsesNewestCompleteSnapshotForSameVersion()
+    {
+        Storage::fake(config('media-library.disk_name'));
+
+        $bundle = Bundle::factory()->create(['version' => 1]);
+        $bundle->addSettings('ui_dashboards', null);
+        $legacyMedia = $bundle->addMediaFromString(gzencode(json_encode([
+            self::settingPayload('dashboard_package', 'dashboard-legacy', 'Legacy Dashboard'),
+        ])))
+            ->usingFileName('payloads.json.gz')
+            ->withCustomProperties(['version' => $bundle->version])
+            ->toMediaCollection();
+
+        $bundle->savePayloadsToFile([
+            self::settingPayload('dashboard_package', 'dashboard-current', 'Current Dashboard'),
+        ], []);
+
+        $completeMedia = $bundle->fresh()->getMedia()->sortByDesc('id')->first();
+
+        $this->assertGreaterThan($legacyMedia->id, $completeMedia->id);
+        $this->assertSame($completeMedia->id, $bundle->fresh()->newestVersionFile()->id);
+        $this->assertSame([
+            'setting' => 'ui_dashboards',
+            'selection' => 'all',
+            'available' => true,
+            'items' => [
+                ['key' => 'dashboard-current', 'name' => 'Current Dashboard'],
+            ],
+        ], $bundle->fresh()->settingPreview('ui_dashboards'));
+    }
+
+    public function testSavingPayloadsKeepsNewestThreeSnapshotsForSameVersion()
+    {
+        Storage::fake(config('media-library.disk_name'));
+
+        $bundle = Bundle::factory()->create(['version' => 1]);
+        $createdMediaIds = [];
+
+        for ($snapshot = 1; $snapshot <= 5; $snapshot++) {
+            $bundle = $bundle->fresh();
+            $bundle->savePayloadsToFile([
+                self::settingPayload(
+                    'dashboard_package',
+                    "dashboard-$snapshot",
+                    "Dashboard $snapshot"
+                ),
+            ], []);
+            $createdMediaIds[] = $bundle->fresh()->getMedia()->max('id');
+        }
+
+        $bundle = $bundle->fresh();
+        $expectedMediaIds = array_reverse(array_slice($createdMediaIds, -3));
+
+        $this->assertCount(3, $bundle->getMedia());
+        $this->assertSame($expectedMediaIds, $bundle->filesSortedByVersion()->pluck('id')->all());
+        $this->assertSame($expectedMediaIds[0], $bundle->newestVersionFile()->id);
+    }
+
+    public function testSettingPreviewReturnsAvailableEmptyListForCompleteSnapshot()
+    {
+        Storage::fake(config('media-library.disk_name'));
+
+        $bundle = Bundle::factory()->create(['version' => 1]);
+        $bundle->addSettings('ui_dashboards', null);
+        $bundle->addSettings('ui_menus', null);
+        $bundle->savePayloadsToFile([], []);
+
+        $this->assertSame([
+            'setting' => 'ui_dashboards',
+            'selection' => 'all',
+            'available' => true,
+            'items' => [],
+        ], $bundle->settingPreview('ui_dashboards'));
+
+        $this->assertSame([
+            'setting' => 'ui_menus',
+            'selection' => 'all',
+            'available' => true,
+            'items' => [],
+        ], $bundle->settingPreview('ui_menus'));
+    }
+
+    public function testSettingPreviewIsUnavailableWithoutAValidSnapshot()
+    {
+        Storage::fake(config('media-library.disk_name'));
+
+        $bundleWithoutSnapshot = Bundle::factory()->create();
+        $bundleWithoutSnapshot->addSettings('ui_dashboards', null);
+
+        $this->assertSame([
+            'setting' => 'ui_dashboards',
+            'selection' => 'all',
+            'available' => false,
+            'items' => [],
+        ], $bundleWithoutSnapshot->settingPreview('ui_dashboards'));
+
+        $bundleWithInvalidSnapshot = Bundle::factory()->create(['version' => 1]);
+        $bundleWithInvalidSnapshot->addSettings('ui_menus', json_encode(['id' => [9001]]));
+        $bundleWithInvalidSnapshot->addMediaFromString(gzencode('{invalid json'))
+            ->usingFileName('payloads.json.gz')
+            ->withCustomProperties([
+                'version' => $bundleWithInvalidSnapshot->version,
+                'settings_payloads_complete' => true,
+            ])
+            ->toMediaCollection();
+
+        $this->assertSame([
+            'setting' => 'ui_menus',
+            'selection' => 'partial',
+            'available' => false,
+            'items' => [],
+        ], $bundleWithInvalidSnapshot->settingPreview('ui_menus'));
+    }
+
+    private static function settingPayload(string $type, string $key, string $name): array
+    {
+        return [
+            'type' => $type,
+            'version' => '2',
+            'root' => $key,
+            'name' => $name,
+            'export' => [],
+        ];
+    }
+}
+
+class ReinstallContextScreenExporter extends ScreenExporter
+{
+    public static ?int $receivedImportingUserId = null;
+
+    public function import(): bool
+    {
+        self::$receivedImportingUserId = $this->options->importingUserId;
+
+        return parent::import();
+    }
 }
diff --git a/tests/Model/DevLinkTest.php b/tests/Model/DevLinkTest.php
index 4fdd994baa..dc6ca7e332 100644
--- a/tests/Model/DevLinkTest.php
+++ b/tests/Model/DevLinkTest.php
@@ -8,14 +8,25 @@
 use ProcessMaker\Models\DevLink;
 use ProcessMaker\Models\Screen;
 use ProcessMaker\Models\User;
+use ProcessMaker\Package\PackageDynamicUI\Models\Menu;
 use Tests\TestCase;
 
 class DevLinkTest extends TestCase
 {
+    private const REMOTE_INSTANCE_URL = 'https://remote-instance.test';
+
+    private const TEST_BUNDLE_NAME = 'Test Bundle';
+
+    private const TEST_BUNDLE_DESCRIPTION = 'Test Bundle Description';
+
+    private const FIRST_MENU_DESCRIPTION = 'First menu description';
+
+    private const SECOND_MENU_DESCRIPTION = 'Second menu description';
+
     public function testGetClientUrl()
     {
         $devLink = DevLink::factory()->create([
-            'url' => 'https://remote-instance.test',
+            'url' => self::REMOTE_INSTANCE_URL,
         ]);
 
         $expectedQueryString = http_build_query([
@@ -24,7 +35,7 @@ public function testGetClientUrl()
         ]);
 
         $this->assertEquals(
-            'https://remote-instance.test/admin/devlink/oauth-client?' . $expectedQueryString,
+            self::REMOTE_INSTANCE_URL . '/admin/devlink/oauth-client?' . $expectedQueryString,
             $devLink->getClientUrl()
         );
     }
@@ -32,7 +43,7 @@ public function testGetClientUrl()
     public function testGetOauthRedirectUrl()
     {
         $devLink = DevLink::factory()->create([
-            'url' => 'https://remote-instance.test',
+            'url' => self::REMOTE_INSTANCE_URL,
             'client_id' => 123,
         ]);
 
@@ -75,35 +86,29 @@ public function testInstallRemoteBundle()
         $bundle->delete();
 
         Http::fake([
-            'http://remote-instance.test/api/1.0/devlink/local-bundles/123' => Http::response([
-                'id' => 123,
-                'name' => 'Test Bundle',
-                'published' => true,
-                'version' => '5',
-                'description' => 'Test Bundle Description',
-            ]),
-            'http://remote-instance.test/api/1.0/devlink/export-local-bundle/123' => Http::response([
+            self::remoteApiUrl('local-bundles/123') => Http::response(self::remoteBundleResponse('5')),
+            self::remoteApiUrl('export-local-bundle/123') => Http::response([
                 'payloads' => $exports,
             ]),
-            'http://remote-instance.test/api/1.0/devlink/export-local-bundle/123/settings' => Http::response([
+            self::remoteApiUrl('export-local-bundle/123/settings') => Http::response([
                 'settings' => [[
                     'setting' => 'users',
                     'config' => null,
                 ]],
             ]),
-            'http://remote-instance.test/api/1.0/devlink/export-local-bundle/123/settings-payloads' => Http::response([
+            self::remoteApiUrl('export-local-bundle/123/settings-payloads') => Http::response([
                 'payloads' => $exportsSettingsPayloads,
             ]),
-            'http://remote-instance.test/api/1.0/devlink/local-bundles/123/add-bundle-instance' => Http::response([], 200),
+            self::remoteApiUrl('local-bundles/123/add-bundle-instance') => Http::response([], 200),
         ]);
 
         $devLink = DevLink::factory()->create([
-            'url' => 'http://remote-instance.test',
+            'url' => self::REMOTE_INSTANCE_URL,
         ]);
         $devLink->installRemoteBundle(123, 'update');
 
         $bundle = Bundle::where('remote_id', 123)->first();
-        $this->assertEquals('Test Bundle', $bundle->name);
+        $this->assertEquals(self::TEST_BUNDLE_NAME, $bundle->name);
         $this->assertEquals('5', $bundle->version);
 
         $this->assertCount(2, $bundle->assets);
@@ -118,12 +123,134 @@ public function testInstallRemoteBundle()
         $this->assertCount(3, $payloads);
     }
 
+    public function testInstallRemoteBundleImportsAndReinstallsEverySelectedMenu()
+    {
+        if (!hasPackage('package-dynamic-ui')) {
+            $this->markTestSkipped('package-dynamic-ui is not installed');
+        }
+
+        Storage::fake('local');
+
+        $firstMenu = Menu::factory()->create([
+            'name' => 'First DevLink Menu',
+            'description' => self::FIRST_MENU_DESCRIPTION,
+        ]);
+        $secondMenu = Menu::factory()->create([
+            'name' => 'Second DevLink Menu',
+            'description' => self::SECOND_MENU_DESCRIPTION,
+        ]);
+        $excludedMenu = Menu::factory()->create([
+            'name' => 'Excluded DevLink Menu',
+            'description' => 'Excluded menu description',
+        ]);
+
+        $sourceBundle = Bundle::factory()->create();
+        $sourceBundle->addSettings('ui_menus', null);
+
+        $allMenuRoots = array_column($sourceBundle->exportSettingPayloads()->toArray()[0], 'root');
+        $this->assertContains($firstMenu->uuid, $allMenuRoots);
+        $this->assertContains($secondMenu->uuid, $allMenuRoots);
+        $this->assertContains($excludedMenu->uuid, $allMenuRoots);
+
+        $sourceBundle->addSettings(
+            'ui_menus',
+            json_encode(['id' => [$firstMenu->id, $secondMenu->id]]),
+            null,
+            true
+        );
+
+        $settings = $sourceBundle->exportSettings();
+        $settingPayloads = $sourceBundle->exportSettingPayloads()->toArray();
+        $selectedMenuRoots = array_column($settingPayloads[0], 'root');
+
+        $this->assertEqualsCanonicalizing(
+            [$firstMenu->uuid, $secondMenu->uuid],
+            $selectedMenuRoots
+        );
+        $this->assertNotContains($excludedMenu->uuid, $selectedMenuRoots);
+
+        $firstMenuUuid = $firstMenu->uuid;
+        $secondMenuUuid = $secondMenu->uuid;
+        $excludedMenuUuid = $excludedMenu->uuid;
+        $firstMenu->delete();
+        $secondMenu->delete();
+        $sourceBundle->delete();
+
+        Http::fake([
+            self::remoteApiUrl('local-bundles/456') => Http::response([
+                'id' => 456,
+                'name' => 'Menus Bundle',
+                'published' => true,
+                'version' => '1',
+                'description' => 'Bundle with selected menus',
+            ]),
+            self::remoteApiUrl('export-local-bundle/456') => Http::response([
+                'payloads' => [],
+            ]),
+            self::remoteApiUrl('export-local-bundle/456/settings') => Http::response([
+                'settings' => $settings,
+            ]),
+            self::remoteApiUrl('export-local-bundle/456/settings-payloads') => Http::response([
+                'payloads' => $settingPayloads,
+            ]),
+            self::remoteApiUrl('local-bundles/456/add-bundle-instance') => Http::response([], 200),
+        ]);
+
+        $devLink = DevLink::factory()->create([
+            'url' => self::REMOTE_INSTANCE_URL,
+        ]);
+        $devLink->installRemoteBundle(456, 'update');
+
+        $importedFirstMenu = Menu::where('uuid', $firstMenuUuid)->firstOrFail();
+        $importedSecondMenu = Menu::where('uuid', $secondMenuUuid)->firstOrFail();
+        $this->assertSame(self::FIRST_MENU_DESCRIPTION, $importedFirstMenu->description);
+        $this->assertSame(self::SECOND_MENU_DESCRIPTION, $importedSecondMenu->description);
+        $this->assertSame(1, Menu::where('uuid', $excludedMenuUuid)->count());
+
+        $installedBundle = Bundle::where('remote_id', 456)->firstOrFail();
+        $installedMedia = $installedBundle->newestVersionFile();
+        $this->assertTrue($installedMedia->getCustomProperty('settings_payloads_complete'));
+        $this->assertSame([
+            'setting' => 'ui_menus',
+            'selection' => 'partial',
+            'available' => true,
+            'items' => [
+                ['key' => $firstMenuUuid, 'name' => 'First DevLink Menu'],
+                ['key' => $secondMenuUuid, 'name' => 'Second DevLink Menu'],
+            ],
+        ], $installedBundle->settingPreview('ui_menus'));
+
+        $savedPayloads = json_decode(
+            gzdecode(file_get_contents($installedMedia->getPath())),
+            true
+        );
+        $savedRoots = array_column($savedPayloads, 'root');
+        $this->assertEqualsCanonicalizing([$firstMenuUuid, $secondMenuUuid], $savedRoots);
+        $this->assertNotContains($excludedMenuUuid, $savedRoots);
+
+        $importedFirstMenu->update(['description' => 'Locally changed first menu']);
+        $importedSecondMenu->update(['description' => 'Locally changed second menu']);
+
+        $installedBundle->reinstall('update');
+
+        $this->assertSame(
+            self::FIRST_MENU_DESCRIPTION,
+            Menu::where('uuid', $firstMenuUuid)->firstOrFail()->description
+        );
+        $this->assertSame(
+            self::SECOND_MENU_DESCRIPTION,
+            Menu::where('uuid', $secondMenuUuid)->firstOrFail()->description
+        );
+        $this->assertSame(1, Menu::where('uuid', $firstMenuUuid)->count());
+        $this->assertSame(1, Menu::where('uuid', $secondMenuUuid)->count());
+    }
+
     public function testRemoteBundles()
     {
         Http::preventStrayRequests();
 
         $devLink = DevLink::factory()->create([
-            'url' => 'http://remote-instance.test',
+            'url' => self::REMOTE_INSTANCE_URL,
         ]);
 
         $existingInstalledRemoteBundle = Bundle::factory()->create([
@@ -132,7 +259,7 @@ public function testRemoteBundles()
         ]);
 
         Http::fake([
-            'http://remote-instance.test/api/1.0/devlink/local-bundles?published=1' => Http::response([
+            self::remoteApiUrl('local-bundles?published=1') => Http::response([
                 'data' => [
                     [
                         'id' => $existingInstalledRemoteBundle->remote_id,
@@ -173,7 +300,7 @@ public function testUpdateBundle()
 
         // Local Instance
         $devLink = DevLink::factory()->create([
-            'url' => 'http://remote-instance.test',
+            'url' => self::REMOTE_INSTANCE_URL,
         ]);
 
         $existingBundle = Bundle::factory()->create([
@@ -183,43 +310,13 @@ public function testUpdateBundle()
         ]);
 
         Http::fake([
-            'http://remote-instance.test/api/1.0/devlink/local-bundles/123' => Http::sequence()
-                ->push([
-                    'id' => 123,
-                    'name' => 'Test Bundle',
-                    'published' => true,
-                    'version' => '2',
-                    'description' => 'Test Bundle Description',
-                ], 200)
-                ->push([
-                    'id' => 123,
-                    'name' => 'Test Bundle',
-                    'published' => true,
-                    'version' => '3',
-                    'description' => 'Test Bundle Description',
-                ], 200)
-                ->push([
-                    'id' => 123,
-                    'name' => 'Test Bundle',
-                    'published' => true,
-                    'version' => '4',
-                    'description' => 'Test Bundle Description',
-                ], 200)
-                ->push([
-                    'id' => 123,
-                    'name' => 'Test Bundle',
-                    'published' => true,
-                    'version' => '8',
-                    'description' => 'Test Bundle Description',
-                ], 200)
-                ->push([
-                    'id' => 123,
-                    'name' => 'Test Bundle',
-                    'published' => true,
-                    'version' => '9',
-                    'description' => 'Test Bundle Description',
-                ], 200),
-            'http://remote-instance.test/api/1.0/devlink/export-local-bundle/123' => Http::sequence()
+            self::remoteApiUrl('local-bundles/123') => Http::sequence()
+                ->push(self::remoteBundleResponse('2'), 200)
+                ->push(self::remoteBundleResponse('3'), 200)
+                ->push(self::remoteBundleResponse('4'), 200)
+                ->push(self::remoteBundleResponse('8'), 200)
+                ->push(self::remoteBundleResponse('9'), 200),
+            self::remoteApiUrl('export-local-bundle/123') => Http::sequence()
                 ->push([
                     'payloads' => $exports,
                 ], 200)
@@ -235,16 +332,16 @@ public function testUpdateBundle()
                 ->push([
                     'payloads' => $exportsNewScreenName,
                 ], 200),
-            'http://remote-instance.test/api/1.0/devlink/export-local-bundle/123/settings' => Http::response([
+            self::remoteApiUrl('export-local-bundle/123/settings') => Http::response([
                 'settings' => [[
                     'setting' => 'users',
                     'config' => null,
                 ]],
             ]),
-            'http://remote-instance.test/api/1.0/devlink/export-local-bundle/123/settings-payloads' => Http::response([
+            self::remoteApiUrl('export-local-bundle/123/settings-payloads') => Http::response([
                 'payloads' => [$exportsSettingsPayloads],
             ]),
-            'http://remote-instance.test/api/1.0/devlink/local-bundles/123/add-bundle-instance' => Http::response([], 200),
+            self::remoteApiUrl('local-bundles/123/add-bundle-instance') => Http::response([], 200),
         ]);
 
         $devLink->installRemoteBundle(123, 'update');
@@ -271,4 +368,20 @@ public function testUpdateBundle()
         $savedVersions = $media->map(fn ($m) => $m->getCustomProperty('version'))->toArray();
         $this->assertEquals(['4', '8', '9'], $savedVersions);
     }
+
+    private static function remoteApiUrl(string $path): string
+    {
+        return self::REMOTE_INSTANCE_URL . '/api/1.0/devlink/' . ltrim($path, '/');
+    }
+
+    private static function remoteBundleResponse(string $version): array
+    {
+        return [
+            'id' => 123,
+            'name' => self::TEST_BUNDLE_NAME,
+            'published' => true,
+            'version' => $version,
+            'description' => self::TEST_BUNDLE_DESCRIPTION,
+        ];
+    }
 }