diff --git a/releng/org.eclipse.cdt.repo/category.xml b/releng/org.eclipse.cdt.repo/category.xml
index 8452f9ecba8..c21a1a84962 100644
--- a/releng/org.eclipse.cdt.repo/category.xml
+++ b/releng/org.eclipse.cdt.repo/category.xml
@@ -224,8 +224,6 @@
    <feature id="org.eclipse.remote.proxy.source">
       <category name="remote_sdk"/>
    </feature>
-   <bundle id="org.eclipse.tm.terminal.control" version="0.0.0"/>
-   <bundle id="org.eclipse.tm.terminal.control.source" version="0.0.0"/>
    <bundle id="org.eclipse.cdt.util" version="0.0.0"/>
    <bundle id="org.eclipse.cdt.util.source" version="0.0.0"/>
    <bundle id="org.eclipse.cdt.remote.core" version="0.0.0"/>
@@ -276,6 +274,26 @@
    <bundle id="org.eclipse.cdt.jsoncdb.nvidia.source">
       <category name="extra-jsoncdb"/>
    </bundle>
+   <!-- These are the "old" bundles for terminal view that we need to keep until dependents in SimRel
+      have moved off them. See https://github.com/eclipse-simrel/simrel.build/pull/955 
+      
+      XXX: org.eclipse.tm.terminal.control and connector.* are actually being consumed from CDT's
+      target platform, which means it is republishing an earlier build's version since CDT has
+      cyclical dependencies and CDT is in its own target platform. -->
+   <bundle id="org.eclipse.tm.terminal.control" version="0.0.0"/>
+   <bundle id="org.eclipse.tm.terminal.view.core" version="0.0.0"/>
+   <bundle id="org.eclipse.tm.terminal.view.ui" version="0.0.0"/>
+   <bundle id="org.eclipse.tm.terminal.connector.process" version="0.0.0"/>
+   <bundle id="org.eclipse.tm.terminal.connector.local" version="0.0.0"/>
+   <bundle id="org.eclipse.tm.terminal.connector.ssh" version="0.0.0"/>
+   <bundle id="org.eclipse.tm.terminal.connector.telnet" version="0.0.0"/>
+   <bundle id="org.eclipse.tm.terminal.control.source" version="0.0.0"/>
+   <bundle id="org.eclipse.tm.terminal.view.core.source" version="0.0.0"/>
+   <bundle id="org.eclipse.tm.terminal.view.ui.source" version="0.0.0"/>
+   <bundle id="org.eclipse.tm.terminal.connector.process.source" version="0.0.0"/>
+   <bundle id="org.eclipse.tm.terminal.connector.local.source" version="0.0.0"/>
+   <bundle id="org.eclipse.tm.terminal.connector.ssh.source" version="0.0.0"/>
+   <bundle id="org.eclipse.tm.terminal.connector.telnet.source" version="0.0.0"/>
    <category-def name="main" label="CDT Main Features"/>
    <category-def name="extra" label="CDT Optional Features"/>
    <category-def name="launchbar" label="LaunchBar"/>
diff --git a/releng/org.eclipse.cdt.target/cdt.target b/releng/org.eclipse.cdt.target/cdt.target
index 49f2d75ab36..d226a33cfd9 100644
--- a/releng/org.eclipse.cdt.target/cdt.target
+++ b/releng/org.eclipse.cdt.target/cdt.target
@@ -43,8 +43,14 @@
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<!-- We explicitly have CDT in target platform so that developers can develop org.eclipse.cdt.core/ui without requiring all the projects from CDT in their workspace. -->
-			<repository location="https://download.eclipse.org/tools/cdt/builds/12.1/cdt-12.1.0-rc1/"/>
+			<repository location="https://download.eclipse.org/tools/cdt/releases/12.1/cdt-12.1.0/"/>
 			<unit id="org.eclipse.cdt.feature.group" version="0.0.0" />
+			<!-- See matching comment in category.xml for why these are here -->
+			<unit id="org.eclipse.tm.terminal.control" version="0.0.0" />
+			<unit id="org.eclipse.tm.terminal.connector.process" version="0.0.0"/>
+			<unit id="org.eclipse.tm.terminal.connector.local" version="0.0.0"/>
+			<unit id="org.eclipse.tm.terminal.connector.ssh" version="0.0.0"/>
+			<unit id="org.eclipse.tm.terminal.connector.telnet" version="0.0.0"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<repository location="https://download.eclipse.org/wildwebdeveloper/releases/latest/" />