diff --git a/templates/130_filesys-ngcp.yaml.tt2 b/templates/130_filesys-ngcp.yaml.tt2
index 63cdc53..ed064d4 100644
--- a/templates/130_filesys-ngcp.yaml.tt2
+++ b/templates/130_filesys-ngcp.yaml.tt2
@@ -306,6 +306,21 @@ file:
     linked-to: /ngcp-data/redis
     filetype: symlink
 
+  /ngcp-data/keydb:
+    exists: true
+    mode: "0750"
+    owner: keydb
+    group: keydb
+    filetype: directory
+
+  /var/lib/keydb:
+    exists: true
+    mode: "0777"
+    owner: root
+    group: root
+    linked-to: /ngcp-data/keydb
+    filetype: symlink
+
   /ngcp-data/logs:
     exists: true
     mode: "0755"
diff --git a/templates/200_user-debian.yaml.tt2 b/templates/200_user-debian.yaml.tt2
index ebdc8d0..9b5aae0 100644
--- a/templates/200_user-debian.yaml.tt2
+++ b/templates/200_user-debian.yaml.tt2
@@ -3,6 +3,9 @@ group:
     exists: true
     gid: 1
 
+  keydb:
+    exists: true
+
   kamailio:
     exists: true
 
@@ -45,6 +48,12 @@ user:
         - "/var/run/kamailio"
         - "/run/kamailio"
 
+  keydb:
+    exists: true
+    groups:
+      - keydb
+    home: "/var/lib/keydb"
+
   mysql:
     exists: true
     groups:
diff --git a/templates/400_process-debian.yaml.tt2 b/templates/400_process-debian.yaml.tt2
index de9107b..3c62ab1 100644
--- a/templates/400_process-debian.yaml.tt2
+++ b/templates/400_process-debian.yaml.tt2
@@ -17,7 +17,7 @@ process:
   ntpd:
     running: [% ntp.backend == 'ntpd' ? 'true' : 'false ' %]
 
-  redis-server:
+  [% database.key_value.flavor %]-server:
     running: true
 
   rsyslogd:
diff --git a/templates/510_init-daemons-ngcp.yaml.tt2 b/templates/510_init-daemons-ngcp.yaml.tt2
index 05c2b69..1097eaf 100644
--- a/templates/510_init-daemons-ngcp.yaml.tt2
+++ b/templates/510_init-daemons-ngcp.yaml.tt2
@@ -91,7 +91,7 @@ service:
     enabled: [% general.process_handler == 'none' && is_lb && pushd.enable == "yes" ? 'true' : 'false' %]
     running: [% is_lb && pushd.enable == "yes" ? 'true' : 'false' %]
 
-  redis-server.service:
+  [% database.key_value.flavor %]-server.service:
     enabled: [% redis.enable == "yes" ? 'true' : 'false' %]
     running: [% redis.enable == "yes" ? 'true' : 'false' %]