diff --git a/inventory/group_vars/mailman b/inventory/group_vars/mailman
index d63c77fb71..c3872709dc 100644
--- a/inventory/group_vars/mailman
+++ b/inventory/group_vars/mailman
@@ -23,4 +23,4 @@ fedmsg_certs:
 postfix_group: mailman
 
 # Used by the mailman role
-mailman_dbserver: db01.phx2.fedoraproject.org
+mailman_db_server: db01.phx2.fedoraproject.org
diff --git a/inventory/group_vars/mailman-stg b/inventory/group_vars/mailman-stg
index 3c3202600a..6bdf6d17a0 100644
--- a/inventory/group_vars/mailman-stg
+++ b/inventory/group_vars/mailman-stg
@@ -32,4 +32,4 @@ virt_install_command: /usr/sbin/virt-install -n {{ inventory_hostname }} -r {{ m
 postfix_group: mailman-stg
 
 # Used by the mailman role
-mailman_dbserver: db02.stg.phx2.fedoraproject.org
+mailman_db_server: db02.stg.phx2.fedoraproject.org
diff --git a/playbooks/groups/mailman.yml b/playbooks/groups/mailman.yml
index 26c9761537..ff1cbac7a9 100644
--- a/playbooks/groups/mailman.yml
+++ b/playbooks/groups/mailman.yml
@@ -116,11 +116,12 @@
 
   roles:
   - role: mailman
-    mailman_mm_db_pass: "{{ mailman_mm_db_pass }}"
-    mailman_hk_admin_db_pass: "{{ mailman_hk_admin_db_pass }}"
-    mailman_hk_db_pass: "{{ mailman_hk_db_pass }}"
-    mailman_ks_admin_db_pass: "{{ mailman_ks_admin_db_pass }}"
-    mailman_ks_db_pass: "{{ mailman_ks_db_pass }}"
+    mailman_mailman_db_pass: "{{ mailman_mm_db_pass }}"
+    mailman_hyperkitty_admin_db_pass: "{{ mailman_hk_admin_db_pass }}"
+    mailman_hyperkitty_db_pass: "{{ mailman_hk_db_pass }}"
+    mailman_kittystore_admin_db_pass: "{{ mailman_ks_admin_db_pass }}"
+    mailman_kittystore_db_pass: "{{ mailman_ks_db_pass }}"
+    mailman_hyperkitty_cookie_key: "{{ mailman_hk_cookie_key }}"
   - fedmsg/base
 
   tasks:
diff --git a/playbooks/hosts/lists-dev.cloud.fedoraproject.org.yml b/playbooks/hosts/lists-dev.cloud.fedoraproject.org.yml
index ffd308bfc9..6e7557fe27 100644
--- a/playbooks/hosts/lists-dev.cloud.fedoraproject.org.yml
+++ b/playbooks/hosts/lists-dev.cloud.fedoraproject.org.yml
@@ -120,12 +120,13 @@
 
   roles:
   - role: mailman
-    mailman_dbserver: localhost
-    mailman_mm_db_pass: "thisisatest"
-    mailman_hk_admin_db_pass: "thisisatest"
-    mailman_hk_db_pass: "thisisatest"
-    mailman_ks_admin_db_pass: "thisisatest"
-    mailman_ks_db_pass: "thisisatest"
+    mailman_db_server: localhost
+    mailman_mailman_db_pass: "thisisatest"
+    mailman_hyperkitty_admin_db_pass: "thisisatest"
+    mailman_hyperkitty_db_pass: "thisisatest"
+    mailman_kittystore_admin_db_pass: "thisisatest"
+    mailman_kittystore_db_pass: "thisisatest"
+    mailman_hyperkitty_cookie_key: "thisisatest"
   - collectd/base
 
   tasks:
diff --git a/roles/mailman/defaults/main.yml b/roles/mailman/defaults/main.yml
index c42d742fc0..748fc7c354 100644
--- a/roles/mailman/defaults/main.yml
+++ b/roles/mailman/defaults/main.yml
@@ -1,9 +1,10 @@
 ---
 mailman_webui_basedir: /srv/webui
 mailman_webui_confdir: "{{ mailman_webui_basedir }}/config"
-mailman_dbserver: localhost
-mailman_mm_db_pass: changeme
-mailman_hk_admin_db_pass: changeme
-mailman_hk_db_pass: changeme
-mailman_ks_admin_db_pass: changeme
-mailman_ks_db_pass: changeme
+mailman_db_server: localhost
+mailman_mailman_db_pass: changeme
+mailman_hyperkitty_admin_db_pass: changeme
+mailman_hyperkitty_db_pass: changeme
+mailman_kittystore_admin_db_pass: changeme
+mailman_kittystore_db_pass: changeme
+mailman_hyperkitty_cookie_key: changeme
diff --git a/roles/mailman/templates/mailman.cfg.j2 b/roles/mailman/templates/mailman.cfg.j2
index 4130dff087..a90d716686 100644
--- a/roles/mailman/templates/mailman.cfg.j2
+++ b/roles/mailman/templates/mailman.cfg.j2
@@ -21,7 +21,7 @@ pid_file: /run/mailman3/master.pid
 
 [database]
 class: mailman.database.postgresql.PostgreSQLDatabase
-url: postgres://mailmanadmin:{{ mailman_mm_db_pass }}@{{ mailman_dbserver }}/mailman
+url: postgres://mailmanadmin:{{ mailman_mailman_db_pass }}@{{ mailman_db_server }}/mailman
 
 [archiver.hyperkitty]
 class: hyperkitty.archiver.Archiver
diff --git a/roles/mailman/templates/settings.py.j2 b/roles/mailman/templates/settings.py.j2
index 3c26eb5216..c539ac03ec 100644
--- a/roles/mailman/templates/settings.py.j2
+++ b/roles/mailman/templates/settings.py.j2
@@ -29,8 +29,8 @@ DATABASES = {
         'ENGINE': 'django.db.backends.postgresql_psycopg2',
         'NAME': 'hyperkitty',
         'USER': 'hyperkittyapp',
-        'PASSWORD': '{{ mailman_hk_db_pass }}',
-        'HOST': '{{ mailman_dbserver }}',
+        'PASSWORD': '{{ mailman_hyperkitty_db_pass }}',
+        'HOST': '{{ mailman_db_server }}',
         'PORT': '',                      # Set to empty string for default.
     }
 }
@@ -115,7 +115,7 @@ STATICFILES_FINDERS = (
 )
 
 # Make this unique, and don't share it with anybody.
-SECRET_KEY = '{{ mailman_hk_cookie_key }}'
+SECRET_KEY = '{{ mailman_hyperkitty_cookie_key }}'
 
 # List of callables that know how to import templates from various sources.
 TEMPLATE_LOADERS = (
@@ -354,7 +354,7 @@ APP_NAME = 'Fedora list archives'
 USE_INTERNAL_AUTH = False
 
 # URL to the KittyStore database
-KITTYSTORE_URL = 'postgres://kittystoreapp:{{ mailman_ks_db_pass }}@{{ mailman_dbserver }}/kittystore'
+KITTYSTORE_URL = 'postgres://kittystoreapp:{{ mailman_kittystore_db_pass }}@{{ mailman_db_server }}/kittystore'
 # Path to the KittyStore search index (writable directory)
 KITTYSTORE_SEARCH_INDEX = '{{ mailman_webui_basedir }}/kittystore_search_index'
 
diff --git a/roles/mailman/templates/settings_admin.py.j2 b/roles/mailman/templates/settings_admin.py.j2
index 8230c7bf1b..161bdb81e2 100644
--- a/roles/mailman/templates/settings_admin.py.j2
+++ b/roles/mailman/templates/settings_admin.py.j2
@@ -16,9 +16,9 @@ DATABASES = {
         'ENGINE': 'django.db.backends.postgresql_psycopg2',
         'NAME': 'hyperkitty',
         'USER': 'hyperkittyadmin',
-        'PASSWORD': '{{ mailman_hk_admin_db_pass }}',
-        'HOST': '{{ mailman_dbserver }}',
+        'PASSWORD': '{{ mailman_hyperkitty_admin_db_pass }}',
+        'HOST': '{{ mailman_db_server }}',
         'PORT': '',
     }
 }
-KITTYSTORE_URL = 'postgres://kittystoreadmin:{{ mailman_ks_admin_db_pass }}@{{ mailman_dbserver }}/kittystore'
+KITTYSTORE_URL = 'postgres://kittystoreadmin:{{ mailman_kittystore_admin_db_pass }}@{{ mailman_db_server }}/kittystore'