diff --git a/templates/400_process-debian.yaml.tt2 b/templates/400_process-debian.yaml.tt2
index 3c62ab1..7658d3f 100644
--- a/templates/400_process-debian.yaml.tt2
+++ b/templates/400_process-debian.yaml.tt2
@@ -17,9 +17,12 @@ process:
   ntpd:
     running: [% ntp.backend == 'ntpd' ? 'true' : 'false ' %]
 
-  [% database.key_value.flavor %]-server:
+  keydb-server:
     running: true
 
+  redis-server:
+    running: false
+
   rsyslogd:
     running: true
 
diff --git a/templates/510_init-daemons-ngcp.yaml.tt2 b/templates/510_init-daemons-ngcp.yaml.tt2
index e8ba322..73b9109 100644
--- a/templates/510_init-daemons-ngcp.yaml.tt2
+++ b/templates/510_init-daemons-ngcp.yaml.tt2
@@ -96,10 +96,14 @@ service:
     enabled: [% general.process_handler == 'none' && is_lb && pushd.enable == "yes" ? 'true' : 'false' %]
     running: [% is_lb && pushd.enable == "yes" ? 'true' : 'false' %]
 
-  [% database.key_value.flavor %]-server.service:
+  keydb-server.service:
     enabled: [% redis.enable == "yes" ? 'true' : 'false' %]
     running: [% redis.enable == "yes" ? 'true' : 'false' %]
 
+  redis-server.service:
+    enabled: false
+    running: false
+
   slapd.service:
     enabled: [% is_mgmt && ldap.enable == "yes" ? 'true' : 'false' %]
     running: [% is_mgmt && ldap.enable == "yes" ? 'true' : 'false' %]