diff --git a/initializr-service/src/main/resources/application.yml b/initializr-service/src/main/resources/application.yml
index de9654e8..6b71b317 100644
--- a/initializr-service/src/main/resources/application.yml
+++ b/initializr-service/src/main/resources/application.yml
@@ -39,6 +39,9 @@ initializr:
           - versionRange: "[1.5.x.BUILD-SNAPSHOT,2.0.0.M1)"
             version: Dalston.BUILD-SNAPSHOT
             repositories: spring-snapshots,spring-milestones
+          - versionRange: "2.0.0.M1"
+            version: Finchley.BUILD-SNAPSHOT
+            repositories: spring-snapshots,spring-milestones
       cloud-dataflow-bom:
         groupId: org.springframework.cloud
         artifactId: spring-cloud-dataflow-dependencies
@@ -629,12 +632,12 @@ initializr:
               href: http://docs.spring.io/spring-boot/docs/{bootVersion}/reference/htmlsingle/#boot-features-elasticsearch
     - name: Cloud Core
       bom: cloud-bom
-      versionRange: "[1.2.3.RELEASE,2.0.0.M1)"
+      versionRange: 1.2.3.RELEASE
       content:
         - name: Cloud Connectors
           id: cloud-connectors
           description: Simplifies connecting to services in cloud platforms, including spring-cloud-connector and spring-cloud-cloudfoundry-connector
-          versionRange: "[1.2.0.RELEASE,2.0.0.M1)"
+          versionRange: 1.2.0.RELEASE
         - name: Cloud Bootstrap
           id: cloud-starter
           description: spring-cloud-context (e.g. Bootstrap context and @RefreshScope)
@@ -664,7 +667,7 @@ initializr:
             - versionRange: "1.4.0.RELEASE"
     - name: Cloud Config
       bom: cloud-bom
-      versionRange: "[1.2.3.RELEASE,2.0.0.M1)"
+      versionRange: 1.2.3.RELEASE
       content:
         - name: Config Client
           id: cloud-config-client
@@ -684,25 +687,25 @@ initializr:
         - name: Vault Configuration
           id: cloud-starter-vault-config
           description: Configuration management with HashiCorp Vault
-          versionRange: "[1.5.3.RELEASE,2.0.0.M1)"
+          versionRange: 1.5.3.RELEASE
           starter: false
           groupId: org.springframework.cloud
           artifactId: spring-cloud-starter-vault-config
         - name: Zookeeper Configuration
           id: cloud-starter-zookeeper-config
           description: Configuration management with Zookeeper and spring-cloud-zookeeper-config
-          versionRange: "[1.3.0.M4,2.0.0.M1)"
+          versionRange: 1.3.0.M4
           groupId: org.springframework.cloud
           artifactId: spring-cloud-starter-zookeeper-config
         - name: Consul Configuration
           id: cloud-starter-consul-config
           description: Configuration management with Hashicorp Consul
-          versionRange: "[1.3.0.M4,2.0.0.M1)"
+          versionRange: 1.3.0.M4
           groupId: org.springframework.cloud
           artifactId: spring-cloud-starter-consul-config
     - name: Cloud Discovery
       bom: cloud-bom
-      versionRange: "[1.2.3.RELEASE,2.0.0.M1)"
+      versionRange: 1.2.3.RELEASE
       content:
         - name: Eureka Discovery
           id: cloud-eureka
@@ -722,24 +725,24 @@ initializr:
         - name: Zookeeper Discovery
           id: cloud-starter-zookeeper-discovery
           description: Service discovery with Zookeeper and spring-cloud-zookeeper-discovery
-          versionRange: "[1.3.0.M4,2.0.0.M1)"
+          versionRange: 1.3.0.M4
           groupId: org.springframework.cloud
           artifactId: spring-cloud-starter-zookeeper-discovery
         - name: Cloud Foundry Discovery
           id: cloud-cloudfoundry-discovery
           description: Service discovery with Cloud Foundry
-          versionRange: "[1.3.0.M4,2.0.0.M1)"
+          versionRange: 1.3.0.M4
           groupId: org.springframework.cloud
           artifactId: spring-cloud-cloudfoundry-discovery
         - name: Consul Discovery
           id: cloud-starter-consul-discovery
           description: Service discovery with Hashicorp Consul
-          versionRange: "[1.3.0.M4,2.0.0.M1)"
+          versionRange: 1.3.0.M4
           groupId: org.springframework.cloud
           artifactId: spring-cloud-starter-consul-discovery
     - name: Cloud Routing
       bom: cloud-bom
-      versionRange: "[1.2.3.RELEASE,2.0.0.M1)"
+      versionRange: 1.2.3.RELEASE
       content:
         - name: Zuul
           id: cloud-zuul
@@ -766,7 +769,7 @@ initializr:
           artifactId: spring-cloud-starter-feign
     - name: Cloud Circuit Breaker
       bom: cloud-bom
-      versionRange: "[1.2.3.RELEASE,2.0.0.M1)"
+      versionRange: 1.2.3.RELEASE
       content:
         - name: Hystrix
           id: cloud-hystrix
@@ -790,13 +793,13 @@ initializr:
         - name: Turbine Stream
           id: cloud-turbine-stream
           description: Circuit breaker metric aggregation using spring-cloud-netflix with Turbine and Spring Cloud Stream (choose a specific Stream binder implementation to complement this)
-          versionRange: "[1.3.0.M5,2.0.0.M1)"
+          versionRange: 1.3.0.M5
           groupId: org.springframework.cloud
           artifactId: spring-cloud-starter-turbine-stream
           weight: -1
     - name: Cloud Tracing
       bom: cloud-bom
-      versionRange: "[1.3.0.M4,2.0.0.M1)"
+      versionRange: 1.3.0.M4
       content:
         - name: Sleuth
           id: cloud-starter-sleuth
@@ -828,7 +831,7 @@ initializr:
           starter: false
     - name: Cloud Messaging
       bom: cloud-bom
-      versionRange: "[1.2.3.RELEASE,2.0.0.M1)"
+      versionRange: 1.2.3.RELEASE
       content:
         - name: Cloud Bus AMQP
           id: cloud-bus-amqp
@@ -838,24 +841,24 @@ initializr:
         - name: Cloud Bus Kafka
           id: cloud-bus-kafka
           description: A simple control bus with Kafka and spring-cloud-bus
-          versionRange: "[1.3.0.RELEASE,2.0.0.M1)"
+          versionRange: "1.3.0.RELEASE"
           groupId: org.springframework.cloud
           artifactId: spring-cloud-starter-bus-kafka
         - name: Stream Rabbit
           id: cloud-stream-binder-rabbit
           description: Messaging microservices with RabbitMQ
-          versionRange: "[1.3.0.M4,2.0.0.M1)"
+          versionRange: 1.3.0.M4
           groupId: org.springframework.cloud
           artifactId: spring-cloud-starter-stream-rabbit
         - name: Stream Kafka
           id: cloud-stream-binder-kafka
           description: Messaging microservices with Kafka
-          versionRange: "[1.3.0.M4,2.0.0.M1)"
+          versionRange: 1.3.0.M4
           groupId: org.springframework.cloud
           artifactId: spring-cloud-stream-binder-kafka
     - name: Cloud AWS
       bom: cloud-bom
-      versionRange: "[1.2.3.RELEASE,2.0.0.M1)"
+      versionRange: 1.2.3.RELEASE
       content:
         - name: AWS Core
           id: cloud-aws
@@ -912,7 +915,7 @@ initializr:
           artifactId: spring-cloud-cluster-etcd
     - name: Cloud Contract
       bom: cloud-bom
-      versionRange: "[1.4.0.RC1,2.0.0.M1)"
+      versionRange: 1.4.0.RC1
       content:
         - name: Cloud Contract Verifier
           id: cloud-contract-verifier