diff --git a/extras/site/associate.properties b/extras/site/associate.properties
index 778422c..efbff10 100644
--- a/extras/site/associate.properties
+++ b/extras/site/associate.properties
@@ -1,2 +1,2 @@
# associate sites to add to the resulting repo
-associate.sites=https://devstudio.jboss.com/updates/5.0/
+associate.sites=https://devstudio.jboss.com/updates/6.0/
diff --git a/product/features/com.jboss.jbds.m2e.feature/feature.xml b/product/features/com.jboss.jbds.m2e.feature/feature.xml
index d74619a..d742f2f 100644
--- a/product/features/com.jboss.jbds.m2e.feature/feature.xml
+++ b/product/features/com.jboss.jbds.m2e.feature/feature.xml
@@ -19,11 +19,11 @@ Raleigh NC 27606 USA.
-
-
-
-
+
+
+
@@ -38,47 +38,25 @@ Raleigh NC 27606 USA.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ -->
diff --git a/product/features/com.jboss.jbds.product.feature/feature.xml b/product/features/com.jboss.jbds.product.feature/feature.xml
index b1e11d1..bdf62ec 100644
--- a/product/features/com.jboss.jbds.product.feature/feature.xml
+++ b/product/features/com.jboss.jbds.product.feature/feature.xml
@@ -168,8 +168,7 @@
-
-
+