diff --git a/packages/org.eclipse.epp.package.committers.feature/epp.website.xml b/packages/org.eclipse.epp.package.committers.feature/epp.website.xml
index e362835..e6964b3 100644
--- a/packages/org.eclipse.epp.package.committers.feature/epp.website.xml
+++ b/packages/org.eclipse.epp.package.committers.feature/epp.website.xml
@@ -34,6 +34,6 @@
   </MoreInfo>
 
   <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-committers-2021-06-RC2" />
+  <product name="eclipse-committers-2021-06-R" />
 
 </configuration>
diff --git a/packages/org.eclipse.epp.package.cpp.feature/epp.website.xml b/packages/org.eclipse.epp.package.cpp.feature/epp.website.xml
index 0c5202d..6fdeebf 100644
--- a/packages/org.eclipse.epp.package.cpp.feature/epp.website.xml
+++ b/packages/org.eclipse.epp.package.cpp.feature/epp.website.xml
@@ -22,6 +22,6 @@
   </packageMetaData>
 
   <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-cpp-2021-06-RC2" />
+  <product name="eclipse-cpp-2021-06-R" />
 
 </configuration>
diff --git a/packages/org.eclipse.epp.package.dsl.feature/epp.website.xml b/packages/org.eclipse.epp.package.dsl.feature/epp.website.xml
index 1f8939d..63464f7 100644
--- a/packages/org.eclipse.epp.package.dsl.feature/epp.website.xml
+++ b/packages/org.eclipse.epp.package.dsl.feature/epp.website.xml
@@ -27,6 +27,6 @@
   </MoreInfo>
 
   <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-dsl-2021-06-RC2" />
+  <product name="eclipse-dsl-2021-06-R" />
 
 </configuration>
diff --git a/packages/org.eclipse.epp.package.embedcpp.feature/epp.website.xml b/packages/org.eclipse.epp.package.embedcpp.feature/epp.website.xml
index fe23595..8b18bc3 100644
--- a/packages/org.eclipse.epp.package.embedcpp.feature/epp.website.xml
+++ b/packages/org.eclipse.epp.package.embedcpp.feature/epp.website.xml
@@ -29,6 +29,6 @@
   </packageMetaData>
 
   <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-embedcpp-2021-06-RC2" />
+  <product name="eclipse-embedcpp-2021-06-R" />
 
 </configuration>
diff --git a/packages/org.eclipse.epp.package.java.feature/epp.website.xml b/packages/org.eclipse.epp.package.java.feature/epp.website.xml
index 9d91f6a..3062eaa 100644
--- a/packages/org.eclipse.epp.package.java.feature/epp.website.xml
+++ b/packages/org.eclipse.epp.package.java.feature/epp.website.xml
@@ -28,6 +28,6 @@
 
 
 	<!-- name, the name of the product, used in naming the created files. -->
-	<product name="eclipse-java-2021-06-RC2" />
+	<product name="eclipse-java-2021-06-R" />
 
 </configuration>
diff --git a/packages/org.eclipse.epp.package.jee.feature/epp.website.xml b/packages/org.eclipse.epp.package.jee.feature/epp.website.xml
index d53a0af..b4d3633 100644
--- a/packages/org.eclipse.epp.package.jee.feature/epp.website.xml
+++ b/packages/org.eclipse.epp.package.jee.feature/epp.website.xml
@@ -35,6 +35,6 @@
   </MoreInfo>
 
   <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-jee-2021-06-RC2" />
+  <product name="eclipse-jee-2021-06-R" />
 
 </configuration>
diff --git a/packages/org.eclipse.epp.package.modeling.feature/epp.website.xml b/packages/org.eclipse.epp.package.modeling.feature/epp.website.xml
index 816cf6c..ed9f465 100644
--- a/packages/org.eclipse.epp.package.modeling.feature/epp.website.xml
+++ b/packages/org.eclipse.epp.package.modeling.feature/epp.website.xml
@@ -32,6 +32,6 @@
   </MoreInfo>
 
   <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-modeling-2021-06-RC2" />
+  <product name="eclipse-modeling-2021-06-R" />
 
 </configuration>
diff --git a/packages/org.eclipse.epp.package.parallel.feature/epp.website.xml b/packages/org.eclipse.epp.package.parallel.feature/epp.website.xml
index ee8c3db..b8d9df6 100644
--- a/packages/org.eclipse.epp.package.parallel.feature/epp.website.xml
+++ b/packages/org.eclipse.epp.package.parallel.feature/epp.website.xml
@@ -30,6 +30,6 @@
   </MoreInfo>
 
 	<!-- name, the name of the product, used in naming the created files. -->
-	<product name="eclipse-parallel-2021-06-RC2" />
+	<product name="eclipse-parallel-2021-06-R" />
 
 </configuration>
diff --git a/packages/org.eclipse.epp.package.php.feature/epp.website.xml b/packages/org.eclipse.epp.package.php.feature/epp.website.xml
index 1034204..318a12e 100644
--- a/packages/org.eclipse.epp.package.php.feature/epp.website.xml
+++ b/packages/org.eclipse.epp.package.php.feature/epp.website.xml
@@ -38,6 +38,6 @@
   </MoreInfo>
 
   <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-php-2021-06-RC2" />
+  <product name="eclipse-php-2021-06-R" />
 
 </configuration>
diff --git a/packages/org.eclipse.epp.package.rcp.feature/epp.website.xml b/packages/org.eclipse.epp.package.rcp.feature/epp.website.xml
index 6becb67..1c45968 100644
--- a/packages/org.eclipse.epp.package.rcp.feature/epp.website.xml
+++ b/packages/org.eclipse.epp.package.rcp.feature/epp.website.xml
@@ -27,6 +27,6 @@
   </MoreInfo>
 
   <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-rcp-2021-06-RC2" />
+  <product name="eclipse-rcp-2021-06-R" />
 
 </configuration>
diff --git a/packages/org.eclipse.epp.package.scout.feature/epp.website.xml b/packages/org.eclipse.epp.package.scout.feature/epp.website.xml
index 08ba354..037e3a6 100644
--- a/packages/org.eclipse.epp.package.scout.feature/epp.website.xml
+++ b/packages/org.eclipse.epp.package.scout.feature/epp.website.xml
@@ -33,6 +33,6 @@
   </MoreInfo>
 
   <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-scout-2021-06-RC2" />
+  <product name="eclipse-scout-2021-06-R" />
 
 </configuration>
diff --git a/releng/org.eclipse.epp.config/parent/pom.xml b/releng/org.eclipse.epp.config/parent/pom.xml
index 9f905c7..ecb1f56 100644
--- a/releng/org.eclipse.epp.config/parent/pom.xml
+++ b/releng/org.eclipse.epp.config/parent/pom.xml
@@ -35,11 +35,11 @@
     <!-- The location that is used to assemble the single EPP configuration p2 repository -->
     <eclipse.epp.targetRepository>${eclipse.epp.archiveDirectory}/repository/</eclipse.epp.targetRepository>
     <!-- ID used to generate the filename of the packages -->
-    <eclipse.simultaneous.release.id>2021-06-RC2</eclipse.simultaneous.release.id>
+    <eclipse.simultaneous.release.id>2021-06-R</eclipse.simultaneous.release.id>
     <!-- Timestamp used in various places, e.g. the about dialog (see about.mappings) -->
     <eclipse.simultaneous.release.build>${maven.build.timestamp}</eclipse.simultaneous.release.build>
     <!-- Human readable name of the release, e.g. used in the about dialog (see about.mappings) -->
-    <eclipse.simultaneous.release.name>2021-06 RC2 (4.20.0 RC2)</eclipse.simultaneous.release.name>
+    <eclipse.simultaneous.release.name>2021-06 (4.20.0)</eclipse.simultaneous.release.name>
     <!-- Upstream p2 repository, used as a source for pre-compiled build artifacts -->
     <eclipse.simultaneous.release.repository>https://download.eclipse.org/staging/2021-06/</eclipse.simultaneous.release.repository>
   </properties>
diff --git a/releng/org.eclipse.epp.config/tools/promote-a-build.sh b/releng/org.eclipse.epp.config/tools/promote-a-build.sh
index 56fde84..150d4ce 100755
--- a/releng/org.eclipse.epp.config/tools/promote-a-build.sh
+++ b/releng/org.eclipse.epp.config/tools/promote-a-build.sh
@@ -50,8 +50,8 @@
 <past>2020-06/R</past>
 <past>2020-09/R</past>
 <past>2020-12/R</past>
-<present>2021-03/R</present>
-<future>2021-06/RC2</future>
+<past>2021-03/R</past>
+<present>2021-06/R</present>
 </packages>
 EOM
 $ECHO $SCP release.xml "${SSHUSER}:"${EPP_DOWNLOADS}/downloads/release/release.xml
diff --git a/releng/org.eclipse.epp.config/tools/upload-to-staging.sh b/releng/org.eclipse.epp.config/tools/upload-to-staging.sh
index b09b87a..8f948cf 100755
--- a/releng/org.eclipse.epp.config/tools/upload-to-staging.sh
+++ b/releng/org.eclipse.epp.config/tools/upload-to-staging.sh
@@ -11,7 +11,7 @@
 SCP="scp"
 
 RELEASE_NAME=2021-06
-RELEASE_MILESTONE=RC2
+RELEASE_MILESTONE=R
 WORKSPACE=${WORKSPACE:-"${PWD}"}
 GIT_REPOSITORY=${GIT_REPOSITORY:-"org.eclipse.epp.packages"}
 BUILT_PACKAGES=$(cat packages.txt)