diff --git a/apps/client/src/widgets/type_widgets/canvas.ts b/apps/client/src/widgets/type_widgets/canvas.ts
index 490350686..53c940970 100644
--- a/apps/client/src/widgets/type_widgets/canvas.ts
+++ b/apps/client/src/widgets/type_widgets/canvas.ts
@@ -133,7 +133,7 @@ export default class ExcalidrawTypeWidget extends TypeWidget {
 
         // currently required by excalidraw, in order to allows self-hosting fonts locally.
         // this avoids making excalidraw load the fonts from an external CDN.
-        (window as any).EXCALIDRAW_ASSET_PATH = `${new URL(import.meta.url).origin}/node_modules/@excalidraw/excalidraw/dist/prod`;
+        (window as any).EXCALIDRAW_ASSET_PATH = `${window.location.pathname}/node_modules/@excalidraw/excalidraw/dist/prod`;
 
         // temporary vars
         this.currentNoteId = "";
diff --git a/apps/client/src/widgets/type_widgets/ckeditor/config.ts b/apps/client/src/widgets/type_widgets/ckeditor/config.ts
index 5a3262a1c..5f92c444d 100644
--- a/apps/client/src/widgets/type_widgets/ckeditor/config.ts
+++ b/apps/client/src/widgets/type_widgets/ckeditor/config.ts
@@ -102,7 +102,7 @@ export function buildConfig(): EditorConfig {
             allowedProtocols: ALLOWED_PROTOCOLS
         },
         emoji: {
-            definitionsUrl: new URL(import.meta.url).origin + emojiDefinitionsUrl
+            definitionsUrl: emojiDefinitionsUrl
         },
         syntaxHighlighting: {
             loadHighlightJs: async () => {
diff --git a/apps/client/vite.config.mts b/apps/client/vite.config.mts
index ab86bc5c8..839c24578 100644
--- a/apps/client/vite.config.mts
+++ b/apps/client/vite.config.mts
@@ -9,7 +9,7 @@ const assets = [ "assets", "stylesheets", "libraries", "fonts", "translations" ]
 export default defineConfig(() => ({
     root: __dirname,
     cacheDir: '../../node_modules/.vite/apps/client',
-    base: "/" + asset_path,
+    base: process.env.NODE_ENV === "production" ? "" : asset_path,
     server: {
         port: 4200,
         host: 'localhost',
diff --git a/apps/server/docker/nginx.conf b/apps/server/docker/nginx.conf
new file mode 100644
index 000000000..3c207c1ce
--- /dev/null
+++ b/apps/server/docker/nginx.conf
@@ -0,0 +1,16 @@
+server {
+    listen 8090;
+    
+    location /trilium/ {
+        rewrite ^/trilium(/.*)$ $1 break;
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+        proxy_pass http://host.docker.internal:8082; # change it to a different port if non-default is used
+        proxy_cookie_path / /trilium/;
+        proxy_read_timeout 90;
+    }
+}
\ No newline at end of file