diff --git a/com.minres.products.setup b/com.minres.products.setup
index 7de4dc7..6bb11c4 100644
--- a/com.minres.products.setup
+++ b/com.minres.products.setup
@@ -254,6 +254,9 @@
             name="com.eclipserunner.feature.feature.group"/>
         <requirement
             name="org.eclipse.egit.gitflow.feature.feature.group"/>
+        <requirement
+            name="net.resheim.eclipse.launcher.feature.group"
+            filter="(&amp;(osgi.arch=x86_64)(osgi.os=macosx)(osgi.ws=cocoa))"/>
         <repository
             url="http://download.eclipse.org/technology/epp/packages/oxygen"/>
         <repository
@@ -266,6 +269,8 @@
             url="https://raw.githubusercontent.com/15knots/cmakeed/master/cmakeed-update/"/>
         <repository
             url="https://dl.bintray.com/zaunerc/p2/com.eclipserunner.p2_site/latest/"/>
+        <repository
+            url="https://resheim.net/p2/eclipse-launcher/"/>
       </setupTask>
       <setupTask
           xsi:type="setup:EclipseIniTask"
@@ -614,6 +619,9 @@
             name="com.eclipserunner.feature.feature.group"/>
         <requirement
             name="org.eclipse.egit.gitflow.feature.feature.group"/>
+        <requirement
+            name="net.resheim.eclipse.launcher.feature.group"
+            filter="(&amp;(osgi.arch=x86_64)(osgi.os=macosx)(osgi.ws=cocoa))"/>
         <repository
             url="http://download.eclipse.org/technology/epp/packages/photon"/>
         <repository
@@ -628,6 +636,8 @@
             url="https://raw.githubusercontent.com/15knots/cmakeed/master/cmakeed-update/"/>
         <repository
             url="https://dl.bintray.com/zaunerc/p2/com.eclipserunner.p2_site/latest/"/>
+        <repository
+            url="https://resheim.net/p2/eclipse-launcher/"/>
       </setupTask>
       <setupTask
           xsi:type="setup:EclipseIniTask"
@@ -1120,9 +1130,6 @@
         <requirement
             name="net.resheim.eclipse.launcher.feature.group"
             filter="(&amp;(osgi.arch=x86_64)(osgi.os=macosx)(osgi.ws=cocoa))"/>
-        <requirement
-            name="name.njbartlett.eclipse.macbadge.feature.feature.group"
-            filter="(&amp;(osgi.arch=x86_64)(osgi.os=macosx)(osgi.ws=cocoa))"/>
         <requirement
             name="org.eclipse.egit.gitflow.feature.feature.group"/>
         <repository
@@ -1141,8 +1148,6 @@
             url="https://dl.bintray.com/zaunerc/p2/com.eclipserunner.p2_site/latest/"/>
         <repository
             url="https://resheim.net/p2/eclipse-launcher/"/>
-        <repository
-            url="http://macbadge-updates.s3.amazonaws.com/"/>
       </setupTask>
       <setupTask
           xsi:type="setup:EclipseIniTask"
@@ -1517,14 +1522,11 @@
             filter="(osgi.os=linux)"/>
         <requirement
             name="com.eclipserunner.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.egit.gitflow.feature.feature.group"/>
         <requirement
             name="net.resheim.eclipse.launcher.feature.group"
             filter="(&amp;(osgi.arch=x86_64)(osgi.os=macosx)(osgi.ws=cocoa))"/>
-        <requirement
-            name="name.njbartlett.eclipse.macbadge.feature.feature.group"
-            filter="(&amp;(osgi.arch=x86_64)(osgi.os=macosx)(osgi.ws=cocoa))"/>
-        <requirement
-            name="org.eclipse.egit.gitflow.feature.feature.group"/>
         <repository
             url="http://download.eclipse.org/technology/epp/packages/photon"/>
         <repository
@@ -1541,8 +1543,6 @@
             url="https://dl.bintray.com/zaunerc/p2/com.eclipserunner.p2_site/latest/"/>
         <repository
             url="https://resheim.net/p2/eclipse-launcher/"/>
-        <repository
-            url="http://macbadge-updates.s3.amazonaws.com/"/>
       </setupTask>
       <setupTask
           xsi:type="setup:EclipseIniTask"
@@ -1924,6 +1924,9 @@
             name="org.eclipse.emf.ecore.xcore.sdk.feature.group"/>
         <requirement
             name="org.eclipse.emf.ecore.xcore.ui.feature.group"/>
+        <requirement
+            name="net.resheim.eclipse.launcher.feature.group"
+            filter="(&amp;(osgi.arch=x86_64)(osgi.os=macosx)(osgi.ws=cocoa))"/>
         <repository
             url="http://download.eclipse.org/technology/epp/packages/oxygen"/>
         <repository
@@ -1936,6 +1939,8 @@
             url="http://download.eclipse.org/modeling/tmf/xtext/updates/composite/releases/"/>
         <repository
             url="https://ecd-plugin.github.io/update"/>
+        <repository
+            url="https://resheim.net/p2/eclipse-launcher/"/>
       </setupTask>
       <setupTask
           xsi:type="setup:EclipseIniTask"
@@ -2079,6 +2084,9 @@
             name="org.eclipse.emf.ecore.xcore.sdk.feature.group"/>
         <requirement
             name="org.eclipse.emf.ecore.xcore.ui.feature.group"/>
+        <requirement
+            name="net.resheim.eclipse.launcher.feature.group"
+            filter="(&amp;(osgi.arch=x86_64)(osgi.os=macosx)(osgi.ws=cocoa))"/>
         <repository
             url="http://download.eclipse.org/technology/epp/packages/photon"/>
         <repository
@@ -2091,6 +2099,8 @@
             url="http://download.eclipse.org/modeling/tmf/xtext/updates/composite/releases/"/>
         <repository
             url="https://ecd-plugin.github.io/update"/>
+        <repository
+            url="https://resheim.net/p2/eclipse-launcher/"/>
       </setupTask>
       <setupTask
           xsi:type="setup:EclipseIniTask"
@@ -2243,6 +2253,9 @@
             name="org.eclipse.emf.ecore.xcore.sdk.feature.group"/>
         <requirement
             name="org.eclipse.emf.ecore.xcore.ui.feature.group"/>
+        <requirement
+            name="net.resheim.eclipse.launcher.feature.group"
+            filter="(&amp;(osgi.arch=x86_64)(osgi.os=macosx)(osgi.ws=cocoa))"/>
         <repository
             url="http://download.eclipse.org/technology/epp/packages/oxygen"/>
         <repository
@@ -2253,6 +2266,8 @@
             url="https://dl.bintray.com/zaunerc/p2/com.eclipserunner.p2_site/latest/"/>
         <repository
             url="https://ecd-plugin.github.io/update"/>
+        <repository
+            url="https://resheim.net/p2/eclipse-launcher/"/>
       </setupTask>
       <setupTask
           xsi:type="setup:EclipseIniTask"
@@ -2396,6 +2411,9 @@
             name="org.eclipse.emf.ecore.xcore.sdk.feature.group"/>
         <requirement
             name="org.eclipse.emf.ecore.xcore.ui.feature.group"/>
+        <requirement
+            name="net.resheim.eclipse.launcher.feature.group"
+            filter="(&amp;(osgi.arch=x86_64)(osgi.os=macosx)(osgi.ws=cocoa))"/>
         <repository
             url="http://download.eclipse.org/technology/epp/packages/photon"/>
         <repository
@@ -2406,6 +2424,8 @@
             url="https://dl.bintray.com/zaunerc/p2/com.eclipserunner.p2_site/latest/"/>
         <repository
             url="https://ecd-plugin.github.io/update"/>
+        <repository
+            url="https://resheim.net/p2/eclipse-launcher/"/>
       </setupTask>
       <setupTask
           xsi:type="setup:EclipseIniTask"