diff --git a/org.adempiere.server-feature/product.ant b/org.adempiere.server-feature/product.ant
index 1e477c5b3b..ce8f9c695f 100644
--- a/org.adempiere.server-feature/product.ant
+++ b/org.adempiere.server-feature/product.ant
@@ -39,6 +39,7 @@
 			<arg value="-p2.arch" />
 			<arg value="${target.arch}" />
 			<arg value="-consoleLog"/>
+			<arg value="-roaming"/>
 			<!-- jvmarg value="-agentlib:jdwp=transport=dt_socket,address=8000,server=y,suspend=y"/ -->
 		</java>
 	</target>
diff --git a/org.adempiere.server-feature/server.product b/org.adempiere.server-feature/server.product
index 843b7747b6..e2c6986e99 100644
--- a/org.adempiere.server-feature/server.product
+++ b/org.adempiere.server-feature/server.product
@@ -53,6 +53,7 @@
       <plugin id="org.eclipse.gemini.web.tomcat" autoStart="true" startLevel="4" />
       <plugin id="org.eclipse.osgi.services" autoStart="true" startLevel="3" />
       <plugin id="org.restlet" autoStart="true" startLevel="3" />
+      <property name="org.eclipse.update.reconcile" value="false" />
    </configurations>
 
 </product>