diff --git a/playbooks/deploy.yml b/playbooks/deploy.yml
index 77f0987..a961e3f 100644
--- a/playbooks/deploy.yml
+++ b/playbooks/deploy.yml
@@ -12,8 +12,8 @@
     tenant: packit # MP+ tenant
     with_tokman: true
     with_fedmsg: true
-    with_redis: false
-    with_redict: true
+    kv_database: "redict"
+    with_kv_database: true
     with_redis_commander: false
     with_flower: false
     with_dashboard: true
@@ -183,20 +183,16 @@
       tags:
         - postgres
 
-    - name: Deploy redis
+    - name: Deploy key-value database ({{ kv_database }})
+      vars:
+        k8s_apply: true
       ansible.builtin.include_tasks: tasks/k8s.yml
       loop:
-        - "{{ lookup('template', '{{ project_dir }}/openshift/redis.yml.j2') }}"
-      when: with_redis
+        - "{{ lookup('template', '{{ project_dir }}/openshift/{{ kv_database }}.yml.j2') }}"
+      when: with_kv_database
       tags:
+        - kv_database
         - redis
-
-    - name: Deploy redict
-      ansible.builtin.include_tasks: tasks/k8s.yml
-      loop:
-        - "{{ lookup('template', '{{ project_dir }}/openshift/redict.yml.j2') }}"
-      when: with_redict
-      tags:
         - redict
 
     - name: Deploy fluentd image stream and config
diff --git a/playbooks/roles/deploy/defaults/main.yml b/playbooks/roles/deploy/defaults/main.yml
index aa3b5b1..8dc3c11 100644
--- a/playbooks/roles/deploy/defaults/main.yml
+++ b/playbooks/roles/deploy/defaults/main.yml
@@ -5,8 +5,8 @@ deployment: "{{ lookup('env', 'DEPLOYMENT') }}" # noqa: var-naming[no-role-prefi
 tenant: packit # noqa: var-naming[no-role-prefix] # MP+ tenant
 with_tokman: true # noqa: var-naming[no-role-prefix]
 with_fedmsg: true # noqa: var-naming[no-role-prefix]
-with_redis: false # noqa: var-naming[no-role-prefix]
-with_redict: true # noqa: var-naming[no-role-prefix]
+kv_database: "redict" # noqa: var-naming[no-role-prefix]
+with_kv_database: true # noqa: var-naming[no-role-prefix]
 with_redis_commander: false # noqa: var-naming[no-role-prefix]
 with_flower: false # noqa: var-naming[no-role-prefix]
 with_dashboard: true # noqa: var-naming[no-role-prefix]
diff --git a/playbooks/roles/deploy/tasks/main.yml b/playbooks/roles/deploy/tasks/main.yml
index 0ae4603..78b2e13 100644
--- a/playbooks/roles/deploy/tasks/main.yml
+++ b/playbooks/roles/deploy/tasks/main.yml
@@ -141,20 +141,16 @@
   tags:
     - postgres
 
-- name: Deploy redis
+- name: Deploy key-value database ({{ kv_database }})
+  vars:
+    k8s_apply: true
   ansible.builtin.include_tasks: tasks/k8s.yml
   loop:
-    - "{{ lookup('template', '{{ project_dir }}/openshift/redis.yml.j2') }}"
-  when: with_redis
+    - "{{ lookup('template', '{{ project_dir }}/openshift/{{ kv_database }}.yml.j2') }}"
+  when: with_kv_database
   tags:
+    - kv_database
     - redis
-
-- name: Deploy redict
-  ansible.builtin.include_tasks: tasks/k8s.yml
-  loop:
-    - "{{ lookup('template', '{{ project_dir }}/openshift/redict.yml.j2') }}"
-  when: with_redict
-  tags:
     - redict
 
 - name: Deploy fluentd image stream and config
diff --git a/playbooks/tasks/set-deployment-facts.yml b/playbooks/tasks/set-deployment-facts.yml
index 10987dc..d82c783 100644
--- a/playbooks/tasks/set-deployment-facts.yml
+++ b/playbooks/tasks/set-deployment-facts.yml
@@ -22,8 +22,8 @@
       packit-dashboard: "{{ with_dashboard }}"
       pushgateway: "{{ with_pushgateway }}"
       nginx: "{{ with_pushgateway }}"
-      redis: "{{ with_redis }}"
-      redict: "{{ with_redict }}"
+      redis: "{{ with_kv_database and kv_database == 'redis' }}"
+      redict: "{{ with_kv_database and kv_database == 'redict' }}"
   tags:
     - always
 
diff --git a/playbooks/tasks/set-facts.yml b/playbooks/tasks/set-facts.yml
index 8110128..a66ba25 100644
--- a/playbooks/tasks/set-facts.yml
+++ b/playbooks/tasks/set-facts.yml
@@ -31,27 +31,5 @@
 - name: Set Redis-like hostname
   tags:
     - always
-  block:
-    # Needed for nice message of the sanity check
-    - name: Set default for the hostname
-      ansible.builtin.set_fact:
-        redis_hostname: None
-
-    - name: Set Redict as the hostname
-      ansible.builtin.set_fact:
-        redis_hostname: redict
-      when: with_redict
-
-    - name: Set Redis as the hostname (backward compatibility)
-      ansible.builtin.set_fact:
-        redis_hostname: redis
-      when: with_redis
-
-    - name: Sanity check for deploying exactly one of Redis or Redict
-      ansible.builtin.assert:
-        that: with_redict != with_redis
-        success_msg: |
-          [INFO] Deploying {{ redis_hostname }}
-        fail_msg: |
-          [FAIL] Check vars (‹with_redict› and ‹with_redis›).
-          Cannot deploy none or both of Redis and Redict!
+  ansible.builtin.set_fact:
+    redis_hostname: "{{ kv_database }}"
diff --git a/vars/packit/dev_template.yml b/vars/packit/dev_template.yml
index 2d2ed9c..8ee78cd 100644
--- a/vars/packit/dev_template.yml
+++ b/vars/packit/dev_template.yml
@@ -30,6 +30,9 @@ check_up_to_date: false
 # edit the queue name in secrets/*/fedora.toml
 with_fedmsg: false
 
+# kv_database: redict
+# with_kv_database: true
+
 with_redis_commander: false
 
 with_flower: true
diff --git a/vars/packit/prod_template.yml b/vars/packit/prod_template.yml
index fee7ae9..e91ab23 100644
--- a/vars/packit/prod_template.yml
+++ b/vars/packit/prod_template.yml
@@ -32,6 +32,9 @@ api_key: ""
 # edit the queue name in secrets/*/fedora.toml
 # with_fedmsg: true
 
+# kv_database: redict
+# with_kv_database: true
+
 # with_redis_commander: false
 
 with_flower: true
diff --git a/vars/packit/stg_template.yml b/vars/packit/stg_template.yml
index bf863d8..bc1b143 100644
--- a/vars/packit/stg_template.yml
+++ b/vars/packit/stg_template.yml
@@ -30,6 +30,9 @@ api_key: ""
 # edit the queue name in secrets/*/fedora.toml
 # with_fedmsg: true
 
+# kv_database: redict
+# with_kv_database: true
+
 # with_redis_commander: false
 
 with_flower: true