diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ff951cf..c1d7bfd 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -58,7 +58,7 @@ jobs:
           retention-days: 30
 
   deploy-demo:
-    name: Deploy demo
+    name: Deploy app
     runs-on: ubuntu-latest
     needs: build
     permissions:
diff --git a/src/routes/+error.svelte b/src/routes/+error.svelte
index 2f5041b..96c5645 100644
--- a/src/routes/+error.svelte
+++ b/src/routes/+error.svelte
@@ -1,5 +1,6 @@
 <script>
 	import { goto } from '$app/navigation';
+	import { base } from '$app/paths';
 
-	goto('/');
+	goto(`${base}/`);
 </script>
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 88d1a7b..22451eb 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -1,5 +1,6 @@
 <script>
 	import '../app.css';
+	import { base } from '$app/paths';
 </script>
 
 <header class="flex flex-col gap-2">
@@ -15,7 +16,7 @@
 
 <footer class="w-full flex justify-between items-center">
 	<a href="https://github.com/derstimmler/stromgedacht-web">
-		<img src="images/github-mark-white.svg" width="32" height="32" alt="github logo" />
+		<img src="{base}/images/github-mark-white.svg" width="32" height="32" alt="github logo" />
 	</a>
 	<a href="https://stromgedacht.de" target="_blank">StromGedacht</a>
 </footer>
diff --git a/svelte.config.js b/svelte.config.js
index 2a11530..50995b2 100644
--- a/svelte.config.js
+++ b/svelte.config.js
@@ -1,6 +1,8 @@
 import adapter from '@sveltejs/adapter-static';
 import { vitePreprocess } from '@sveltejs/kit/vite';
 
+const isProduction = process.env.NODE_ENV === 'production';
+
 /** @type {import('@sveltejs/kit').Config} */
 const config = {
 	// Consult https://kit.svelte.dev/docs/integrations#preprocessors
@@ -16,7 +18,11 @@ const config = {
 			fallback: undefined,
 			precompress: false,
 			strict: true
-		})
+		}),
+		paths: {
+			base: isProduction ? '/stromgedacht-web' : '',
+			relative: true
+		}
 	}
 };