diff --git a/.gitea/workflows/docker-latest.yml b/.gitea/workflows/docker-latest.yml
index 9dc4d9a..c8b90da 100644
--- a/.gitea/workflows/docker-latest.yml
+++ b/.gitea/workflows/docker-latest.yml
@@ -15,7 +15,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version: 22
           cache: npm
 
       - name: Install dependencies
diff --git a/Dockerfile b/Dockerfile
index a47263d..7546839 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,5 @@
 FROM node:22-alpine
 
-ENV NODE_ENV=production
 WORKDIR /app
 
 COPY package*.json ./
@@ -12,5 +11,6 @@ COPY scripts ./scripts
 COPY tsconfig.json ./
 RUN npm run build && npm prune --omit=dev
 
+ENV NODE_ENV=production
 EXPOSE 3000
 CMD ["npm", "start"]
diff --git a/src/templates.ts b/src/templates.ts
index 3791cca..d7f1128 100644
--- a/src/templates.ts
+++ b/src/templates.ts
@@ -399,7 +399,7 @@ export function casparTemplatePage() {
   <main class="stage fit-contain">
     <section class="embed provider-empty" data-source="" style="--embed-width:500px"></section>
   </main>
-  <script src="/caspar.js"></script>
+  <script type="module" src="/caspar.js"></script>
 </body>
 </html>`;
 }
@@ -477,7 +477,7 @@ export function collagePage({
     <div class="collage-track"></div>
   </main>
   <script id="collage-data" type="application/json">${safeJson(collageData)}</script>
-  <script src="/collage.js"></script>
+  <script type="module" src="/collage.js"></script>
 </body>
 </html>`;
 }
diff --git a/test/templates.test.js b/test/templates.test.js
index a2b684c..00f0818 100644
--- a/test/templates.test.js
+++ b/test/templates.test.js
@@ -207,7 +207,7 @@ test("renders a CasparCG template shell", () => {
 
   assert.match(page, /<body class="graphic transparent is-loading"/);
   assert.match(page, /<section class="embed provider-empty"/);
-  assert.match(page, /<script src="\/caspar\.js"><\/script>/);
+  assert.match(page, /<script type="module" src="\/caspar\.js"><\/script>/);
 });
 
 test("renders a vertical scrolling collage page with repeated embed cards", () => {
@@ -261,7 +261,7 @@ test("renders a vertical scrolling collage page with repeated embed cards", () =
   assert.match(page, /"hydrateDelay":180/);
   assert.match(page, /"repeat":3/);
   assert.match(page, /"shuffle":false/);
-  assert.match(page, /<script src="\/collage\.js"><\/script>/);
+  assert.match(page, /<script type="module" src="\/collage\.js"><\/script>/);
 });
 
 test("shrinks collage card width to fit the configured screen width", () => {
