diff --git a/sentinel.conf b/sentinel.conf
index 36a21e933..dede86bcd 100644
--- a/sentinel.conf
+++ b/sentinel.conf
@@ -13,11 +13,12 @@ port 26379
 # Note that Valkey will write a pid file in /var/run/valkey-sentinel.pid when
 # daemonized.
 daemonize no
+supervised systemd
 
 # When running daemonized, Valkey Sentinel writes a pid file in
 # /var/run/valkey-sentinel.pid by default. You can specify a custom pid file
 # location here.
-pidfile /var/run/valkey-sentinel.pid
+pidfile /run/valkey/sentinel-default.pid
 
 # Specify the server verbosity level.
 # This can be one of:
@@ -31,7 +32,7 @@ loglevel notice
 # Specify the log file name. Also the empty string can be used to force
 # Sentinel to log on the standard output. Note that if you use standard
 # output for logging but daemonize, logs will be sent to /dev/null
-logfile ""
+logfile /var/log/valkey/sentinel-default.log
 
 # To enable logging to the system logger, just set 'syslog-enabled' to yes,
 # and optionally update the other syslog parameters to suit your needs.
diff --git a/valkey.conf b/valkey.conf
index 95fb8d0f1..6b520454c 100644
--- a/valkey.conf
+++ b/valkey.conf
@@ -321,7 +321,7 @@ daemonize no
 # The default is "no". To run under upstart/systemd, you can simply uncomment
 # the line below:
 #
-# supervised auto
+supervised systemd
 
 # If a pid file is specified, the server writes it where specified at startup
 # and removes it at exit.
@@ -335,7 +335,7 @@ daemonize no
 #
 # Note that on modern Linux systems "/run/valkey.pid" is more conforming
 # and should be used instead.
-pidfile /var/run/valkey_6379.pid
+pidfile /run/valkey/default.pid
 
 # Specify the server verbosity level.
 # This can be one of:
@@ -349,7 +349,8 @@ loglevel notice
 # Specify the log file name. Also the empty string can be used to force
 # the server to log on the standard output. Note that if you use standard
 # output for logging but daemonize, logs will be sent to /dev/null
-logfile ""
+# logfile ""
+logfile /var/log/valkey/default.log
 
 # To enable logging to the system logger, just set 'syslog-enabled' to yes,
 # and optionally update the other syslog parameters to suit your needs.
@@ -504,7 +505,7 @@ rdb-del-sync-files no
 # The Append Only File will also be created inside this directory.
 #
 # Note that you must specify a directory here, not a file name.
-dir ./
+dir /var/lib/valkey/default/
 
 ################################# REPLICATION #################################