diff --git a/cmds/portmaster-core/main.go b/cmds/portmaster-core/main.go
index 12456f58..88f187a0 100644
--- a/cmds/portmaster-core/main.go
+++ b/cmds/portmaster-core/main.go
@@ -34,7 +34,7 @@ var (
 )
 
 func init() {
-	// Add persisent flags for all commands.
+	// Add persistent flags for all commands.
 	rootCmd.PersistentFlags().StringVar(&binDir, "bin-dir", "", "set directory for executable binaries (rw/ro)")
 	rootCmd.PersistentFlags().StringVar(&dataDir, "data-dir", "", "set directory for variable data (rw)")
 
diff --git a/desktop/tauri/src-tauri/templates/nsis_install_hooks.nsh b/desktop/tauri/src-tauri/templates/nsis_install_hooks.nsh
index 5d08c799..cc6ea2f2 100644
--- a/desktop/tauri/src-tauri/templates/nsis_install_hooks.nsh
+++ b/desktop/tauri/src-tauri/templates/nsis_install_hooks.nsh
@@ -27,7 +27,7 @@
 !macroend
 
 !macro NSIS_HOOK_POSTINSTALL
-  ExecWait 'sc.exe create PortmasterCore binPath= "$INSTDIR\portmaster-core.exe"'
+  ExecWait 'sc.exe create PortmasterCore binPath= "$INSTDIR\portmaster-core.exe --log-dir=%PROGRAMDATA%\Portmaster\logs"'
 !macroend
 
 !macro NSIS_HOOK_PREUNINSTALL
diff --git a/desktop/tauri/src-tauri/templates/service.wxs b/desktop/tauri/src-tauri/templates/service.wxs
index 28a035d5..3e829bd7 100644
--- a/desktop/tauri/src-tauri/templates/service.wxs
+++ b/desktop/tauri/src-tauri/templates/service.wxs
@@ -3,7 +3,7 @@
 	<Fragment>
     <CustomAction Id="InstallPortmasterService"
               Directory="INSTALLDIR"
-              ExeCommand="sc.exe create PortmasterCore binPath= &quot;[INSTALLDIR]portmaster-core.exe&quot;"
+              ExeCommand="sc.exe create PortmasterCore binPath= &quot;[INSTALLDIR]portmaster-core.exe --log-dir=%PROGRAMDATA%\Portmaster\logs&quot;"
               Execute="commit"
               Return="check"
               Impersonate="no"
diff --git a/packaging/linux/portmaster.service b/packaging/linux/portmaster.service
index c48c8a24..6de86eb7 100644
--- a/packaging/linux/portmaster.service
+++ b/packaging/linux/portmaster.service
@@ -35,7 +35,7 @@ CapabilityBoundingSet=cap_chown cap_kill cap_net_admin cap_net_bind_service cap_
 StateDirectory=portmaster
 # TODO(ppacher): add --disable-software-updates once it's merged and the release process changed.
 WorkingDirectory=/var/lib/portmaster/data
-ExecStart=/usr/lib/portmaster/portmaster-core --data /var/lib/portmaster/data -devmode -- $PORTMASTER_ARGS
+ExecStart=/usr/lib/portmaster/portmaster-core --log-dir=/var/lib/portmaster/log -- $PORTMASTER_ARGS
 ExecStopPost=-/usr/lib/portmaster/portmaster-core -recover-iptables
 
 [Install]
diff --git a/service/core/base/module.go b/service/core/base/module.go
index 05eacec9..6e37f797 100644
--- a/service/core/base/module.go
+++ b/service/core/base/module.go
@@ -25,7 +25,7 @@ func (b *Base) Manager() *mgr.Manager {
 // Start starts the module.
 func (b *Base) Start() error {
 	startProfiling()
-	registerLogCleaner()
+	// registerLogCleaner()
 
 	return nil
 }