diff --git a/playbooks/group_vars/xnat.yml b/playbooks/group_vars/xnat.yml
index 47568f24..e6bbb906 100644
--- a/playbooks/group_vars/xnat.yml
+++ b/playbooks/group_vars/xnat.yml
@@ -77,8 +77,6 @@ firewalld_work_zone_open_services:
   - http
   - https
 
-
-
 firewalld_internal_zone_ports:
   - "{{ nginx_upstream_listen_port }}"
 
@@ -97,11 +95,3 @@ nginx_proxy_port: 8080 # tomcat
 nginx_root: /usr/share/tomcat/webapps/ROOT
 nginx_app_access_log: "{{ nginx_log_folder }}/xnat.access.log"
 nginx_app_error_log: "{{ nginx_log_folder }}/xnat.error.log"
-nginx_diffie_helman_size_bits: 2048
-nginx_add_default_server: false # set Tomcat as default server to allow access to XNAT web UI through localhost:8000
-
-# mirsg.xnat.xnat
-# Some times the default admin account hasn't finished creating even after tomcat has started
-# Add a delay here to give the admin account a chance to be created
-# Note, this issue only seems to happen in CI
-xnat_wait_for_tomcat: 15
diff --git a/playbooks/molecule/resources/xnat/inventory/group_vars/all/server.yml b/playbooks/molecule/resources/xnat/inventory/group_vars/all/server.yml
index ecf699f3..5e9471f6 100644
--- a/playbooks/molecule/resources/xnat/inventory/group_vars/all/server.yml
+++ b/playbooks/molecule/resources/xnat/inventory/group_vars/all/server.yml
@@ -36,3 +36,9 @@ xnat_config:
   site_name: MIRSG_XNAT
   site_description: <h1>MIRSG XNAT</h1><p>A test instance of XNAT.
   admin_password: "{{ vault_admin_password }}"
+
+# mirsg.xnat.xnat
+# Some times the default admin account hasn't finished creating even after tomcat has started
+# Add a delay here to give the admin account a chance to be created
+# Note, this issue only seems to happen in CI
+xnat_wait_for_tomcat: 15