diff --git a/Modules/Helpdesk/Resources/assets/js/app.js b/Modules/Helpdesk/Resources/assets/js/app.js
index 82be47cc..ec2a020b 100644
--- a/Modules/Helpdesk/Resources/assets/js/app.js
+++ b/Modules/Helpdesk/Resources/assets/js/app.js
@@ -1,7 +1,31 @@
 import './bootstrap';
+import $ from 'jquery';
+window.$ = $;
+window.jQuery = $;
+import select2 from 'select2/dist/js/select2.full.js';
+select2(window, $);
+function initialiseHelpdeskSelects()
+{
+    console.log('initialising select2');
+    $('[data-helpdesk-select2]').each(function () {
+        const $select = $(this);
+        if ($select.hasClass('select2-hidden-accessible')) {
+            return;
+        }
+        $select.select2({
+            width: '100%',
+            allowClear: true,
+        });
+    });
+}
 
-import Sortable from 'sortablejs';
-
-window.Sortable = Sortable;
+document.addEventListener('DOMContentLoaded', initialiseHelpdeskSelects);
+document.addEventListener('livewire:navigated', initialiseHelpdeskSelects);
+document.addEventListener('livewire:init', () => {
+    initialiseHelpdeskSelects();
+    Livewire.hook('morphed', () => {
+        initialiseHelpdeskSelects();
+    });
+});
 
 console.info('Helpdesk module assets loaded');
diff --git a/Modules/Helpdesk/Resources/views/livewire/ticket-create.blade.php b/Modules/Helpdesk/Resources/views/livewire/ticket-create.blade.php
index 506b4129..54a3bba4 100644
--- a/Modules/Helpdesk/Resources/views/livewire/ticket-create.blade.php
+++ b/Modules/Helpdesk/Resources/views/livewire/ticket-create.blade.php
@@ -1,4 +1,3 @@
-
 <div class="hd-helpdesk-surface space-y-6">
     <style>
         .hd-helpdesk-surface .hd-btn,
@@ -369,3 +368,4 @@
     </form>
 
 </div>
+
diff --git a/Modules/Helpdesk/package.json b/Modules/Helpdesk/package.json
index 4999a653..aa9c3fbb 100644
--- a/Modules/Helpdesk/package.json
+++ b/Modules/Helpdesk/package.json
@@ -11,7 +11,7 @@
         "vite": "^8.0.16"
     },
     "dependencies": {
-        "jquery": "^4.0.0",
+        "jquery": "3.7.1",
         "select2": "^4.1.0"
     }
 }
diff --git a/Modules/Helpdesk/vite.config.js b/Modules/Helpdesk/vite.config.js
index 2b9e384d..11c06f86 100644
--- a/Modules/Helpdesk/vite.config.js
+++ b/Modules/Helpdesk/vite.config.js
@@ -4,24 +4,19 @@ import laravel from 'laravel-vite-plugin';
 export default defineConfig({
     build: {
         emptyOutDir: true,
-        manifest: true,
+        manifest: 'manifest.json',
         outDir: '../../public/build/helpdesk',
     },
+
     plugins: [
         laravel({
             publicDirectory: '../../public',
             buildDirectory: 'build/helpdesk',
+
             input: [
                 'Resources/assets/css/app.css',
                 'Resources/assets/js/app.js',
             ],
-            refresh: [
-                'Resources/views/**/*.blade.php',
-                'Routes/**/*.php',
-                'Http/**/*.php',
-                'Livewire/**/*.php',
-                'Providers/**/*.php',
-            ],
         }),
     ],
 });
diff --git a/package.json b/package.json
index c911bdcf..3b6548b4 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
         "chart.js": "^4.5.1",
         "concurrently": "^9.0.1",
         "flatpickr": "^4.6.13",
-        "jquery": "^4.0.0",
+        "jquery": "3.7.1",
         "laravel-vite-plugin": "^3.1",
         "sass-embedded": "^1.100.0",
         "select2": "^4.1.0",
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index f2e85e61..ed74c843 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -1,3 +1,9 @@
+@if (request()->routeIs('helpdesk.*'))
+    @vite([
+        'Resources/assets/js/app.js',
+        'Resources/assets/css/app.css',
+    ], 'build/helpdesk')
+@endif
 <x-layouts::app.sidebar :title="$title ?? null">
     {{ $slot }}
 </x-layouts::app.sidebar>