diff --git a/product/features/com.jboss.jbds.product.feature/p2.inf b/product/features/com.jboss.jbds.product.feature/p2.inf
index 379fec0..6b5302c 100644
--- a/product/features/com.jboss.jbds.product.feature/p2.inf
+++ b/product/features/com.jboss.jbds.product.feature/p2.inf
@@ -1,12 +1,19 @@
 # See also feature.xml files for product and product-soa and ensure all URLs are consistent
-# TODO when releasing GA make sure to :%s/6.0-staging/6.0/g
 instructions.configure=\
+org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:https${#58}//devstudio.jboss.com/updates/6.0-staging/,name:JBoss Developer Studio 6.0 Updates);\
+org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:https${#58}//devstudio.jboss.com/updates/6.0-staging/,name:JBoss Developer Studio 6.0 Updates);\
+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:https${#58}//devstudio.jboss.com/updates/6.0/,name:JBoss Developer Studio 6.0 Updates);\
+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:https${#58}//devstudio.jboss.com/updates/6.0/,name:JBoss Developer Studio 6.0 Updates);\
 org.eclipse.equinox.p2.touchpoint.eclipse.addJvmArg(jvmArg:-Xms512m);\
 org.eclipse.equinox.p2.touchpoint.eclipse.addJvmArg(jvmArg:-Xmx1024m);\
-org.eclipse.equinox.p2.touchpoint.eclipse.addJvmArg(jvmArg:-Djava.net.preferIPv4Stack=true);\
-org.eclipse.equinox.p2.touchpoint.eclipse.addJvmArg(jvmArg:-Djboss.discovery.directory.url=https://devstudio.jboss.com/updates/6.0-staging/devstudio-directory.xml);
+org.eclipse.equinox.p2.touchpoint.eclipse.removeJvmArg(jvmArg:-Djboss.discovery.directory.url=https://devstudio.jboss.com/updates/6.0-staging/devstudio-directory.xml);\
+org.eclipse.equinox.p2.touchpoint.eclipse.addJvmArg(jvmArg:-Djboss.discovery.directory.url=https://devstudio.jboss.com/updates/6.0/devstudio-directory.xml);
 
 instructions.unconfigure=\
-org.eclipse.equinox.p2.touchpoint.eclipse.removeJvmArg(jvmArg:-Djava.net.preferIPv4Stack=true);\
-org.eclipse.equinox.p2.touchpoint.eclipse.removeJvmArg(jvmArg:-Djboss.discovery.directory.url=https://devstudio.jboss.com/updates/6.0-staging/devstudio-directory.xml);
+org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:https${#58}//devstudio.jboss.com/updates/6.0-staging/,name:JBoss Developer Studio 6.0 Updates);\
+org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:https${#58}//devstudio.jboss.com/updates/6.0-staging/,name:JBoss Developer Studio 6.0 Updates);\
+org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:https${#58}//devstudio.jboss.com/updates/6.0/,name:JBoss Developer Studio 6.0 Updates);\
+org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:https${#58}//devstudio.jboss.com/updates/6.0/,name:JBoss Developer Studio 6.0 Updates);\
+org.eclipse.equinox.p2.touchpoint.eclipse.removeJvmArg(jvmArg:-Djboss.discovery.directory.url=https://devstudio.jboss.com/updates/6.0-staging/devstudio-directory.xml);\
+org.eclipse.equinox.p2.touchpoint.eclipse.removeJvmArg(jvmArg:-Djboss.discovery.directory.url=https://devstudio.jboss.com/updates/6.0/devstudio-directory.xml);