diff --git a/addons.xml b/addons.xml
index e245c78c4..9dd649c57 100644
--- a/addons.xml
+++ b/addons.xml
@@ -21,33 +21,34 @@
     </repository>
 
     <!-- Where to get runtime directory if not present -->
-    <runtime name="moqui-runtime" group="moqui" version="1.6.2" branch="master" repository="github"/>
+    <runtime name="moqui-runtime" group="moqui" version="2.0.0-rc1" branch="master" repository="github"/>
 
     <!-- Example Component -->
-    <component name="example" group="moqui" version="1.6.2" branch="master" repository="github"/>
+    <component name="example" group="moqui" version="2.0.0-rc1" branch="master" repository="github"/>
 
     <!-- Moqui Tool Components -->
-    <component name="moqui-atomikos" group="moqui" version="1.0.0" branch="master" repository="github"/>
-    <component name="moqui-camel" group="moqui" version="1.0.0" branch="master" repository="github"/>
-    <component name="moqui-elasticsearch" group="moqui" version="1.0.0" branch="master" repository="github"/>
-    <component name="moqui-fop" group="moqui" version="1.0.0" branch="master" repository="github"/>
-    <component name="moqui-hazelcast" group="moqui" version="1.0.0" branch="master" repository="github"/>
-    <component name="moqui-kie" group="moqui" version="1.0.0" branch="master" repository="github"/>
-    <component name="moqui-orientdb" group="moqui" version="1.0.0" branch="master" repository="github"/>
-    <component name="moqui-wikitext" group="moqui" version="1.0.0" branch="master" repository="github"/>
+    <component name="moqui-atomikos" group="moqui" version="1.0.0-rc1" branch="master" repository="github"/>
+    <component name="moqui-camel" group="moqui" version="1.0.0-rc1" branch="master" repository="github"/>
+    <component name="moqui-elasticsearch" group="moqui" version="1.0.0-rc1" branch="master" repository="github"/>
+    <component name="moqui-fop" group="moqui" version="1.0.0-rc1" branch="master" repository="github"/>
+    <component name="moqui-hazelcast" group="moqui" version="1.0.0-rc1" branch="master" repository="github"/>
+    <component name="moqui-kie" group="moqui" version="1.0.0-rc1" branch="master" repository="github"/>
+    <component name="moqui-orientdb" group="moqui" version="1.0.0-rc1" branch="master" repository="github"/>
+    <component name="moqui-wikitext" group="moqui" version="1.0.0-rc1" branch="master" repository="github"/>
 
     <!-- Mantle Components -->
-    <component name="mantle-udm" group="moqui" version="1.0.1" branch="master" repository="github"/>
-    <component name="mantle-usl" group="moqui" version="1.0.1" branch="master" repository="github"/>
-    <component name="mantle-edi" group="moqui" version="1.0.0" branch="master" repository="github"/>
-    <component name="AuthorizeDotNet" group="moqui" version="1.0.0" branch="master" repository="github"/>
+    <component name="mantle-udm" group="moqui" version="1.1.0-rc1" branch="master" repository="github"/>
+    <component name="mantle-usl" group="moqui" version="1.1.0-rc1" branch="master" repository="github"/>
+    <component name="mantle-edi" group="moqui" version="1.1.0-rc1" branch="master" repository="github"/>
+    <component name="AuthorizeDotNet" group="moqui" version="1.1.0-rc1" branch="master" repository="github"/>
+
     <component name="mantle-ubpl" group="moqui" version="" branch="master" repository="github"/><!-- no releases -->
     <component name="mantle-oagis" group="moqui" version="" branch="master" repository="github"/><!-- no releases -->
-    <component name="SimpleScreens" group="moqui" version="1.0.2" branch="master" repository="github"/>
 
     <!-- Moqui Applications -->
-    <component name="HiveMind" group="moqui" version="1.1.5" branch="master" repository="github"/>
-    <component name="PopCommerce" group="moqui" version="1.0.3" branch="master" repository="github"/>
+    <component name="SimpleScreens" group="moqui" version="1.1.0-rc1" branch="master" repository="github"/>
+    <component name="HiveMind" group="moqui" version="1.2.0-rc1" branch="master" repository="github"/>
+    <component name="PopCommerce" group="moqui" version="1.1.0-rc1" branch="master" repository="github"/>
 
     <!-- Third Party Components -->
     <component name="moqui-zh_CN-addon" group="chunlinyao" version="" branch="master" repository="github"/><!-- no releases -->
diff --git a/build.gradle b/build.gradle
index 6485aaed4..31ffff455 100644
--- a/build.gradle
+++ b/build.gradle
@@ -22,7 +22,7 @@ import org.ajoberstar.grgit.*
 
 defaultTasks 'build'
 
-def tomcatHome = '../apache-tomcat-8.0.21'
+def tomcatHome = '../apache-tomcat-8.5.6'
 // no longer include version in war file name: def getWarName() { 'moqui-' + childProjects.framework.version + '.war' }
 def getWarName() { 'moqui.war' }
 def plusRuntimeName = 'moqui-plus-runtime.war'
diff --git a/framework/build.gradle b/framework/build.gradle
index c6e643fb5..412da3dec 100644
--- a/framework/build.gradle
+++ b/framework/build.gradle
@@ -16,7 +16,7 @@
 // tasks.withType(GroovyCompile) { options.compilerArgs << "-Xlint:unchecked" }
 // tasks.withType(GroovyCompile) { options.compilerArgs << "-Xlint:deprecation" }
 
-version = '2.0.0-SNAPSHOT'
+version = '2.0.0-rc1'
 
 apply plugin: 'groovy'
 apply plugin: 'war'
diff --git a/moqui-util/build.gradle b/moqui-util/build.gradle
index 112e52529..d7d17e844 100644
--- a/moqui-util/build.gradle
+++ b/moqui-util/build.gradle
@@ -14,7 +14,7 @@
 
 // tasks.withType(JavaCompile) { options.compilerArgs << "-Xlint:unchecked" }
 
-version = '1.0.0-SNAPSHOT'
+version = '1.0.0-rc1'
 
 apply plugin: 'java'
 // to run gradle-versions-plugin use "gradle dependencyUpdates"