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 66d7f5d..0a85961 100644
--- a/packages/org.eclipse.epp.package.committers.feature/epp.website.xml
+++ b/packages/org.eclipse.epp.package.committers.feature/epp.website.xml
@@ -37,6 +37,6 @@
   </MoreInfo>
 
   <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-committers-2021-06-M1" />
+  <product name="eclipse-committers-2021-06-M2" />
 
 </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 24b0a74..f6e8997 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-M1" />
+  <product name="eclipse-cpp-2021-06-M2" />
 
 </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 fbc5164..251b6e7 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-M1" />
+  <product name="eclipse-dsl-2021-06-M2" />
 
 </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 331261b..f176eab 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-M1" />
+  <product name="eclipse-embedcpp-2021-06-M2" />
 
 </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 4590ca6..173dd97 100644
--- a/packages/org.eclipse.epp.package.java.feature/epp.website.xml
+++ b/packages/org.eclipse.epp.package.java.feature/epp.website.xml
@@ -31,6 +31,6 @@
 
 
 	<!-- name, the name of the product, used in naming the created files. -->
-	<product name="eclipse-java-2021-06-M1" />
+	<product name="eclipse-java-2021-06-M2" />
 
 </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 f864519..b1d2f8d 100644
--- a/packages/org.eclipse.epp.package.jee.feature/epp.website.xml
+++ b/packages/org.eclipse.epp.package.jee.feature/epp.website.xml
@@ -46,6 +46,6 @@
   </MoreInfo>
 
   <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-jee-2021-06-M1" />
+  <product name="eclipse-jee-2021-06-M2" />
 
 </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 2a9834f..587b4d6 100644
--- a/packages/org.eclipse.epp.package.modeling.feature/epp.website.xml
+++ b/packages/org.eclipse.epp.package.modeling.feature/epp.website.xml
@@ -35,6 +35,6 @@
   </MoreInfo>
 
   <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-modeling-2021-06-M1" />
+  <product name="eclipse-modeling-2021-06-M2" />
 
 </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 9f59332..d2bff69 100644
--- a/packages/org.eclipse.epp.package.parallel.feature/epp.website.xml
+++ b/packages/org.eclipse.epp.package.parallel.feature/epp.website.xml
@@ -36,6 +36,6 @@
   </MoreInfo>
 
 	<!-- name, the name of the product, used in naming the created files. -->
-	<product name="eclipse-parallel-2021-06-M1" />
+	<product name="eclipse-parallel-2021-06-M2" />
 
 </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 0db9f18..18e5536 100644
--- a/packages/org.eclipse.epp.package.php.feature/epp.website.xml
+++ b/packages/org.eclipse.epp.package.php.feature/epp.website.xml
@@ -41,6 +41,6 @@
   </MoreInfo>
 
   <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-php-2021-06-M1" />
+  <product name="eclipse-php-2021-06-M2" />
 
 </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 500e02f..1dbc3a1 100644
--- a/packages/org.eclipse.epp.package.rcp.feature/epp.website.xml
+++ b/packages/org.eclipse.epp.package.rcp.feature/epp.website.xml
@@ -36,6 +36,6 @@
   </MoreInfo>
 
   <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-rcp-2021-06-M1" />
+  <product name="eclipse-rcp-2021-06-M2" />
 
 </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 0d9bf8b..396dde1 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-M1" />
+  <product name="eclipse-scout-2021-06-M2" />
 
 </configuration>
diff --git a/releng/org.eclipse.epp.config/parent/pom.xml b/releng/org.eclipse.epp.config/parent/pom.xml
index bca02b4..1712435 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-M1</eclipse.simultaneous.release.id>
+    <eclipse.simultaneous.release.id>2021-06-M2</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 M1 (4.20.0 M1)</eclipse.simultaneous.release.name>
+    <eclipse.simultaneous.release.name>2021-06 M2 (4.20.0 M2)</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 d1a6a16..c562b5e 100755
--- a/releng/org.eclipse.epp.config/tools/promote-a-build.sh
+++ b/releng/org.eclipse.epp.config/tools/promote-a-build.sh
@@ -51,7 +51,7 @@
 <past>2020-09/R</past>
 <past>2020-12/R</past>
 <present>2021-03/R</present>
-<future>2021-06/M1</future>
+<future>2021-06/M2</future>
 </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 4d6ceda..586a200 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=M1
+RELEASE_MILESTONE=M2
 WORKSPACE=${WORKSPACE:-"${PWD}"}
 GIT_REPOSITORY=${GIT_REPOSITORY:-"org.eclipse.epp.packages"}
 BUILT_PACKAGES=$(cat packages.txt)