diff --git a/group_vars/maintenance.yml b/group_vars/maintenance.yml
index cdf32b1f2..a61bf22cf 100644
--- a/group_vars/maintenance.yml
+++ b/group_vars/maintenance.yml
@@ -24,6 +24,32 @@ autofs_mount_points:
 # Miniconda role variables (galaxyproject.miniconda)
 conda_prefix: /opt/miniconda
 
+# usegalaxy-eu.bashrc role variables
+bashrc_users:
+  - uname: "{{ galaxy_user.name }}"
+    uhome: "{{ galaxy_user.home }}"
+    gname: "{{ galaxy_group.name }}"
+
+  - uname: stats
+    uhome: /home/stats
+    gname: stats
+
+# hxr.postgres-connection role variables
+pgc_users:
+  - uname: "{{ galaxy_user.name }}"
+    uhome: "{{ galaxy_user.home }}"
+    gname: "{{ galaxy_group.name }}"
+    pguser: "{{ postgres_user }}"
+    pgpass: "{{ postgres_pass }}"
+    pgdatabase: galaxy
+
+  - uname: stats
+    uhome: /home/stats
+    gname: stats
+    pguser: "{{ galaxy_db_ro_user }}"
+    pgpass: "{{ galaxy_db_ro_pass }}"
+    pgdatabase: galaxy
+
 # fs-maintenance
 # Only on the maintenance node
 fsm_maintenance_dir: "/data/dnb01/maintenance"
diff --git a/maintenance.yml b/maintenance.yml
index 6d8dc4700..97c0075d5 100644
--- a/maintenance.yml
+++ b/maintenance.yml
@@ -117,10 +117,6 @@
 
     ## The bashrc needs to be created for several later features.
     - role: usegalaxy-eu.bashrc
-      vars:
-        user_name: "{{ galaxy_user.name }}"
-        user_home: "{{ galaxy_user.home }}"
-        group_name: "{{ galaxy_group.name }}"
 
     # HTCondor (Uncomment when in production and latest version is installed)
     # - usegalaxy_eu.htcondor