diff --git a/extras/site/associate.properties b/extras/site/associate.properties
index edbe1bb..efbff10 100644
--- a/extras/site/associate.properties
+++ b/extras/site/associate.properties
@@ -1,5 +1,2 @@
 # associate sites to add to the resulting repo 
-# TODO: remove these URLs for GA
-associate.sites=https://devstudio.jboss.com/updates/6.0-staging/,https://devstudio.jboss.com/updates/6.0-staging/extras/
-# TODO: switch to these URLs for GA
-#associate.sites=https://devstudio.jboss.com/updates/6.0/,https://devstudio.jboss.com/updates/6.0/extras/
+associate.sites=https://devstudio.jboss.com/updates/6.0/
diff --git a/extras/site/site.xml b/extras/site/site.xml
index a9c782e..5e4e63b 100644
--- a/extras/site/site.xml
+++ b/extras/site/site.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- JBDS-2361 this site is no longer needed: replaced by https://devstudio.jboss.com/updates/6.0-staging/central/core/ -->
+<!-- JBDS-2361 this site is no longer needed: replaced by https://devstudio.jboss.com/updates/6.0/central/core/ -->
 
 <site>
 	<description>JBoss Developer Studio 6.0 Extras</description>
diff --git a/product/README.Central.milestone.testing.txt b/product/README.Central.milestone.testing.txt
index df555f2..0abd799 100644
--- a/product/README.Central.milestone.testing.txt
+++ b/product/README.Central.milestone.testing.txt
@@ -2,7 +2,7 @@ JBoss Central has a "software/update" page which gets its content from a hardcod
 
 The published (current) milestone release URL is 
 
-	https://devstudio.jboss.com/updates/6.0-staging/devstudio-directory.xml
+	https://devstudio.jboss.com/updates/6.0/devstudio-directory.xml
 
 The stable branch (upcoming milestone) URL is
 
diff --git a/product/features/com.jboss.jbds.product.feature.source/feature.xml b/product/features/com.jboss.jbds.product.feature.source/feature.xml
index 0f85c2b..10945fd 100644
--- a/product/features/com.jboss.jbds.product.feature.source/feature.xml
+++ b/product/features/com.jboss.jbds.product.feature.source/feature.xml
@@ -19,8 +19,7 @@
    </license>
 
    <url>
-      <update label="%updateSiteName - Staging" url="https://devstudio.jboss.com/updates/6.0-staging/"/>
-      <discovery label="%updateExtrasSiteName - Staging" url="https://devstudio.jboss.com/updates/6.0-staging/extras/"/>
+      <update label="%updateSiteName - Staging" url="https://devstudio.jboss.com/updates/6.0/"/>
    </url>
 
    <includes
diff --git a/product/features/com.jboss.jbds.product.feature/feature.xml b/product/features/com.jboss.jbds.product.feature/feature.xml
index 82490d3..2564db4 100644
--- a/product/features/com.jboss.jbds.product.feature/feature.xml
+++ b/product/features/com.jboss.jbds.product.feature/feature.xml
@@ -4,7 +4,7 @@
 	<copyright>%copyright</copyright>
 	<license url="%licenseURL">%license</license>
 	<url>
-		<update label="%updateSiteName - Staging" url="https://devstudio.jboss.com/updates/6.0-staging/"/>
+		<update label="%updateSiteName - Staging" url="https://devstudio.jboss.com/updates/6.0/"/>
 	</url>
 
 	<plugin id="com.jboss.jbds.product" download-size="0" install-size="0" version="0.0.0"/> 
diff --git a/product/plugins/com.jboss.jbds.central.discovery/plugin.xml b/product/plugins/com.jboss.jbds.central.discovery/plugin.xml
index 521a349..2ef249e 100644
--- a/product/plugins/com.jboss.jbds.central.discovery/plugin.xml
+++ b/product/plugins/com.jboss.jbds.central.discovery/plugin.xml
@@ -39,7 +39,7 @@ Tested by Red Hat.</description>
             license="Free, EPL, Other"
             name="JST Server"
             provider="Eclipse.org"
-            siteUrl="https://devstudio.jboss.com/updates/6.0-staging/central/core/">
+            siteUrl="https://devstudio.jboss.com/updates/6.0/central/core/">
             <!-- <iu id="org.eclipse.jst.server_adapters.ext.feature"/> -->
             <iu id="org.eclipse.jst.server_adapters.feature"/>
             <iu id="org.eclipse.jst.server_core.feature"/>
@@ -87,7 +87,7 @@ Tested by Red Hat.</description>
             license="Free, EPL, Other"
             name="Google Web Toolkit Designer"
             provider="Google, Inc."
-            siteUrl="https://devstudio.jboss.com/updates/6.0-staging/central/core/">
+            siteUrl="https://devstudio.jboss.com/updates/6.0/central/core/">
             <iu id="com.google.gdt.eclipse.designer.editor.feature"/>
             <iu id="com.google.gdt.eclipse.designer.gpe.feature"/>
             <iu id="com.google.gdt.eclipse.designer.hosted.feature"/>
@@ -113,7 +113,7 @@ Tested by Red Hat.</description>
             license="Free, EPL, Other"
             name="Google Plugin + Web Toolkit"
             provider="Google, Inc."
-            siteUrl="https://devstudio.jboss.com/updates/6.0-staging/central/core/">
+            siteUrl="https://devstudio.jboss.com/updates/6.0/central/core/">
             <iu id="com.google.gwt.eclipse.sdkbundle.e42.feature"/>
             <iu id="com.google.gdt.eclipse.suite.e42.feature"/>
          <icon
@@ -133,7 +133,7 @@ Tested by Red Hat.</description>
             license="Free, EPL, Other"
             name="Spring IDE"
             provider="Spring IDE Developers"
-            siteUrl="https://devstudio.jboss.com/updates/6.0-staging/central/core/">
+            siteUrl="https://devstudio.jboss.com/updates/6.0/central/core/">
             <iu id="org.springframework.ide.eclipse.aop.feature"/>
             <iu id="org.springframework.ide.eclipse.autowire.feature"/>
             <iu id="org.springframework.ide.eclipse.feature"/>
@@ -171,7 +171,7 @@ Tested by Red Hat.</description>
             license="Free, EPL, Other"
             name="Atlassian Connector"
             provider="Atlassian"
-            siteUrl="https://devstudio.jboss.com/updates/6.0-staging/central/core/">
+            siteUrl="https://devstudio.jboss.com/updates/6.0/central/core/">
             <iu id="com.atlassian.connector.eclipse"/>
          <icon
                image32="images/atlassian_32.png">
@@ -191,7 +191,7 @@ Tested by Red Hat.</description>
             license="Free, EPL"
             name="Eclipse EGit"
             provider="eclipse.org"
-            siteUrl="https://devstudio.jboss.com/updates/6.0-staging/central/core/">
+            siteUrl="https://devstudio.jboss.com/updates/6.0/central/core/">
        <iu id="org.eclipse.jgit"/>
        <iu id="org.eclipse.egit"/>
          <icon
@@ -211,7 +211,7 @@ Tested by Red Hat.</description>
             license="Free, EPL"
             name="Eclipse EGit: Mylyn Support"
             provider="eclipse.org"
-            siteUrl="https://devstudio.jboss.com/updates/6.0-staging/central/core/">
+            siteUrl="https://devstudio.jboss.com/updates/6.0/central/core/">
             <iu id="org.eclipse.jgit"/>
             <iu id="org.eclipse.egit"/>
             <iu id="org.eclipse.egit.mylyn"/>
@@ -243,7 +243,7 @@ Tested by Red Hat.</description>
             license="Free, Subclipse License"
             name="Subclipse + SVNKit"
             provider="tigris.org"
-            siteUrl="https://devstudio.jboss.com/updates/6.0-staging/central/core/">
+            siteUrl="https://devstudio.jboss.com/updates/6.0/central/core/">
             <iu id="org.tigris.subversion.subclipse"/>
             <iu id="org.tigris.subversion.clientadapter.svnkit.feature"/>
             <iu id="com.collabnet.subversion.merge.feature"/>
@@ -269,7 +269,7 @@ Tested by Red Hat.</description>
             license="Free, Subclipse License"
             name="Subclipse + SVNKit: Mylyn Support"
             provider="tigris.org"
-	    siteUrl="https://devstudio.jboss.com/updates/6.0-staging/central/core/">
+	    siteUrl="https://devstudio.jboss.com/updates/6.0/central/core/">
             <iu id="org.tigris.subversion.subclipse"/>
             <iu id="org.tigris.subversion.clientadapter.svnkit.feature"/>
             <iu id="org.tigris.subversion.subclipse.mylyn"/>
@@ -318,7 +318,7 @@ Tested by Red Hat.</description>
             license="Free, LGPL"
             name="Eclipse Checkstyle"
             provider="eclipse-cs Project"
-            siteUrl="https://devstudio.jboss.com/updates/6.0-staging/central/core/">
+            siteUrl="https://devstudio.jboss.com/updates/6.0/central/core/">
             <iu id="net.sf.eclipsecs"/>
             <iu id="com.github.sevntu.checkstyle.checks.feature"/>
          <icon
@@ -338,7 +338,7 @@ Tested by Red Hat.</description>
             license="Free, LGPL"
             name="FindBugs"
             provider="FindBugs Project"
-            siteUrl="https://devstudio.jboss.com/updates/6.0-staging/central/core/">
+            siteUrl="https://devstudio.jboss.com/updates/6.0/central/core/">
 	    <!-- https://issues.jboss.org/browse/JBDS-2284 -->
 	    <iu id="edu.umd.cs.findbugs.plugin.eclipse"/>
          <icon
@@ -359,7 +359,7 @@ Tested by Red Hat.</description>
             license="Free, EPL"
             name="Mylyn Issue Tracker Connectors"
             provider="JBoss by Red Hat"
-            siteUrl="https://devstudio.jboss.com/updates/6.0-staging/central/core/">
+            siteUrl="https://devstudio.jboss.com/updates/6.0/central/core/">
          <iu id="org.jboss.tools.common.mylyn.feature"/>
          <iu id="com.atlassian.connector.eclipse.jira"/>
          <iu id="com.atlassian.connector.eclipse.monitor"/>
@@ -389,7 +389,7 @@ Tested by Red Hat.</description>
             license="Free, PMD License"
             name="PMD"
             provider="PMD Developers"
-            siteUrl="https://devstudio.jboss.com/updates/6.0-staging/central/core/">
+            siteUrl="https://devstudio.jboss.com/updates/6.0/central/core/">
 	    <!-- https://issues.jboss.org/browse/JBIDE-12562 -->
        	    <iu id="net.sourceforge.pmd.eclipse"/>
          <icon
@@ -409,7 +409,7 @@ Tested by Red Hat.</description>
             license="Free, ASL"
             name="TestNG"
             provider="Cedric Beust"
-            siteUrl="https://devstudio.jboss.com/updates/6.0-staging/central/core/">
+            siteUrl="https://devstudio.jboss.com/updates/6.0/central/core/">
             <iu id="org.testng.eclipse"/>
          <icon
                image32="images/testng_32.gif">
@@ -464,7 +464,7 @@ Tested by Red Hat.</description>
             license="Free, EPL"
             name="JBoss Maven Integration"
             provider="JBoss by Red Hat"
-            siteUrl="https://devstudio.jboss.com/updates/6.0-staging/central/core/">
+            siteUrl="https://devstudio.jboss.com/updates/6.0/central/core/">
             <iu id="org.jboss.tools.maven.feature"/>
          <icon
                image32="images/jbosstools_icon32.png">
@@ -483,7 +483,7 @@ Tested by Red Hat.</description>
             license="Free, EPL"
             name="JBoss Maven CDI Configurator"
             provider="JBoss by Red Hat"
-            siteUrl="https://devstudio.jboss.com/updates/6.0-staging/central/core/">
+            siteUrl="https://devstudio.jboss.com/updates/6.0/central/core/">
             <iu id="org.jboss.tools.maven.cdi.feature"/>
          <icon
                image32="images/jbosstools_icon32.png">
@@ -502,7 +502,7 @@ Tested by Red Hat.</description>
             license="Free, EPL"
             name="JBoss Maven GWT Configurator"
             provider="JBoss by Red Hat"
-            siteUrl="https://devstudio.jboss.com/updates/6.0-staging/central/core/">
+            siteUrl="https://devstudio.jboss.com/updates/6.0/central/core/">
             <iu id="org.jboss.tools.maven.gwt.feature"/>
             <iu id="com.google.gdt.eclipse.suite.e42.feature"/>
          <icon
@@ -522,7 +522,7 @@ Tested by Red Hat.</description>
             license="Free, EPL"
             name="JBoss Maven Hibernate Configurator"
             provider="JBoss by Red Hat"
-            siteUrl="https://devstudio.jboss.com/updates/6.0-staging/central/core/">
+            siteUrl="https://devstudio.jboss.com/updates/6.0/central/core/">
             <iu id="org.jboss.tools.maven.hibernate.feature"/>
          <icon
                image32="images/jbosstools_icon32.png">
@@ -541,7 +541,7 @@ Tested by Red Hat.</description>
             license="Free, EPL"
             name="JBoss Maven JAX-RS Configurator"
             provider="JBoss by Red Hat"
-            siteUrl="https://devstudio.jboss.com/updates/6.0-staging/central/core/">
+            siteUrl="https://devstudio.jboss.com/updates/6.0/central/core/">
             <iu id="org.jboss.tools.maven.jaxrs.feature"/>
          <icon
                image32="images/jbosstools_icon32.png">
@@ -560,7 +560,7 @@ Tested by Red Hat.</description>
             license="Free, EPL"
             name="JBoss Maven JSF Configurator"
             provider="JBoss by Red Hat"
-            siteUrl="https://devstudio.jboss.com/updates/6.0-staging/central/core/">
+            siteUrl="https://devstudio.jboss.com/updates/6.0/central/core/">
             <iu id="org.jboss.tools.maven.jsf.feature"/>
          <icon
                image32="images/jbosstools_icon32.png">
@@ -579,7 +579,7 @@ Tested by Red Hat.</description>
             license="Free, EPL"
             name="JBoss Tools Maven Packaging Configurator"
             provider="JBoss by Red Hat"
-            siteUrl="https://devstudio.jboss.com/updates/6.0-staging/central/core/">
+            siteUrl="https://devstudio.jboss.com/updates/6.0/central/core/">
             <iu id="org.jboss.tools.maven.jbosspackaging.feature"/>
             <iu id="org.eclipse.m2e.feature"/>
             <iu id="org.eclipse.m2e.wtp.feature"/>
@@ -601,7 +601,7 @@ Tested by Red Hat.</description>
             license="Free, EPL"
             name="JBoss Maven Portlet Configurator"
             provider="JBoss by Red Hat"
-            siteUrl="https://devstudio.jboss.com/updates/6.0-staging/central/core/">
+            siteUrl="https://devstudio.jboss.com/updates/6.0/central/core/">
             <iu id="org.jboss.tools.maven.portlet.feature"/>
          <icon
                image32="images/jbosstools_icon32.png">
@@ -620,7 +620,7 @@ Tested by Red Hat.</description>
             license="Free, EPL"
             name="JBoss Maven Seam Configurator"
             provider="JBoss by Red Hat"
-            siteUrl="https://devstudio.jboss.com/updates/6.0-staging/central/core/">
+            siteUrl="https://devstudio.jboss.com/updates/6.0/central/core/">
             <iu id="org.jboss.tools.maven.seam.feature"/>
          <icon
                image32="images/jbosstools_icon32.png">
@@ -639,7 +639,7 @@ Tested by Red Hat.</description>
             license="Free, EPL"
             name="JBoss Maven JPA Configurator"
             provider="JBoss by Red Hat"
-            siteUrl="https://devstudio.jboss.com/updates/6.0-staging/central/core/">
+            siteUrl="https://devstudio.jboss.com/updates/6.0/central/core/">
             <iu id="org.jboss.tools.maven.jpa.feature"/>
          <icon
                image32="images/jbosstools_icon32.png">
@@ -658,7 +658,7 @@ Tested by Red Hat.</description>
             license="Free, EPL"
             name="Maven Profile Management UI"
             provider="JBoss by Red Hat"
-            siteUrl="https://devstudio.jboss.com/updates/6.0-staging/central/core/">
+            siteUrl="https://devstudio.jboss.com/updates/6.0/central/core/">
             <iu id="org.jboss.tools.maven.profiles.feature"/>
          <icon
                image32="images/jbosstools_icon32.png">
@@ -678,7 +678,7 @@ Tested by Red Hat.</description>
             license="Free, EPL"
             name="Maven Integration for Eclipse (m2e)"
             provider="eclipse.org"
-            siteUrl="https://devstudio.jboss.com/updates/6.0-staging/central/core/">
+            siteUrl="https://devstudio.jboss.com/updates/6.0/central/core/">
             <iu id="org.eclipse.m2e.feature"/>
          <icon
                image32="images/m2e_32.gif">
@@ -697,7 +697,7 @@ Tested by Red Hat.</description>
             license="Free, EPL"
             name="Maven Integration for Eclipse JDT APT (m2e-apt)"
             provider="JBoss by Red Hat"
-            siteUrl="https://devstudio.jboss.com/updates/6.0-staging/central/core/">
+            siteUrl="https://devstudio.jboss.com/updates/6.0/central/core/">
             <iu id="org.jboss.tools.maven.apt.feature"/>
          <icon
                image32="images/m2e_32.gif">
@@ -716,7 +716,7 @@ Tested by Red Hat.</description>
             license="Free, EPL"
             name="Maven Integration for Web Tools (m2e-wtp)"
             provider="eclipse.org"
-            siteUrl="https://devstudio.jboss.com/updates/6.0-staging/central/core/">
+            siteUrl="https://devstudio.jboss.com/updates/6.0/central/core/">
             <iu id="org.eclipse.m2e.wtp.feature"/>
          <icon
                image32="images/m2e_32.gif">
diff --git a/product/site/associate.properties b/product/site/associate.properties
index d6d6617..556a329 100644
--- a/product/site/associate.properties
+++ b/product/site/associate.properties
@@ -1,5 +1,5 @@
 # associate sites to add to the resulting repo 
 # TODO: remove these URLs for GA
-associate.sites=https://devstudio.jboss.com/updates/6.0-staging/
+associate.sites=https://devstudio.jboss.com/updates/6.0/
 # TODO: switch to these URLs for GA
 #associate.sites=https://devstudio.jboss.com/updates/6.0/
diff --git a/qa/install-extras/jbds.properties b/qa/install-extras/jbds.properties
index 41beda5..d67461f 100644
--- a/qa/install-extras/jbds.properties
+++ b/qa/install-extras/jbds.properties
@@ -1,7 +1,7 @@
 #define required properties as defaults - use this properties file when installing to JBDS
 # define destination as current working dir (pwd)
 dest=${user.dir}
-site=http://devstudio.jboss.com/updates/6.0-staging/extras/
+site=https://devstudio.jboss.com/updates/6.0/extras/
 # comma-separated additional updatesites needed for installation
 sites=
 #change these 3  to eclipse if you want to install into some other eclipse app than JBDS