diff --git a/.github/workflows/pr-title-lint.yml b/.github/workflows/pr-title-lint.yml
index 8342fb5..95b81f8 100644
--- a/.github/workflows/pr-title-lint.yml
+++ b/.github/workflows/pr-title-lint.yml
@@ -1,3 +1,4 @@
+---
 name: PR Title Lint
 on:  # yamllint disable-line rule:truthy
   pull_request:
diff --git a/roles/keyserver/templates/redis_5.conf.j2 b/roles/keyserver/templates/redis_5.conf.j2
index 13537d1..08e9080 100644
--- a/roles/keyserver/templates/redis_5.conf.j2
+++ b/roles/keyserver/templates/redis_5.conf.j2
@@ -215,7 +215,7 @@ always-show-logo yes
 #
 #   save ""
 
-{% if redis_save_to_disk %}
+{% if keyserver_save_to_disk %}
 save 900 1
 save 300 10
 save 60 10000
diff --git a/roles/keyserver/templates/redis_6.conf.j2 b/roles/keyserver/templates/redis_6.conf.j2
index b87b22a..4690fe4 100644
--- a/roles/keyserver/templates/redis_6.conf.j2
+++ b/roles/keyserver/templates/redis_6.conf.j2
@@ -285,7 +285,7 @@ always-show-logo yes
 #
 #   save ""
 
-{% if redis_save_to_disk %}
+{% if keyserver_save_to_disk %}
 save 900 1
 save 300 10
 save 60 10000
diff --git a/roles/keyserver/templates/valkey_7.conf.j2 b/roles/keyserver/templates/valkey_7.conf.j2
index bd06ae0..89c7526 100644
--- a/roles/keyserver/templates/valkey_7.conf.j2
+++ b/roles/keyserver/templates/valkey_7.conf.j2
@@ -333,7 +333,7 @@ daemonize no
 #
 # When the server runs non daemonized, no pid file is created if none is
 # specified in the configuration. When the server is daemonized, the pid file
-# is used even if not specified, defaulting to "/var/run/redis.pid".
+# is used even if not specified, defaulting to "/var/run/valkey.pid".
 #
 # Creating a pid file is best effort: if the server is not able to create it
 # nothing bad happens, the server will start and run normally.
@@ -361,7 +361,7 @@ logfile /var/log/valkey/valkey.log
 # syslog-enabled no
 
 # Specify the syslog identity.
-# syslog-ident redis
+# syslog-ident valkey
 
 # Specify the syslog facility. Must be USER or between LOCAL0-LOCAL7.
 # syslog-facility local0
@@ -440,6 +440,12 @@ locale-collate ""
 #
 # save 3600 1 300 100 60 10000
 
+{% if keyserver_save_to_disk %}
+save 900 1 300 10 60 10000
+{% else %}
+save ""
+{% endif %}
+
 # By default the server will stop accepting writes if RDB snapshots are enabled
 # (at least one save point) and the latest background save failed.
 # This will make the user aware (in a hard way) that data is not persisting
@@ -2269,7 +2275,7 @@ jemalloc-bg-thread yes
 # the bgsave child process. The syntax to specify the cpu list is the same as
 # the taskset command:
 #
-# Set redis server/io threads to cpu affinity 0,2,4,6:
+# Set valkey server/io threads to cpu affinity 0,2,4,6:
 # server_cpulist 0-7:2
 #
 # Set bio threads to cpu affinity 1,3: