diff --git a/.replit b/.replit
index 3a032945..ee461cf9 100644
--- a/.replit
+++ b/.replit
@@ -36,7 +36,7 @@ localPort = 5000
 externalPort = 80
 
 [[ports]]
-localPort = 32787
+localPort = 37519
 externalPort = 3000
 
 [deployment]
diff --git a/backend/templates/base/base.html b/backend/templates/base/base.html
index b474c87d..c1f0e3d5 100644
--- a/backend/templates/base/base.html
+++ b/backend/templates/base/base.html
@@ -30,14 +30,14 @@
     <!-- HTMX -->
     <script src="https://unpkg.com/htmx.org@1.9.6"></script>
 
-    <!-- Alpine.js -->
-    <script defer src="{% static 'js/alpine.min.js' %}"></script>
+    <!-- Alpine.js Components (must load before Alpine.js) -->
+    <script defer src="{% static 'js/alpine-components.js' %}?v={{ version|default:'1.0' }}"></script>
 
-    <!-- Alpine.js Components -->
-    <script src="{% static 'js/alpine-components.js' %}"></script>
+    <!-- Alpine.js -->
+    <script defer src="{% static 'js/alpine.min.js' %}?v={{ version|default:'1.0' }}"></script>
 
     <!-- Location Autocomplete -->
-    <script src="{% static 'js/location-autocomplete.js' %}"></script>
+    <script defer src="{% static 'js/location-autocomplete.js' %}?v={{ version|default:'1.0' }}"></script>
 
     <!-- Tailwind CSS -->
     <link href="{% static 'css/tailwind.css' %}" rel="stylesheet" />
@@ -133,9 +133,14 @@
     <!-- Global Toast Container -->
     {% include 'components/ui/toast-container.html' %}
 
-    <!-- Custom JavaScript -->
-    <script src="{% static 'js/main.js' %}"></script>
-    <script src="{% static 'js/alerts.js' %}"></script>
+    <!-- Custom JavaScript with cache control -->
+    <script src="{% static 'js/main.js' %}?v={{ version|default:'1.0' }}"></script>
+    <script src="{% static 'js/alerts.js' %}?v={{ version|default:'1.0' }}"></script>
+    
+    <!-- Cache control meta tag -->
+    <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate">
+    <meta http-equiv="Pragma" content="no-cache">
+    <meta http-equiv="Expires" content="0">
     {% block extra_js %}{% endblock %}
   </body>
 </html>