diff --git a/playbooks/deploy.yml b/playbooks/deploy.yml
index f9cc696..6e427bd 100644
--- a/playbooks/deploy.yml
+++ b/playbooks/deploy.yml
@@ -191,8 +191,6 @@
       when: with_kv_database
       tags:
         - kv_database
-        - redis
-        - redict
 
     - name: Deploy fluentd image stream and config
       ansible.builtin.include_tasks: tasks/k8s.yml
diff --git a/playbooks/roles/deploy/tasks/main.yml b/playbooks/roles/deploy/tasks/main.yml
index f35e1cc..4316fc2 100644
--- a/playbooks/roles/deploy/tasks/main.yml
+++ b/playbooks/roles/deploy/tasks/main.yml
@@ -149,8 +149,6 @@
   when: with_kv_database
   tags:
     - kv_database
-    - redis
-    - redict
 
 - name: Deploy fluentd image stream and config
   ansible.builtin.include_tasks: tasks/k8s.yml
diff --git a/playbooks/tasks/set-deployment-facts.yml b/playbooks/tasks/set-deployment-facts.yml
index d82c783..24d4200 100644
--- a/playbooks/tasks/set-deployment-facts.yml
+++ b/playbooks/tasks/set-deployment-facts.yml
@@ -24,6 +24,7 @@
       nginx: "{{ with_pushgateway }}"
       redis: "{{ with_kv_database and kv_database == 'redis' }}"
       redict: "{{ with_kv_database and kv_database == 'redict' }}"
+      valkey: "{{ with_kv_database and kv_database == 'valkey' }}"
   tags:
     - always
 
diff --git a/vars/packit/dev_template.yml b/vars/packit/dev_template.yml
index 8ee78cd..b8e0b61 100644
--- a/vars/packit/dev_template.yml
+++ b/vars/packit/dev_template.yml
@@ -30,8 +30,10 @@ check_up_to_date: false
 # edit the queue name in secrets/*/fedora.toml
 with_fedmsg: false
 
-# kv_database: redict
-# with_kv_database: true
+# kv_database options: redis redict valkey
+# Current default on both deployments: valkey
+kv_database: valkey
+with_kv_database: true
 
 with_redis_commander: false
 
diff --git a/vars/packit/prod_template.yml b/vars/packit/prod_template.yml
index c4ff4ba..1048e5a 100644
--- a/vars/packit/prod_template.yml
+++ b/vars/packit/prod_template.yml
@@ -32,7 +32,9 @@ api_key: ""
 # edit the queue name in secrets/*/fedora.toml
 # with_fedmsg: true
 
-# kv_database: valkey
+# kv_database options: redis redict valkey
+# Current default on both deployments: valkey
+kv_database: valkey
 # with_kv_database: true
 
 # with_redis_commander: false
diff --git a/vars/packit/stg_template.yml b/vars/packit/stg_template.yml
index 7040a1e..45bdc42 100644
--- a/vars/packit/stg_template.yml
+++ b/vars/packit/stg_template.yml
@@ -30,7 +30,9 @@ api_key: ""
 # edit the queue name in secrets/*/fedora.toml
 # with_fedmsg: true
 
-# kv_database: valkey
+# kv_database options: redis redict valkey
+# Current default on both deployments: valkey
+kv_database: valkey
 # with_kv_database: true
 
 # with_redis_commander: false