diff --git a/group_vars/maintenance.yml b/group_vars/maintenance.yml
index 7b4440ce6..c9e8a2a56 100644
--- a/group_vars/maintenance.yml
+++ b/group_vars/maintenance.yml
@@ -288,26 +288,6 @@ dynmotd_custom:
   - name: Condor
     command: "condor_q -totals | tail -n 2"
 
-# Role: usegalaxy_eu.htcondor
-condor_host: "condor-cm.galaxyproject.eu"
-condor_fs_domain: bi.uni-freiburg.de
-condor_uid_domain: bi.uni-freiburg.de
-condor_allow_write: "10.5.68.0/24, 132.230.223.0/24"
-condor_daemons:
-  - MASTER
-  - SCHEDD
-condor_allow_negotiator: "{{ ansible_default_ipv4.address | default(ansible_all_ipv4_addresses[0]) }},$(CONDOR_HOST)"
-condor_allow_administrator: "$(ALLOW_NEGOTIATOR)"
-condor_system_periodic_hold: "{{ 30 * 24 * 60 * 60 }}"
-condor_system_periodic_remove: "{{ 2 * 24 * 60 * 60 }}"
-condor_network_interface: "{{ ansible_default_ipv4.interface }}"
-condor_extra: |
-  MASTER_UPDATE_INTERVAL = 150
-  SCHEDD_INTERVAL = 60
-  JOB_START_COUNT = 250
-  JOB_START_DELAY = 0
-  CLAIM_WORKLIFE = 120
-
 # Role: usegalaxy-eu.galaxy-slurp
 galaxy_slurper: galaxy
 galaxy_slurp_influx_pass: "{{ influxdb.node.password }}"
diff --git a/hosts b/hosts
index f4f308a6c..b75b49d49 100644
--- a/hosts
+++ b/hosts
@@ -114,6 +114,7 @@ ansible_group_priority=4
 
 [htcondor-secondary-submit]
 nspawn-htcondor.sn06.galaxyproject.eu ansible_host=127.0.0.1 ansible_port=2222 ansible_ssh_user=root ansible_ssh_common_args='-o HostKeyAlias=nspawn-htcondor.sn06.galaxyproject.eu -o ProxyCommand="ssh -W %h:%p -q centos@sn06.galaxyproject.eu"'
+maintenance.galaxyproject.eu
 
 [htcondor-secondary-submit:vars]
 ansible_group_priority=4
diff --git a/htcondor.yml b/htcondor.yml
index 78b973cc5..1582c7409 100644
--- a/htcondor.yml
+++ b/htcondor.yml
@@ -294,11 +294,11 @@
       when: htcondor_role_submit
     - grycap.htcondor
     - name: usegalaxy-eu.htcondor_release
-      when: htcondor_role_submit
+      when: htcondor_role_submit and inventory_hostname != "maintenance.galaxyproject.eu"
     - name: usegalaxy-eu.fix-stop-ITs
-      when: htcondor_role_submit
+      when: htcondor_role_submit and inventory_hostname != "maintenance.galaxyproject.eu"
     - name: usegalaxy-eu.remove-orphan-condor-jobs
-      when: htcondor_role_submit
+      when: htcondor_role_submit and inventory_hostname != "maintenance.galaxyproject.eu"
   post_tasks:
     - name: Add /usr/local/bin to Galaxy's PATH in bashrc file. (usegalaxy-eu.fix-stop-ITs)
       when: htcondor_role_submit
diff --git a/maintenance.yml b/maintenance.yml
index 4b0dbbb1d..f2484c37f 100644
--- a/maintenance.yml
+++ b/maintenance.yml
@@ -116,7 +116,6 @@
     - hxr.monitor-galaxy
     - usegalaxy-eu.monitoring
     - usegalaxy-eu.bashrc
-    - usegalaxy_eu.htcondor
     - usegalaxy-eu.dynmotd
     - ssh-host-sign
     - hxr.postgres-connection