diff --git a/org.eclipse.mylyn.releng/oomph/Mylyn.setup b/org.eclipse.mylyn.releng/oomph/Mylyn.setup
index 7063f82..0dcc02a 100755
--- a/org.eclipse.mylyn.releng/oomph/Mylyn.setup
+++ b/org.eclipse.mylyn.releng/oomph/Mylyn.setup
@@ -154,6 +154,19 @@
       <requirement
           name="org.eclipse.sdk.feature.group"/>
       <repositoryList
+          name="2020-06">
+        <repository
+            url="http://download.eclipse.org/releases/2020-06"/>
+        <repository
+            url="http://download.eclipse.org/cbi/updates/license"/>
+        <repository
+            url="http://download.eclipse.org/mylyn/snapshots/weekly"/>
+        <repository
+            url="http://download.eclipse.org/eclipse/updates/3.8"/>
+        <repository
+            url="http://download.eclipse.org/tools/orbit/downloads/drops/R20200224183213/repository"/>
+      </repositoryList>
+      <repositoryList
           name="2020-03">
         <repository
             url="http://download.eclipse.org/releases/2020-03"/>
@@ -164,7 +177,7 @@
         <repository
             url="http://download.eclipse.org/eclipse/updates/3.8"/>
         <repository
-            url="http://download.eclipse.org/tools/orbit/downloads/drops/R20181128170323/repository"/>
+            url="http://download.eclipse.org/tools/orbit/downloads/drops/R20200224183213/repository"/>
       </repositoryList>
       <repositoryList
           name="2019-12">
@@ -975,59 +988,64 @@
           <sourceLocator
               rootFolder="${git.clone.mylyn.versions.location}"/>
           <repositoryList
+              name="2020-06">
+            <repository
+                url="https://dl.bintray.com/subclipse/archive/release/1.8.x"/>
+          </repositoryList>
+          <repositoryList
               name="2020-03">
             <repository
-                url="http://subclipse.tigris.org/update_1.8.x"/>
+                url="https://dl.bintray.com/subclipse/archive/release/1.8.x"/>
           </repositoryList>
           <repositoryList
               name="2019-12">
             <repository
-                url="http://subclipse.tigris.org/update_1.8.x"/>
+                url="https://dl.bintray.com/subclipse/archive/release/1.8.x"/>
           </repositoryList>
           <repositoryList
               name="2019-09">
             <repository
-                url="http://subclipse.tigris.org/update_1.8.x"/>
+                url="https://dl.bintray.com/subclipse/archive/release/1.8.x"/>
           </repositoryList>
           <repositoryList
               name="2019-06">
             <repository
-                url="http://subclipse.tigris.org/update_1.8.x"/>
+                url="https://dl.bintray.com/subclipse/archive/release/1.8.x"/>
           </repositoryList>
           <repositoryList
               name="2019-03">
             <repository
-                url="http://subclipse.tigris.org/update_1.8.x"/>
+                url="https://dl.bintray.com/subclipse/archive/release/1.8.x"/>
           </repositoryList>
           <repositoryList
               name="2018-12">
             <repository
-                url="http://subclipse.tigris.org/update_1.8.x"/>
+                url="https://dl.bintray.com/subclipse/archive/release/1.8.x"/>
           </repositoryList>
           <repositoryList
               name="2018-09">
             <repository
-                url="http://subclipse.tigris.org/update_1.8.x"/>
+                url="https://dl.bintray.com/subclipse/archive/release/1.8.x"/>
           </repositoryList>
           <repositoryList
               name="Photon">
             <repository
-                url="http://subclipse.tigris.org/update_1.8.x"/>
+                url="https://dl.bintray.com/subclipse/archive/release/1.8.x"/>
           </repositoryList>
           <repositoryList
               name="Oxygen">
             <repository
-                url="http://subclipse.tigris.org/update_1.8.x"/>
+                url="https://dl.bintray.com/subclipse/archive/release/1.8.x"/>
           </repositoryList>
           <repositoryList
               name="Neon">
             <repository
-                url="http://subclipse.tigris.org/update_1.8.x"/>
+                url="https://dl.bintray.com/subclipse/archive/release/1.8.x"/>
           </repositoryList>
           <repositoryList
               name="Mars">
             <repository
-                url="http://subclipse.tigris.org/update_1.8.x"/>
+                url="https://dl.bintray.com/subclipse/archive/release/1.8.x"/>
           </repositoryList>
         </targlet>
       </setupTask>
@@ -1156,8 +1174,7 @@
       <setupTask
           xsi:type="git:GitCloneTask"
           id="git.clone.mylyn.commons.simple"
-          remoteURI="mylyn/org.eclipse.mylyn.commons"
-          userID="">
+          remoteURI="mylyn/org.eclipse.mylyn.commons">
         <annotation
             source="http://www.eclipse.org/oomph/setup/InducedChoices">
           <detail
@@ -1598,34 +1615,59 @@
           <sourceLocator
               rootFolder="${git.clone.mylyn.versions.simple.location}"/>
           <repositoryList
+              name="2020-03">
+            <repository
+                url="https://dl.bintray.com/subclipse/archive/release/1.8.x"/>
+          </repositoryList>
+          <repositoryList
+              name="2019-12">
+            <repository
+                url="https://dl.bintray.com/subclipse/archive/release/1.8.x"/>
+          </repositoryList>
+          <repositoryList
+              name="2019-09">
+            <repository
+                url="https://dl.bintray.com/subclipse/archive/release/1.8.x"/>
+          </repositoryList>
+          <repositoryList
+              name="2019-06">
+            <repository
+                url="https://dl.bintray.com/subclipse/archive/release/1.8.x"/>
+          </repositoryList>
+          <repositoryList
+              name="2019-03">
+            <repository
+                url="https://dl.bintray.com/subclipse/archive/release/1.8.x"/>
+          </repositoryList>
+          <repositoryList
               name="2018-12">
             <repository
-                url="http://subclipse.tigris.org/update_1.8.x"/>
+                url="https://dl.bintray.com/subclipse/archive/release/1.8.x"/>
           </repositoryList>
           <repositoryList
               name="2018-09">
             <repository
-                url="http://subclipse.tigris.org/update_1.8.x"/>
+                url="https://dl.bintray.com/subclipse/archive/release/1.8.x"/>
           </repositoryList>
           <repositoryList
               name="Photon">
             <repository
-                url="http://subclipse.tigris.org/update_1.8.x"/>
+                url="https://dl.bintray.com/subclipse/archive/release/1.8.x"/>
           </repositoryList>
           <repositoryList
               name="Oxygen">
             <repository
-                url="http://subclipse.tigris.org/update_1.8.x"/>
+                url="https://dl.bintray.com/subclipse/archive/release/1.8.x"/>
           </repositoryList>
           <repositoryList
               name="Neon">
             <repository
-                url="http://subclipse.tigris.org/update_1.8.x"/>
+                url="https://dl.bintray.com/subclipse/archive/release/1.8.x"/>
           </repositoryList>
           <repositoryList
               name="Mars">
             <repository
-                url="http://subclipse.tigris.org/update_1.8.x"/>
+                url="https://dl.bintray.com/subclipse/archive/release/1.8.x"/>
           </repositoryList>
         </targlet>
       </setupTask>
@@ -1740,6 +1782,355 @@
     </project>
     <description>Advanced Setup</description>
   </project>
+  <project name="DeveloperAddons"
+      label="Developer Addons">
+    <setupTask
+        xsi:type="setup.p2:P2Task"
+        label="Additionals">
+      <requirement
+          name="org.eclipse.wst.web_ui.feature.feature.group"/>
+      <requirement
+          name="de.jcup.basheditor.feature.group"/>
+      <requirement
+          name="org.eclipse.linuxtools.docker.feature.feature.group"/>
+      <requirement
+          name="org.eclipse.linuxtools.docker.editor.ls.feature.feature.group"/>
+      <requirement
+          name="org.eclipse.linuxtools.docker.tests.feature.feature.group"/>
+      <requirement
+          name="org.eclipse.linuxtools.jdt.docker.launcher.feature.feature.group"/>
+      <requirement
+          name="org.eclipse.linuxtools.vagrant.feature.feature.group"/>
+      <requirement
+          name="Docker Client Dependencies"/>
+      <requirement
+          name="org.aopalliance"/>
+      <requirement
+          name="org.apache.commons.codec"/>
+      <requirement
+          name="org.apache.commons.compress"/>
+      <requirement
+          name="org.apache.httpcomponents.httpclient"/>
+      <requirement
+          name="org.apache.httpcomponents.httpcore"/>
+      <requirement
+          name="org.objectweb.asm.analysis"/>
+      <requirement
+          name="org.objectweb.asm"/>
+      <requirement
+          name="org.objectweb.asm.tree"/>
+      <requirement
+          name="org.objectweb.asm.util"/>
+      <requirement
+          name="org.bouncycastle.bcpkix"/>
+      <requirement
+          name="org.bouncycastle.bcprov"/>
+      <requirement
+          name="com.spotify.docker.client"/>
+      <requirement
+          name="com.spotify.docker.client.source"/>
+      <requirement
+          name="com.google.guava"/>
+      <requirement
+          name="org.glassfish.hk2.api"/>
+      <requirement
+          name="org.glassfish.hk2.utils"/>
+      <requirement
+          name="com.fasterxml.jackson.core.jackson-annotations"/>
+      <requirement
+          name="com.fasterxml.jackson.core.jackson-core"/>
+      <requirement
+          name="com.fasterxml.jackson.core.jackson-databind"/>
+      <requirement
+          name="com.fasterxml.jackson.datatype.jackson-datatype-guava"/>
+      <requirement
+          name="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base"/>
+      <requirement
+          name="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider"/>
+      <requirement
+          name="javax.xml.stream"/>
+      <requirement
+          name="javassist"/>
+      <requirement
+          name="javax.ws.rs"/>
+      <requirement
+          name="org.glassfish.jersey.apache.connector"/>
+      <requirement
+          name="org.glassfish.jersey.core.jersey-client"/>
+      <requirement
+          name="org.glassfish.jersey.core.jersey-common"/>
+      <requirement
+          name="org.glassfish.jersey.core.jersey-server"/>
+      <requirement
+          name="org.glassfish.jersey.ext.entityfiltering"/>
+      <requirement
+          name="org.glassfish.jersey.media.jersey-media-json-jackson"/>
+      <requirement
+          name="org.glassfish.jersey.bundles.repackaged.jersey-guava"/>
+      <requirement
+          name="com.github.jnr.jffi.native"/>
+      <requirement
+          name="com.github.jnr.jffi"/>
+      <requirement
+          name="com.github.jnr.constants"/>
+      <requirement
+          name="com.github.jnr.enxio"/>
+      <requirement
+          name="com.github.jnr.ffi"/>
+      <requirement
+          name="com.github.jnr.posix"/>
+      <requirement
+          name="com.github.jnr.unixsocket"/>
+      <requirement
+          name="org.glassfish.hk2.osgi-resource-locator"/>
+      <requirement
+          name="jnr.x86asm"/>
+      <requirement
+          name="org.glassfish.hk2.locator"/>
+      <requirement
+          name="org.slf4j.api"/>
+      <requirement
+          name="javax.xml.bind"/>
+      <requirement
+          name="Docker Editor Dependencies"/>
+      <requirement
+          name="org.eclipse.lsp4e"/>
+      <requirement
+          name="Docker Test Dependencies"/>
+      <requirement
+          name="org.assertj"/>
+      <requirement
+          name="org.mockito"/>
+      <requirement
+          name="org.objenesis"/>
+      <requirement
+          name="org.eclipse.reddeer.common"/>
+      <requirement
+          name="org.eclipse.reddeer.core"/>
+      <requirement
+          name="org.eclipse.reddeer.direct"/>
+      <requirement
+          name="org.eclipse.reddeer.eclipse"/>
+      <requirement
+          name="org.eclipse.reddeer.jface"/>
+      <requirement
+          name="org.eclipse.reddeer.junit"/>
+      <requirement
+          name="org.eclipse.reddeer.junit.extension"/>
+      <requirement
+          name="org.eclipse.reddeer.requirements"/>
+      <requirement
+          name="org.eclipse.reddeer.swt"/>
+      <requirement
+          name="org.eclipse.reddeer.ui"/>
+      <requirement
+          name="org.eclipse.reddeer.jdt.junit"/>
+      <requirement
+          name="org.eclipse.reddeer.uiforms"/>
+      <requirement
+          name="org.eclipse.reddeer.workbench"/>
+      <requirement
+          name="org.eclipse.reddeer.workbench.core"/>
+      <requirement
+          name="net.bytebuddy.byte-buddy"/>
+      <requirement
+          name="net.bytebuddy.byte-buddy-agent"/>
+      <repository
+          url="https://dl.bintray.com/de-jcup/basheditor"/>
+      <repository
+          url="https://download.eclipse.org/linuxtools/update-docker/"/>
+      <repository
+          url="http://download.eclipse.org/tools/orbit/downloads/drops/R20200224183213/repository"/>
+    </setupTask>
+    <project
+        name="HTMLEditor"
+        label="HTML Editor">
+      <setupTask
+          xsi:type="setup.p2:P2Task"
+          label="Additionals">
+        <requirement
+            name="org.eclipse.wst.web_ui.feature.feature.group"/>
+      </setupTask>
+      <stream
+          name="master"
+          label="master"/>
+    </project>
+    <project
+        name="BashEditor"
+        label="Bash Editor">
+      <setupTask
+          xsi:type="setup.p2:P2Task"
+          label="Additionals">
+        <requirement
+            name="de.jcup.basheditor.feature.group"/>
+        <repository
+            url="https://dl.bintray.com/de-jcup/basheditor"/>
+      </setupTask>
+      <stream
+          name="master"
+          label="master"/>
+    </project>
+    <project
+        name="Docker"
+        label="Docker">
+      <setupTask
+          xsi:type="setup.p2:P2Task"
+          label="Additionals">
+        <requirement
+            name="org.eclipse.linuxtools.docker.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.linuxtools.docker.editor.ls.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.linuxtools.docker.tests.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.linuxtools.jdt.docker.launcher.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.linuxtools.vagrant.feature.feature.group"/>
+        <requirement
+            name="Docker Client Dependencies"/>
+        <requirement
+            name="org.aopalliance"/>
+        <requirement
+            name="org.apache.commons.codec"/>
+        <requirement
+            name="org.apache.commons.compress"/>
+        <requirement
+            name="org.apache.httpcomponents.httpclient"/>
+        <requirement
+            name="org.apache.httpcomponents.httpcore"/>
+        <requirement
+            name="org.objectweb.asm.analysis"/>
+        <requirement
+            name="org.objectweb.asm"/>
+        <requirement
+            name="org.objectweb.asm.tree"/>
+        <requirement
+            name="org.objectweb.asm.util"/>
+        <requirement
+            name="org.bouncycastle.bcpkix"/>
+        <requirement
+            name="org.bouncycastle.bcprov"/>
+        <requirement
+            name="com.spotify.docker.client"/>
+        <requirement
+            name="com.spotify.docker.client.source"/>
+        <requirement
+            name="com.google.guava"/>
+        <requirement
+            name="org.glassfish.hk2.api"/>
+        <requirement
+            name="org.glassfish.hk2.utils"/>
+        <requirement
+            name="com.fasterxml.jackson.core.jackson-annotations"/>
+        <requirement
+            name="com.fasterxml.jackson.core.jackson-core"/>
+        <requirement
+            name="com.fasterxml.jackson.core.jackson-databind"/>
+        <requirement
+            name="com.fasterxml.jackson.datatype.jackson-datatype-guava"/>
+        <requirement
+            name="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base"/>
+        <requirement
+            name="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider"/>
+        <requirement
+            name="javax.xml.stream"/>
+        <requirement
+            name="javassist"/>
+        <requirement
+            name="javax.ws.rs"/>
+        <requirement
+            name="org.glassfish.jersey.apache.connector"/>
+        <requirement
+            name="org.glassfish.jersey.core.jersey-client"/>
+        <requirement
+            name="org.glassfish.jersey.core.jersey-common"/>
+        <requirement
+            name="org.glassfish.jersey.core.jersey-server"/>
+        <requirement
+            name="org.glassfish.jersey.ext.entityfiltering"/>
+        <requirement
+            name="org.glassfish.jersey.media.jersey-media-json-jackson"/>
+        <requirement
+            name="org.glassfish.jersey.bundles.repackaged.jersey-guava"/>
+        <requirement
+            name="com.github.jnr.jffi.native"/>
+        <requirement
+            name="com.github.jnr.jffi"/>
+        <requirement
+            name="com.github.jnr.constants"/>
+        <requirement
+            name="com.github.jnr.enxio"/>
+        <requirement
+            name="com.github.jnr.ffi"/>
+        <requirement
+            name="com.github.jnr.posix"/>
+        <requirement
+            name="com.github.jnr.unixsocket"/>
+        <requirement
+            name="org.glassfish.hk2.osgi-resource-locator"/>
+        <requirement
+            name="jnr.x86asm"/>
+        <requirement
+            name="org.glassfish.hk2.locator"/>
+        <requirement
+            name="org.slf4j.api"/>
+        <requirement
+            name="javax.xml.bind"/>
+        <requirement
+            name="Docker Editor Dependencies"/>
+        <requirement
+            name="org.eclipse.lsp4e"/>
+        <requirement
+            name="Docker Test Dependencies"/>
+        <requirement
+            name="org.assertj"/>
+        <requirement
+            name="org.mockito"/>
+        <requirement
+            name="org.objenesis"/>
+        <requirement
+            name="org.eclipse.reddeer.common"/>
+        <requirement
+            name="org.eclipse.reddeer.core"/>
+        <requirement
+            name="org.eclipse.reddeer.direct"/>
+        <requirement
+            name="org.eclipse.reddeer.eclipse"/>
+        <requirement
+            name="org.eclipse.reddeer.jface"/>
+        <requirement
+            name="org.eclipse.reddeer.junit"/>
+        <requirement
+            name="org.eclipse.reddeer.junit.extension"/>
+        <requirement
+            name="org.eclipse.reddeer.requirements"/>
+        <requirement
+            name="org.eclipse.reddeer.swt"/>
+        <requirement
+            name="org.eclipse.reddeer.ui"/>
+        <requirement
+            name="org.eclipse.reddeer.jdt.junit"/>
+        <requirement
+            name="org.eclipse.reddeer.uiforms"/>
+        <requirement
+            name="org.eclipse.reddeer.workbench"/>
+        <requirement
+            name="org.eclipse.reddeer.workbench.core"/>
+        <requirement
+            name="net.bytebuddy.byte-buddy"/>
+        <requirement
+            name="net.bytebuddy.byte-buddy-agent"/>
+        <repository
+            url="https://download.eclipse.org/linuxtools/update-docker/"/>
+        <repository
+            url="http://download.eclipse.org/tools/orbit/downloads/drops/R20200224183213/repository"/>
+      </setupTask>
+      <stream
+          name="master"
+          label="master"/>
+    </project>
+    <description>Add Editors for HTML and BASH Scripts</description>
+  </project>
   <logicalProjectContainer
       xsi:type="setup:ProjectCatalog"
       href="index:/org.eclipse.setup#//@projectCatalogs[name='org.eclipse']"/>