diff --git a/.drone.yml b/.drone.yml
index 71b7be407..bc120d762 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -70,6 +70,10 @@ steps:
     pull: always
     environment:
       PNPM_CACHE_FOLDER: .cache/pnpm
+      SENTRY_AUTH_TOKEN:
+        from_secret: sentry_auth_token
+      SENTRY_ORG: vikunja
+      SENTRY_PROJECT: frontend-oss
     commands:
       - corepack enable && pnpm config set store-dir .cache/pnpm
       - pnpm run build
@@ -521,6 +525,6 @@ steps:
         from_secret: crowdin_key
 ---
 kind: signature
-hmac: a41964ffb64789df5553d7f51e05ac60d8243a4d8b7dfdd5be8de851aea5f9d7
+hmac: f2524d77d2d7d284319e20650627cc68b81631d166a0dab808d272e7a132054f
 
 ...
diff --git a/env.d.ts b/env.d.ts
index 1c43ec1ed..7bfd96554 100644
--- a/env.d.ts
+++ b/env.d.ts
@@ -4,19 +4,31 @@
 /// <reference types="@histoire/plugin-vue/components" />
 
 declare module 'postcss-focus-within/browser' {
-  import focusWithinInit from 'postcss-focus-within/browser'
-  export default focusWithinInit
+	import focusWithinInit from 'postcss-focus-within/browser'
+	export default focusWithinInit
 }
 
 declare module 'css-has-pseudo/browser' {
-  import cssHasPseudo from 'css-has-pseudo/browser'
-  export default cssHasPseudo
+	import cssHasPseudo from 'css-has-pseudo/browser'
+	export default cssHasPseudo
 }
 
 interface ImportMetaEnv {
-  readonly VITE_IS_ONLINE: boolean
+	readonly VIKUNJA_API_URL?: string
+	readonly VIKUNJA_HTTP_PORT?: number
+	readonly VIKUNJA_HTTPS_PORT?: number
+
+	readonly VIKUNJA_SENTRY_ENABLED?: boolean
+	readonly VIKUNJA_SENTRY_DSN?: string
+
+	readonly SENTRY_AUTH_TOKEN?: string
+	readonly SENTRY_ORG?: string
+	readonly SENTRY_PROJECT?: string
+
+	readonly VITE_WORKBOX_DEBUG?: boolean
+	readonly VITE_IS_ONLINE: boolean
 }
 
 interface ImportMeta {
-  readonly env: ImportMetaEnv
+	readonly env: ImportMetaEnv
 }
\ No newline at end of file
diff --git a/index.html b/index.html
index 5c1c2c701..c89f02cf5 100644
--- a/index.html
+++ b/index.html
@@ -18,12 +18,12 @@
 <div id="app"></div>
 <script type="module" src="/src/main.ts"></script>
 <script>
-    //
+	//
 	// This variable points the frontend to the api.
 	// It has to be the full url, including the last /api/v1 part and port.
 	// You can change this if your api is not reachable on the same port as the frontend.
 	window.API_URL = 'http://localhost:3456/api/v1'
-    // Enable error tracking with sentry. If this is set to true, will send anonymized data to 
+	// Enable error tracking with sentry. If this is set to true, will send anonymized data to 
 	// our sentry instance to notify us of potential problems.
 	window.SENTRY_ENABLED = false
 	window.SENTRY_DSN = 'https://85694a2d757547cbbc90cd4b55c5a18d@o1047380.ingest.sentry.io/6024480'
diff --git a/package.json b/package.json
index 26aa86cfc..cb643cfa3 100644
--- a/package.json
+++ b/package.json
@@ -136,6 +136,7 @@
     "vite": "4.3.9",
     "vite-plugin-inject-preload": "1.3.1",
     "vite-plugin-pwa": "0.16.4",
+    "vite-plugin-sentry": "1.1.6",
     "vite-svg-loader": "4.0.0",
     "vitest": "0.32.2",
     "vue-tsc": "1.8.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 1aa95f5c3..65e7b6b11 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1,4 +1,4 @@
-lockfileVersion: '6.0'
+lockfileVersion: '6.1'
 
 settings:
   autoInstallPeers: true
@@ -279,6 +279,9 @@ devDependencies:
   vite-plugin-pwa:
     specifier: 0.16.4
     version: 0.16.4(vite@4.3.9)(workbox-build@7.0.0)(workbox-window@7.0.0)
+  vite-plugin-sentry:
+    specifier: 1.1.6
+    version: 1.1.6(vite@4.3.9)
   vite-svg-loader:
     specifier: 4.0.0
     version: 4.0.0
@@ -3008,6 +3011,22 @@ packages:
       tslib: 1.14.1
     dev: false
 
+  /@sentry/cli@2.19.1:
+    resolution: {integrity: sha512-7RVwOUwVoOplsG1Jqo8YCke2BEQpGU+AvXAhl1HP6S4qB4mFat6Asr9EhvapPZvufpC85RvLt22h3q0yakRgaA==}
+    engines: {node: '>= 10'}
+    hasBin: true
+    requiresBuild: true
+    dependencies:
+      https-proxy-agent: 5.0.1
+      node-fetch: 2.6.7
+      progress: 2.0.3
+      proxy-from-env: 1.1.0
+      which: 2.0.2
+    transitivePeerDependencies:
+      - encoding
+      - supports-color
+    dev: true
+
   /@sentry/core@7.55.2:
     resolution: {integrity: sha512-clzQirownxqADv9+fopyMJTHzaoWedkN2+mi4ro1LxjLgROdXBFurMCC1nT+7cH/xvQ5gMIRkM/y/4gRtKy2Ew==}
     engines: {node: '>=8'}
@@ -9228,6 +9247,19 @@ packages:
       - supports-color
     dev: true
 
+  /vite-plugin-sentry@1.1.6(vite@4.3.9):
+    resolution: {integrity: sha512-IgrIIl+VKwfLEoJ5O/8rplWmnkjdzqlBwmncWJH19mitr/v7SP7YnXlzv+vdAvxBo5eA8QPYx0J2i58NnaQ3fg==}
+    engines: {node: '>= 12'}
+    peerDependencies:
+      vite: ^2.6.0 || ^3.0.0
+    dependencies:
+      '@sentry/cli': 2.19.1
+      vite: 4.3.9(@types/node@18.16.18)(sass@1.63.4)(terser@5.10.0)
+    transitivePeerDependencies:
+      - encoding
+      - supports-color
+    dev: true
+
   /vite-svg-loader@4.0.0:
     resolution: {integrity: sha512-0MMf1yzzSYlV4MGePsLVAOqXsbF5IVxbn4EEzqRnWxTQl8BJg/cfwIzfQNmNQxZp5XXwd4kyRKF1LytuHZTnqA==}
     dependencies:
diff --git a/src/composables/useOnline.ts b/src/composables/useOnline.ts
index 148d3ae54..66d5c553d 100644
--- a/src/composables/useOnline.ts
+++ b/src/composables/useOnline.ts
@@ -4,7 +4,7 @@ import type {ConfigurableWindow} from '@vueuse/core'
 
 export function useOnline(options?: ConfigurableWindow) {
 	const isOnline = useNetworkOnline(options)
-	const fakeOnlineState = !!import.meta.env.VITE_IS_ONLINE
+	const fakeOnlineState = Boolean(import.meta.env.VITE_IS_ONLINE)
 	if (isOnline.value === false && fakeOnlineState) {
 		console.log('Setting fake online state', fakeOnlineState)
 		return ref(true)
diff --git a/src/main.ts b/src/main.ts
index 586839b86..7be385544 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -4,9 +4,7 @@ import {createApp} from 'vue'
 import pinia from './pinia'
 import router from './router'
 import App from './App.vue'
-
 import {error, success} from './message'
-
 import {VERSION} from './version.json'
 
 // Notifications
@@ -106,7 +104,11 @@ setLanguage(browserLanguage).then(() => {
 	}
 
 	if (window.SENTRY_ENABLED) {
-		import('./sentry').then(sentry => sentry.default(app, router))
+		try {
+			import('./sentry').then(sentry => sentry.default(app, router))
+		} catch (e) {
+			console.error('Could not enable Sentry tracking', e)
+		}
 	}
 
 	app.use(pinia)
diff --git a/src/sentry.ts b/src/sentry.ts
index fad06913f..747f8aec9 100644
--- a/src/sentry.ts
+++ b/src/sentry.ts
@@ -1,15 +1,16 @@
-import type { App } from 'vue'
-import type { Router } from 'vue-router'
-import {VERSION} from './version.json'
+import 'virtual:vite-plugin-sentry/sentry-config'
+import type {App} from 'vue'
+import type {Router} from 'vue-router'
 
 export default async function setupSentry(app: App, router: Router) {
 	const Sentry = await import('@sentry/vue')
 	const {Integrations} = await import('@sentry/tracing')
 
 	Sentry.init({
-		release: VERSION,
 		app,
 		dsn: window.SENTRY_DSN,
+		release: import.meta.env.VITE_PLUGIN_SENTRY_CONFIG.release,
+		dist: import.meta.env.VITE_PLUGIN_SENTRY_CONFIG.dist,
 		integrations: [
 			new Integrations.BrowserTracing({
 				routingInstrumentation: Sentry.vueRouterInstrumentation(router),
diff --git a/tsconfig.app.json b/tsconfig.app.json
index aaec20478..eb3cb5719 100644
--- a/tsconfig.app.json
+++ b/tsconfig.app.json
@@ -14,6 +14,10 @@
     "paths": {
       "@/*": ["./src/*"]
     },
+    "types": [
+      // https://github.com/ikenfin/vite-plugin-sentry#typescript
+      "vite-plugin-sentry/client"
+    ],
     "ignoreDeprecations": "5.0"
   },
   "vueCompilerOptions": {
diff --git a/vite.config.ts b/vite.config.ts
index dcc601338..f50c8fbf3 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -9,6 +9,8 @@ import VueI18nPlugin from '@intlify/unplugin-vue-i18n/vite'
 import {VitePWA} from 'vite-plugin-pwa'
 import VitePluginInjectPreload from 'vite-plugin-inject-preload'
 import {visualizer} from 'rollup-plugin-visualizer'
+
+import viteSentry, {type ViteSentryPluginOptions} from 'vite-plugin-sentry'
 import svgLoader from 'vite-svg-loader'
 import postcssPresetEnv from 'postcss-preset-env'
 import postcssEasings from 'postcss-easings'
@@ -17,6 +19,8 @@ import postcssEasingGradients from 'postcss-easing-gradients'
 
 const pathSrc = fileURLToPath(new URL('./src', import.meta.url))
 
+import {VERSION} from './src/version.json'
+
 // the @use rules have to be the first in the compiled stylesheets
 const PREFIXED_SCSS_STYLES = `@use "sass:math";
 @import "${pathSrc}/styles/common-imports";`
@@ -24,16 +28,44 @@ const PREFIXED_SCSS_STYLES = `@use "sass:math";
 const isModernBuild = Boolean(process.env.BUILD_MODERN_ONLY)
 const legacy = isModernBuild
 	? undefined
-	: legacyFn({
-		// recommended by browserslist => https://github.com/vitejs/vite/tree/main/packages/plugin-legacy#targets
-		targets: ['defaults', 'not IE 11'],
-	})
+	: legacyFn()
 
 console.log(isModernBuild
 	? 'Building "modern-only" build'
 	: 'Building "legacy" build with "@vitejs/plugin-legacy"',
 )
 
+/*
+** Configure sentry plugin
+*/
+function getSentryConfig(env: ImportMetaEnv): ViteSentryPluginOptions {
+	return {
+		// dryRun: true, // FIXME: remove when ready with configuring
+		debug: true, // FIXME: remove when ready with configuring
+		skipEnvironmentCheck: true,
+
+		url: 'https://sentry.io',
+		authToken: env.SENTRY_AUTH_TOKEN,
+		org: env.SENTRY_ORG,
+		project: env.SENTRY_PROJECT,
+		release: VERSION,
+		cleanSourcemapsAfterUpload: true,
+		deploy: {
+			env: env.mode === 'production'
+				? 'production'
+				: 'development',
+		},
+		setCommits: {
+			auto: true,
+		},
+		sourceMaps: {
+			include: ['./dist/assets'],
+			ignore: ['node_modules'],
+			urlPrefix: '~/assets',
+		},
+	}
+}
+
 /**
  * @param fontNames Array of the file names of the fonts without axis and hash suffixes
  */
@@ -171,6 +203,7 @@ export default defineConfig(({mode}) => {
 					],
 				},
 			}),
+			viteSentry(getSentryConfig(env)),
 		],
 		resolve: {
 			alias: [
@@ -186,8 +219,16 @@ export default defineConfig(({mode}) => {
 			port: 4173,
 			strictPort: true,
 		},
+		output: {
+			manualChunks: {
+				// by putting tracking related stuff in a separated file we try to prevent unwanted blocking from ad-blockers
+				sentry: ['./src/sentry.ts', '@sentry/vue', '@sentry/tracing'],
+			},
+		},
 		build: {
 			target: 'esnext',
+			// required for sentry debugging: tells vite to create source maps
+			sourcemap: true,
 			rollupOptions: {
 				plugins: [
 					visualizer({