diff --git a/util/docker/common/prepare.sh b/util/docker/common/prepare.sh
index b50f9aa2b..60b84ed7a 100644
--- a/util/docker/common/prepare.sh
+++ b/util/docker/common/prepare.sh
@@ -48,7 +48,7 @@ mkdir -p /etc/my_init.d
 
 # Install other common scripts.
 apt-get install -y --no-install-recommends \
-    tini gosu curl wget tar zip unzip xz-utils git rsync tzdata gnupg gpg-agent openssh-client
+    lsb-release tini gosu curl wget tar zip unzip xz-utils git rsync tzdata gnupg gpg-agent openssh-client
 
 # Add scripts
 cp -rT /bd_build/scripts/ /usr/local/bin
diff --git a/util/docker/redis/service.minimal/redis.conf b/util/docker/redis/service.minimal/redis.conf
index d472c26bb..938e6e936 100644
--- a/util/docker/redis/service.minimal/redis.conf
+++ b/util/docker/redis/service.minimal/redis.conf
@@ -1,6 +1,6 @@
 [program:redis]
-command=redis-server /etc/redis/redis.conf
-user=redis
+command=keydb-server /etc/redis/redis.conf
+user=keydb
 priority=100
 numprocs=1
 autostart=true
diff --git a/util/docker/redis/setup/keydb.sh b/util/docker/redis/setup/keydb.sh
new file mode 100644
index 000000000..5ebad9d9a
--- /dev/null
+++ b/util/docker/redis/setup/keydb.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+set -e
+set -x
+
+echo "deb https://download.keydb.dev/open-source-dist $(lsb_release -sc) main" | tee /etc/apt/sources.list.d/keydb.list
+wget -O /etc/apt/trusted.gpg.d/keydb.gpg https://download.keydb.dev/open-source-dist/keyring.gpg
+
+apt-get update
+apt-get install -y --no-install-recommends keydb-tools
+
+mkdir -p /etc/redis
+chown -R keydb:keydb /etc/redis
+cp /bd_build/redis/redis/redis.conf /etc/redis/redis.conf
+
+mkdir -p /run/redis
+chown keydb:keydb /run/redis
diff --git a/util/docker/redis/setup/redis.sh b/util/docker/redis/setup/redis.sh
deleted file mode 100644
index 442b8c40f..000000000
--- a/util/docker/redis/setup/redis.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-set -e
-set -x
-
-apt-get install -y --no-install-recommends redis-server
-
-cp /bd_build/redis/redis/redis.conf /etc/redis/redis.conf
-chown redis:redis /etc/redis/redis.conf
-
-mkdir -p /run/redis
-chown redis:redis /run/redis