diff --git a/features/org.eclipse.bpmn2.modeler.updatesite/oxygen-sites.properties b/features/org.eclipse.bpmn2.modeler.updatesite/oxygen-sites.properties
new file mode 100644
index 0000000..733215d
--- /dev/null
+++ b/features/org.eclipse.bpmn2.modeler.updatesite/oxygen-sites.properties
@@ -0,0 +1,12 @@
+###############################################################################
+# Copyright (c) 2011, 2017 Red Hat, Inc. 
+# All rights reserved. 
+# This program is made available under the terms of the 
+# Eclipse Public License v1.0 which accompanies this distribution, 
+# and is available at http://www.eclipse.org/legal/epl-v10.html 
+#
+# Contributors: 
+# Red Hat, Inc. - initial API and implementation 
+###############################################################################
+# associate site(s) - use comma to separate list - to add to the resulting repo 
+associate.sites=http://download.eclipse.org/modeling/mdt/bpmn2/updates/oxygen/1.4.0/,http://download.eclipse.org/bpel/updates/oxygen/1.1.1
diff --git a/features/org.eclipse.bpmn2.modeler.updatesite/pom.xml b/features/org.eclipse.bpmn2.modeler.updatesite/pom.xml
index 45f8728..0594ae9 100644
--- a/features/org.eclipse.bpmn2.modeler.updatesite/pom.xml
+++ b/features/org.eclipse.bpmn2.modeler.updatesite/pom.xml
@@ -29,10 +29,10 @@
 	<description>BPMN2 Modeler Update SiteFeature</description>
 
 	<properties>
-		<maven.antrun.plugin.version>1.3</maven.antrun.plugin.version>
+	  <maven.antrun.plugin.version>1.3</maven.antrun.plugin.version>
 	  <update.site.name>BPMN2 Modeler</update.site.name>
-	  <update.site.description>BPMN2 Modeler Release build for Eclipse Neon platform</update.site.description>
-	  <target.eclipse.version>4.6 (Neon)</target.eclipse.version>
+	  <update.site.description>BPMN2 Modeler Release build for Eclipse Oxygen platform</update.site.description>
+	  <target.eclipse.version>4.7 (Oxygen)</target.eclipse.version>
 	  <siteTemplateFolder>siteTemplateFolder</siteTemplateFolder>
 	</properties>
 
diff --git a/parent/pom.xml b/parent/pom.xml
index a8768b2..d1ba2a4 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -29,9 +29,10 @@
 	</licenses>
 
 	<properties>
-		<tycho-version>0.22.0</tycho-version>
+		<tycho-version>0.26.0</tycho-version>
 		<tycho-extras-version>${tycho-version}</tycho-extras-version>
 		<BUILD_ALIAS>Final</BUILD_ALIAS>
+		<BUILD_NUMBER>1</BUILD_NUMBER>
 		<eclipse.orbit.url>http://download.eclipse.org/tools/orbit/downloads/drops/repository</eclipse.orbit.url>
 	</properties>
 
@@ -159,7 +160,7 @@
 				<eclipse-site>http://download.eclipse.org/releases/oxygen</eclipse-site>
 				<platform-version>[4.7,5.0)</platform-version>
 				<platform-version-name>oxygen</platform-version-name>
-				<eclipse.orbit.url>http://download.eclipse.org/tools/orbit/S-builds/S20170120205402/repository</eclipse.orbit.url>
+				<eclipse.orbit.url>http://download.eclipse.org/tools/orbit/S-builds/S20170516192513/repository</eclipse.orbit.url>
 			</properties>
 			<build>
 				<plugins>
@@ -243,7 +244,7 @@
 
 		<repository>
 			<id>eclipse-bpmn2</id>
-			<url>http://download.eclipse.org/modeling/mdt/bpmn2/updates/neon/1.3.0/</url>
+			<url>http://download.eclipse.org/modeling/mdt/bpmn2/updates/oxygen/1.4.0/</url>
 			<layout>p2</layout>
 			<snapshots>
 				<enabled>true</enabled>
@@ -255,7 +256,7 @@
 
 		<repository>
 			<id>eclipse-bpel</id>
-			<url>http://download.eclipse.org/bpel/updates/neon/1.1.0</url>
+			<url>http://download.eclipse.org/bpel/updates/oxygen/1.1.1</url>
 			<layout>p2</layout>
 			<snapshots>
 				<enabled>true</enabled>
@@ -362,7 +363,8 @@
 				<artifactId>tycho-packaging-plugin</artifactId>
 				<version>${tycho-version}</version>
 				<configuration>
-					<format>'${BUILD_ALIAS}-v'yyyyMMdd-HHmm'-B${BUILD_NUMBER}'</format>
+                                   <format>'${BUILD_ALIAS}-v'yyyyMMdd-HHmm'-B${BUILD_NUMBER}'</format>
+                                   <archiveSite>true</archiveSite>
 				</configuration>
 			</plugin>