diff --git a/rap-tools.aggrcon b/rap-tools.aggrcon
index f119c66..135baf1 100644
--- a/rap-tools.aggrcon
+++ b/rap-tools.aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
 <aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/cbi/p2repo/2011/aggregator/1.1.0" label="RAP Tools">
-  <repositories location="https://download.eclipse.org/rt/rap/tools/3.21/RC2-20220608-1222/" description="RAP 3.21 Tools Repository">
+  <repositories location="https://download.eclipse.org/rt/rap/tools/3.21/R-20220608-1222/" description="RAP 3.21 Tools Repository">
     <features name="org.eclipse.rap.tools.feature.feature.group" versionRange="[3.21.0,3.22.0)">
       <categories href="simrel.aggr#//@customCategories[identifier='Web%2C%20XML%2C%20Java%20EE%20and%20OSGi%20Enterprise%20Development']"/>
     </features>
diff --git a/rap.aggrcon b/rap.aggrcon
index e534c81..462fdee 100644
--- a/rap.aggrcon
+++ b/rap.aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
 <aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/cbi/p2repo/2011/aggregator/1.1.0" label="RAP Runtime">
-  <repositories location="https://download.eclipse.org/rt/rap/3.21/RC2-20220608-1222/" description="RAP 3.21 Runtime Repository">
+  <repositories location="https://download.eclipse.org/rt/rap/3.21/R-20220608-1222/" description="RAP 3.21 Runtime Repository">
     <features name="org.eclipse.rap.feature.feature.group" versionRange="[3.21.0,3.22.0)">
       <categories href="simrel.aggr#//@customCategories[identifier='EclipseRT%20Target%20Platform%20Components']"/>
     </features>