diff --git a/releng/org.eclipse.epsilon.releng/epsilonUse.setup b/releng/org.eclipse.epsilon.releng/epsilonUse.setup
index 59f7feb..9dd4a23 100644
--- a/releng/org.eclipse.epsilon.releng/epsilonUse.setup
+++ b/releng/org.eclipse.epsilon.releng/epsilonUse.setup
@@ -146,7 +146,7 @@
     </setupTask>
     <description>Creates the workspace and points Eclipse to it, with default preferences pre-configured.</description>
   </setupTask>
-  <version name="2.1"
+  <version name="2.2"
       requiredJavaVersion="1.8">
     <setupTask
         xsi:type="setup.p2:P2Task"
@@ -302,17 +302,17 @@
       <repository
           url="http://download.eclipse.org/releases/2020-06"/>
       <repository
-          url="http://download.eclipse.org/oomph/updates/release"/>
+          url="http://download.eclipse.org/oomph/updates/milestone"/>
       <repository
-          url="http://download.eclipse.org/epsilon/updates/2.1"/>
+          url="http://download.eclipse.org/epsilon/updates/2.2"/>
       <repository
           url="http://download.eclipse.org/emfatic/update"/>
       <repository
-          url="http://download.eclipse.org/tools/orbit/downloads/drops/R20200529191137/repository"/>
+          url="http://download.eclipse.org/tools/orbit/downloads/drops/R20200831200620/repository"/>
       <repository
           url="http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases"/>
     </setupTask>
-    <description>Epsilon v2.1</description>
+    <description>Epsilon v2.2</description>
   </version>
   <version name="Interim"
       requiredJavaVersion="1.8">
@@ -482,6 +482,174 @@
     </setupTask>
     <description>Latest version of Epsilon</description>
   </version>
+  <version name="2.1"
+      requiredJavaVersion="1.8">
+    <setupTask
+        xsi:type="setup.p2:P2Task"
+        label="${scope.product.label} ${scope.product.version.label} tools">
+      <requirement
+          name="org.eclipse.platform.feature.group"/>
+      <requirement
+          name="org.eclipse.pde.feature.group"/>
+      <requirement
+          name="org.eclipse.egit.feature.group"/>
+      <requirement
+          name="org.eclipse.platform.ide"/>
+      <requirement
+          name="org.eclipse.help.feature.group"/>
+      <requirement
+          name="org.eclipse.epp.mpc.feature.group"/>
+      <requirement
+          name="org.eclipse.rcp.feature.group"/>
+      <requirement
+          name="org.eclipse.jdt.feature.group"/>
+      <requirement
+          name="org.eclipse.emf.feature.group"/>
+      <requirement
+          name="org.eclipse.emf.doc.feature.group"/>
+      <requirement
+          name="org.eclipse.emf.common.feature.group"/>
+      <requirement
+          name="org.eclipse.emf.ecore.feature.group"/>
+      <requirement
+          name="org.eclipse.emf.edit.feature.group"/>
+      <requirement
+          name="org.eclipse.emf.edit.ui.feature.group"/>
+      <requirement
+          name="org.eclipse.emf.ecore.edit.feature.group"/>
+      <requirement
+          name="org.eclipse.emf.emfatic.feature.group"/>
+      <requirement
+          name="org.eclipse.emf.transaction.feature.group"/>
+      <requirement
+          name="org.eclipse.emf.workspace.feature.group"/>
+      <requirement
+          name="org.eclipse.emf.query.feature.group"/>
+      <requirement
+          name="org.eclipse.emf.validation.feature.group"/>
+      <requirement
+          name="org.eclipse.emf.validation.doc.feature.group"/>
+      <requirement
+          name="org.eclipse.emf.compare.feature.group"/>
+      <requirement
+          name="org.eclipse.emf.compare.diagram.gmf.feature.group"/>
+      <requirement
+          name="org.eclipse.emf.compare.egit.feature.group"/>
+      <requirement
+          name="org.eclipse.emf.compare.ide.ui.feature.group"/>
+      <requirement
+          name="org.eclipse.emf.databinding.feature.group"/>
+      <requirement
+          name="org.eclipse.emf.databinding.edit.feature.group"/>
+      <requirement
+          name="org.eclipse.emf.mapping.ecore.feature.group"/>
+      <requirement
+          name="org.eclipse.emf.mapping.ecore.editor.feature.group"/>
+      <requirement
+          name="org.eclipse.xsd.feature.group"/>
+      <requirement
+          name="org.eclipse.gmf.feature.group"/>
+      <requirement
+          name="org.eclipse.gmf.runtime.notation.feature.group"/>
+      <requirement
+          name="org.eclipse.gmf.tooling.feature.group"/>
+      <requirement
+          name="org.eclipse.gmf.tooling.runtime.feature.group"/>
+      <requirement
+          name="org.eclipse.gmf.runtime.sdk.feature.group"/>
+      <requirement
+          name="org.eclipse.gmf.sdk.feature.group"/>
+      <requirement
+          name="org.eclipse.gef.feature.group"/>
+      <requirement
+          name="org.eclipse.gef.sdk.feature.group"/>
+      <requirement
+          name="org.eclipse.m2m.qvt.oml.feature.group"/>
+      <requirement
+          name="org.eclipse.m2m.qvt.oml.runtime.feature.group"/>
+      <requirement
+          name="org.eclipse.m2m.qvt.oml.editor.feature.group"/>
+      <requirement
+          name="org.eclipse.uml2.feature.group"/>
+      <requirement
+          name="org.eclipse.uml2.common.feature.group"/>
+      <requirement
+          name="org.eclipse.uml2.common.edit.feature.group"/>
+      <requirement
+          name="org.eclipse.uml2.codegen.ecore.ui.feature.group"/>
+      <requirement
+          name="org.eclipse.uml2.uml.feature.group"/>
+      <requirement
+          name="org.eclipse.uml2.uml.edit.feature.group"/>
+      <requirement
+          name="org.eclipse.uml2.doc.feature.group"/>
+      <requirement
+          name="org.eclipse.emf.codegen.ecore.feature.group"/>
+      <requirement
+          name="org.eclipse.emf.codegen.ecore.ui.feature.group"/>
+      <requirement
+          name="org.eclipse.epsilon.core.feature.feature.group"/>
+      <requirement
+          name="org.eclipse.epsilon.core.dt.feature.feature.group"/>
+      <requirement
+          name="org.eclipse.epsilon.emf.feature.feature.group"/>
+      <requirement
+          name="org.eclipse.epsilon.emf.dt.feature.feature.group"/>
+      <requirement
+          name="org.eclipse.epsilon.uml.feature.feature.group"/>
+      <requirement
+          name="org.eclipse.epsilon.uml.dt.feature.feature.group"/>
+      <requirement
+          name="org.eclipse.epsilon.eugenia.feature.feature.group"/>
+      <requirement
+          name="org.eclipse.epsilon.hutn.feature.feature.group"/>
+      <requirement
+          name="org.eclipse.epsilon.hutn.dt.feature.feature.group"/>
+      <requirement
+          name="org.eclipse.epsilon.eunit.dt.emf.feature.feature.group"/>
+      <requirement
+          name="org.eclipse.epsilon.evl.emf.validation.feature.feature.group"/>
+      <requirement
+          name="org.eclipse.epsilon.ewl.emf.feature.feature.group"/>
+      <requirement
+          name="org.eclipse.epsilon.ewl.gmf.feature.feature.group"/>
+      <requirement
+          name="org.eclipse.epsilon.emc.graphml.feature.feature.group"/>
+      <requirement
+          name="org.eclipse.epsilon.simulink.feature.feature.group"/>
+      <requirement
+          name="org.eclipse.epsilon.simulink.dt.feature.feature.group"/>
+      <requirement
+          name="org.eclipse.epsilon.emc.spreadsheets.feature.feature.group"/>
+      <requirement
+          name="org.eclipse.epsilon.emc.spreadsheets.excel.feature.feature.group"/>
+      <requirement
+          name="org.eclipse.epsilon.emc.spreadsheets.excel.dt.feature.feature.group"/>
+      <requirement
+          name="org.eclipse.epsilon.emc.spreadsheets.google.feature.feature.group"/>
+      <requirement
+          name="org.eclipse.epsilon.emc.spreadsheets.google.dt.feature.feature.group"/>
+      <requirement
+          name="org.eclipse.epsilon.picto.feature.feature.group"/>
+      <requirement
+          name="org.eclipse.epsilon.flexmi.feature.feature.group"/>
+      <requirement
+          name="org.eclipse.epsilon.flexmi.dt.feature.feature.group"/>
+      <repository
+          url="http://download.eclipse.org/releases/2020-06"/>
+      <repository
+          url="http://download.eclipse.org/oomph/updates/release"/>
+      <repository
+          url="http://download.eclipse.org/epsilon/updates/2.1"/>
+      <repository
+          url="http://download.eclipse.org/emfatic/update"/>
+      <repository
+          url="http://download.eclipse.org/tools/orbit/downloads/drops/R20200529191137/repository"/>
+      <repository
+          url="http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases"/>
+    </setupTask>
+    <description>Epsilon v2.1</description>
+  </version>
   <version name="1.5"
       requiredJavaVersion="1.8">
     <setupTask
diff --git a/releng/org.eclipse.epsilon.releng/new_version_tasks.sh b/releng/org.eclipse.epsilon.releng/new_version_tasks.sh
index a750e84..0441e6f 100644
--- a/releng/org.eclipse.epsilon.releng/new_version_tasks.sh
+++ b/releng/org.eclipse.epsilon.releng/new_version_tasks.sh
@@ -1,4 +1,4 @@
-set -u
+set -eu
 
 Downloads=/home/data/httpd/download.eclipse.org/epsilon
 Archives=/home/data/httpd/archive.eclipse.org/epsilon