diff --git a/build.gradle b/build.gradle
index 0d93f5a9c..bc48e2c7e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -441,7 +441,7 @@ bootJar {
         into 'BOOT-INF/classes/resources/'
     }
     from(tasks.named("frontendAdminBuild")) {
-        into 'resources/alfio-admin-frontend/'
+        into 'BOOT-INF/classes/resources/alfio-admin-frontend/'
     }
     from(tasks.named("publicFrontendIndexTransform")) {
         rename 'alfio-public-frontend-index.html', 'BOOT-INF/classes/alfio-public-frontend-index.html'
diff --git a/src/main/java/alfio/config/MvcConfiguration.java b/src/main/java/alfio/config/MvcConfiguration.java
index 7399c8464..ac9d17d02 100644
--- a/src/main/java/alfio/config/MvcConfiguration.java
+++ b/src/main/java/alfio/config/MvcConfiguration.java
@@ -98,7 +98,7 @@ public void addResourceHandlers(ResourceHandlerRegistry registry) {
             .setCachePeriod(cacheMinutes * 60)
             .setCacheControl(CacheControl.maxAge(Duration.ofDays(60)));
 
-        registry.addResourceHandler("/frontend-admin/**")
+        registry.addResourceHandler(alfioVersion + "/frontend-admin/**")
             .addResourceLocations("classpath:/resources/alfio-admin-frontend/")
             .setCachePeriod(cacheMinutes * 60)
             .setCacheControl(CacheControl.maxAge(Duration.ofDays(60)));
diff --git a/src/main/java/alfio/controller/AdminIndexController.java b/src/main/java/alfio/controller/AdminIndexController.java
index 49cfcd003..7c983be2d 100644
--- a/src/main/java/alfio/controller/AdminIndexController.java
+++ b/src/main/java/alfio/controller/AdminIndexController.java
@@ -74,7 +74,7 @@ public AdminIndexController(ConfigurationManager configurationManager,
         }
     }
 
-    @GetMapping("/admin")
+    @GetMapping({"/admin", "/admin/"})
     public void adminHome(Model model, @Value("${alfio.version}") String version, HttpServletRequest request, HttpServletResponse response, Principal principal) throws IOException {
         model.addAttribute("alfioVersion", version);
         model.addAttribute("username", principal.getName());
diff --git a/src/main/resources/alfio/web-templates/admin-index.ms b/src/main/resources/alfio/web-templates/admin-index.ms
index 2f9eefe0d..3b09063b6 100644
--- a/src/main/resources/alfio/web-templates/admin-index.ms
+++ b/src/main/resources/alfio/web-templates/admin-index.ms
@@ -12,9 +12,9 @@
     <script type="module" src="http://localhost:5173/src/main.ts" nonce="{{nonce}}"></script>
     {{/devModeEnabled}}
     {{#litAdminStatic}}
-        <script type="module" src="{{contextPath}}/resources/alfio-admin-frontend/{{lit-js}}" id="lit-js" nonce="{{nonce}}"></script>
+        <script type="module" src="{{contextPath}}/frontend-admin/{{lit-js}}" id="lit-js" nonce="{{nonce}}"></script>
         {{#lit-css}}
-        <link rel="stylesheet" href="{{contextPath}}/resources/alfio-admin-frontend/{{.}}" />
+        <link rel="stylesheet" href="{{contextPath}}/frontend-admin/{{.}}" />
         {{/lit-css}}
     {{/litAdminStatic}}