diff --git a/dashboard/oidc_error.html b/dashboard/oidc_error.html
index afe7a0121..941fa48a2 100644
--- a/dashboard/oidc_error.html
+++ b/dashboard/oidc_error.html
@@ -4,10 +4,10 @@
     <meta charset="UTF-8" />
     <meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width, height=device-height" />
 
-    <title>##NAME## OpenID Error</title>
+    <title><%= name %> OpenID Error</title>
 
-    <link rel="icon" href="##ICON_URL##">
-    <link rel="apple-touch-icon" href="##ICON_URL##">
+    <link rel="icon" href="<%- iconUrl %>">
+    <link rel="apple-touch-icon" href="<%- iconUrl %>">
 
     <style>
       @media (prefers-color-scheme: dark) {
@@ -19,10 +19,10 @@
 
     <script>
       window.cloudron = {};
-      window.cloudron.name = '##NAME##';
-      window.cloudron.iconUrl = '##ICON_URL##';
-      window.cloudron.errorMessage = `##ERROR_MESSAGE##`;
-      window.cloudron.footer = `##FOOTER##`;
+      window.cloudron.name = '<%= name %>';
+      window.cloudron.iconUrl = '<%- iconUrl %>';
+      window.cloudron.errorMessage = `<%- errorMessage %>`;
+      window.cloudron.footer = `<%- footer %>`;
     </script>
 
   </head>
diff --git a/dashboard/oidc_interaction_abort.html b/dashboard/oidc_interaction_abort.html
index 471d77056..3d820f2e3 100644
--- a/dashboard/oidc_interaction_abort.html
+++ b/dashboard/oidc_interaction_abort.html
@@ -4,10 +4,10 @@
     <meta charset="UTF-8" />
     <meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width, height=device-height" />
 
-    <title>##NAME## OpenID Access Denied</title>
+    <title><%= name %> OpenID Access Denied</title>
 
-    <link rel="icon" href="##ICON_URL##">
-    <link rel="apple-touch-icon" href="##ICON_URL##">
+    <link rel="icon" href="<%- iconUrl %>">
+    <link rel="apple-touch-icon" href="<%- iconUrl %>">
 
     <style>
       @media (prefers-color-scheme: dark) {
@@ -19,10 +19,10 @@
 
     <script>
       window.cloudron = {};
-      window.cloudron.name = '##NAME##';
-      window.cloudron.iconUrl = '##ICON_URL##';
-      window.cloudron.submitUrl = `##SUBMIT_URL##`;
-      window.cloudron.footer = `##FOOTER##`;
+      window.cloudron.name = '<%= name %>';
+      window.cloudron.iconUrl = '<%- iconUrl %>';
+      window.cloudron.submitUrl = '<%- submitUrl %>';
+      window.cloudron.footer = `<%- footer %>`;
     </script>
 
   </head>
diff --git a/dashboard/oidc_interaction_confirm.html b/dashboard/oidc_interaction_confirm.html
index 74ecda912..6267f8373 100644
--- a/dashboard/oidc_interaction_confirm.html
+++ b/dashboard/oidc_interaction_confirm.html
@@ -4,7 +4,7 @@
     <meta charset="UTF-8" />
     <meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width, height=device-height" />
 
-    <title>Authorize ##NAME##</title>
+    <title>Authorize <%= name %></title>
 
     <link rel="icon" href="/api/v1/cloudron/avatar">
     <link rel="apple-touch-icon" href="/api/v1/cloudron/avatar">
@@ -12,7 +12,7 @@
   </head>
 <body>
 
-<form id="submitForm" method="post" action="##SUBMIT_URL##">
+<form id="submitForm" method="post" action="<%- submitUrl %>">
   <!-- <button type="submit"></button> -->
 </form>
 
diff --git a/dashboard/oidc_login.html b/dashboard/oidc_login.html
index 6113ec5f4..62fdea63e 100644
--- a/dashboard/oidc_login.html
+++ b/dashboard/oidc_login.html
@@ -4,10 +4,10 @@
     <meta charset="UTF-8" />
     <meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width, height=device-height" />
 
-    <title>##NAME## Login</title>
+    <title><%= name %> Login</title>
 
-    <link rel="icon" href="##ICON_URL##">
-    <link rel="apple-touch-icon" href="##ICON_URL##">
+    <link rel="icon" href="<%- iconUrl %>">
+    <link rel="apple-touch-icon" href="<%- iconUrl %>">
 
     <style>
       @media (prefers-color-scheme: dark) {
@@ -19,11 +19,11 @@
 
     <script>
       window.cloudron = {};
-      window.cloudron.name = '##NAME##';
-      window.cloudron.note = '##NOTE##';
-      window.cloudron.submitUrl = '##SUBMIT_URL##';
-      window.cloudron.iconUrl = '##ICON_URL##';
-      window.cloudron.footer = `##FOOTER##`;
+      window.cloudron.name = '<%= name %>';
+      window.cloudron.note = '<%- note %>';
+      window.cloudron.submitUrl = '<%- submitUrl %>';
+      window.cloudron.iconUrl = '<%- iconUrl %>';
+      window.cloudron.footer = `<%- footer %>`;
     </script>
 
   </head>
diff --git a/src/oidcserver.js b/src/oidcserver.js
index e75a81baf..f4dbf529b 100644
--- a/src/oidcserver.js
+++ b/src/oidcserver.js
@@ -20,6 +20,7 @@ const assert = require('assert'),
     dashboard = require('./dashboard.js'),
     debug = require('debug')('box:oidcserver'),
     dns = require('./dns.js'),
+    ejs = require('ejs'),
     express = require('express'),
     eventlog = require('./eventlog.js'),
     fs = require('fs'),
@@ -271,20 +272,22 @@ async function cleanupExpired() {
     }
 }
 
+const TEMPLATE_LOGIN = fs.readFileSync(path.join(paths.DASHBOARD_DIR, 'oidc_login.html'), 'utf-8');
+const TEMPLATE_INTERACTION_CONFIRM = fs.readFileSync(path.join(paths.DASHBOARD_DIR, 'oidc_interaction_confirm.html'), 'utf8');
+const TEMPLATE_INTERACTION_ABORT = fs.readFileSync(path.join(paths.DASHBOARD_DIR, 'oidc_interaction_abort.html'), 'utf8');
+const TEMPLATE_ERROR = fs.readFileSync(path.join(paths.DASHBOARD_DIR, 'oidc_error.html'), 'utf8');
+
 async function renderError(error) {
     const data = {
-        ICON_URL: '/api/v1/cloudron/avatar',
-        NAME: 'Cloudron',
-        ERROR_MESSAGE: error.error_description || error.error_detail || error.message || 'Internal error',
-        FOOTER: marked.parse(await branding.renderFooter())
+        iconUrl: '/api/v1/cloudron/avatar',
+        name: 'Cloudron',
+        errorMessage: error.error_description || error.error_detail || error.message || 'Internal error',
+        footer: marked.parse(await branding.renderFooter())
     };
 
     debug('renderError: %o', error);
-    let html = fs.readFileSync(path.join(__dirname, '/../dashboard/dist/oidc_error.html'), 'utf8');
-    for (const key in data) {
-        html = html.replaceAll(`##${key}##`, data[key]);
-    }
-    return html;
+
+    return ejs.render(TEMPLATE_ERROR, data);
 }
 
 async function renderInteractionPage(req, res, next) {
@@ -302,53 +305,43 @@ async function renderInteractionPage(req, res, next) {
     res.set('Content-Type', 'text/html');
 
     if (prompt.name === 'login') {
-        const options = {
-            SUBMIT_URL: `${ROUTE_PREFIX}/interaction/${uid}/login`,
-            ICON_URL: '/api/v1/cloudron/avatar',
-            NAME: client.name || await branding.getCloudronName(),
-            FOOTER: marked.parse(await branding.renderFooter()),
-            NOTE: constants.DEMO ? `This is a demo. Username and password is "${constants.DEMO_USERNAME}"` : '',
+        const data = {
+            submitUrl: `${ROUTE_PREFIX}/interaction/${uid}/login`,
+            iconUrl: '/api/v1/cloudron/avatar',
+            name: client.name || await branding.getCloudronName(),
+            footer: marked.parse(await branding.renderFooter()),
+            note: constants.DEMO ? `This is a demo. Username and password is "${constants.DEMO_USERNAME}"` : '',
         };
 
         if (app) {
-            options.NAME = app.label || app.fqdn;
-            options.ICON_URL = app.iconUrl;
+            data.name = app.label || app.fqdn;
+            data.iconUrl = app.iconUrl;
         }
 
-        let html = fs.readFileSync(__dirname + '/../dashboard/dist/oidc_login.html', 'utf-8');
-        for (const key in options) {
-            html = html.replaceAll(`##${key}##`, options[key]);
-        }
-
-        return res.send(html);
+        return res.send(ejs.render(TEMPLATE_LOGIN, data));
     } else if (prompt.name === 'consent') {
         let hasAccess = false;
 
-        const options = {
-            ICON_URL: '/api/v1/cloudron/avatar',
-            NAME: client.name || '',
-            FOOTER: marked.parse(await branding.renderFooter())
+        const data = {
+            iconUrl: '/api/v1/cloudron/avatar',
+            name: client.name || '',
+            footer: marked.parse(await branding.renderFooter())
         };
 
         // check if user has access to the app if client refers to an app
         if (app) {
             const user = await users.getByUsername(session.accountId);
 
-            options.NAME = app.label || app.fqdn;
-            options.ICON_URL = app.iconUrl;
+            data.name = app.label || app.fqdn;
+            data.iconUrl = app.iconUrl;
             hasAccess = apps.canAccess(app, user);
         } else {
             hasAccess = true;
         }
 
-        options.SUBMIT_URL = `${ROUTE_PREFIX}/interaction/${uid}/${hasAccess ? 'confirm' : 'abort'}`;
+        data.submitUrl = `${ROUTE_PREFIX}/interaction/${uid}/${hasAccess ? 'confirm' : 'abort'}`;
 
-        let html = fs.readFileSync(path.join(__dirname, hasAccess ? '/../dashboard/dist/oidc_interaction_confirm.html' : '/../dashboard/dist/oidc_interaction_abort.html'), 'utf8');
-        for (const key in options) {
-            html = html.replaceAll(`##${key}##`, options[key]);
-        }
-
-        return res.send(html);
+        return res.send(ejs.render(hasAccess ? TEMPLATE_INTERACTION_CONFIRM : TEMPLATE_INTERACTION_ABORT, data));
     }
 }
 
