diff --git a/releng/CDT.setup b/releng/CDT.setup
index ef615819827..0e738a44309 100644
--- a/releng/CDT.setup
+++ b/releng/CDT.setup
@@ -212,6 +212,8 @@
             name="org.apache.log4j"/>
         <requirement
             name="org.assertj"/>
+        <requirement
+            name="org.eclipse.egit.feature.group"/>
         <requirement
             name="org.eclipse.equinox.executable.feature.group"/>
         <requirement
@@ -258,8 +260,6 @@
             name="org.eclipse.tools.templates.freemarker.java11"/>
         <requirement
             name="org.eclipse.tools.templates.ui"/>
-        <requirement
-            name="org.eclipse.wst.xml_ui.feature.feature.group"/>
         <requirement
             name="org.freemarker"/>
         <requirement
@@ -283,6 +283,8 @@
               url="https://download.eclipse.org/cbi/updates/license/"/>
           <repository
               url="https://download.eclipse.org/eclipse/updates/4.15milestones/S-4.15M3-202002191800/"/>
+          <repository
+              url="https://download.eclipse.org/egit/updates/"/>
           <repository
               url="https://download.eclipse.org/linuxtools/updates-docker-nightly/"/>
           <repository