diff --git a/README.adoc b/README.adoc
index 8661815c..0f8b69a0 100644
--- a/README.adoc
+++ b/README.adoc
@@ -3,6 +3,9 @@
 Spring Shell 3 is a work to solely depend on Spring Boot 2.x and not trying to keep
 any backward compatibility with older Spring Shell 1.x nor Spring Boot 1.x.
 
+IMPORTANT: We've changed main branch from `3.0.0-SNAPSHOT` to `2.1.0-SNAPSHOT`,
+           for more info see issue #356
+
 == Building
 ```
 ./mvnw package
diff --git a/pom.xml b/pom.xml
index 6e912bed..126dd3ea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<groupId>org.springframework.shell</groupId>
 	<artifactId>spring-shell-parent</artifactId>
 	<name>Spring Shell Parent POM</name>
-	<version>3.0.0-SNAPSHOT</version>
+	<version>2.1.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<parent>
@@ -45,42 +45,42 @@
 			<dependency>
 				<groupId>org.springframework.shell</groupId>
 				<artifactId>spring-shell-core</artifactId>
-				<version>3.0.0-SNAPSHOT</version>
+				<version>2.1.0-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.shell</groupId>
 				<artifactId>spring-shell-core-test-support</artifactId>
-				<version>3.0.0-SNAPSHOT</version>
+				<version>2.1.0-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.shell</groupId>
 				<artifactId>spring-shell-standard</artifactId>
-				<version>3.0.0-SNAPSHOT</version>
+				<version>2.1.0-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.shell</groupId>
 				<artifactId>spring-shell-standard-commands</artifactId>
-				<version>3.0.0-SNAPSHOT</version>
+				<version>2.1.0-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.shell</groupId>
 				<artifactId>spring-shell-jcommander-adapter</artifactId>
-				<version>3.0.0-SNAPSHOT</version>
+				<version>2.1.0-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.shell</groupId>
 				<artifactId>spring-shell-starter</artifactId>
-				<version>3.0.0-SNAPSHOT</version>
+				<version>2.1.0-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.shell</groupId>
 				<artifactId>spring-shell-table</artifactId>
-				<version>3.0.0-SNAPSHOT</version>
+				<version>2.1.0-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.shell</groupId>
 				<artifactId>spring-shell-autoconfigure</artifactId>
-				<version>3.0.0-SNAPSHOT</version>
+				<version>2.1.0-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>org.jline</groupId>
diff --git a/spring-shell-autoconfigure/pom.xml b/spring-shell-autoconfigure/pom.xml
index f00295d3..c043e2a1 100644
--- a/spring-shell-autoconfigure/pom.xml
+++ b/spring-shell-autoconfigure/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>org.springframework.shell</groupId>
 		<artifactId>spring-shell-parent</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
+		<version>2.1.0-SNAPSHOT</version>
 	</parent>
 
 	<dependencies>
diff --git a/spring-shell-core-test-support/pom.xml b/spring-shell-core-test-support/pom.xml
index 3bfae2ba..6652ab93 100644
--- a/spring-shell-core-test-support/pom.xml
+++ b/spring-shell-core-test-support/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>org.springframework.shell</groupId>
 		<artifactId>spring-shell-parent</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
+		<version>2.1.0-SNAPSHOT</version>
 	</parent>
 	
 	<description>Core API test classes for Spring Shell 2</description>
diff --git a/spring-shell-core/pom.xml b/spring-shell-core/pom.xml
index eb7b78b0..ce87eba4 100644
--- a/spring-shell-core/pom.xml
+++ b/spring-shell-core/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>org.springframework.shell</groupId>
 		<artifactId>spring-shell-parent</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
+		<version>2.1.0-SNAPSHOT</version>
 	</parent>
 
 	<description>Core API and classes for Spring Shell 2</description>
diff --git a/spring-shell-dependencies/pom.xml b/spring-shell-dependencies/pom.xml
index b7926f68..9b8e7bb2 100644
--- a/spring-shell-dependencies/pom.xml
+++ b/spring-shell-dependencies/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.shell</groupId>
-	<version>3.0.0-SNAPSHOT</version>
+	<version>2.1.0-SNAPSHOT</version>
 	<artifactId>spring-shell-dependencies</artifactId>
 	<packaging>pom</packaging>
 	<name>Spring Shell Bill of Materials</name>
@@ -11,37 +11,37 @@
 			<dependency>
 				<groupId>org.springframework.shell</groupId>
 				<artifactId>spring-shell-core</artifactId>
-				<version>3.0.0-SNAPSHOT</version>
+				<version>2.1.0-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.shell</groupId>
 				<artifactId>spring-shell-core-test-support</artifactId>
-				<version>3.0.0-SNAPSHOT</version>
+				<version>2.1.0-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.shell</groupId>
 				<artifactId>spring-shell-standard</artifactId>
-				<version>3.0.0-SNAPSHOT</version>
+				<version>2.1.0-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.shell</groupId>
 				<artifactId>spring-shell-standard-commands</artifactId>
-				<version>3.0.0-SNAPSHOT</version>
+				<version>2.1.0-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.shell</groupId>
 				<artifactId>spring-shell-jcommander-adapter</artifactId>
-				<version>3.0.0-SNAPSHOT</version>
+				<version>2.1.0-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.shell</groupId>
 				<artifactId>spring-shell-starter</artifactId>
-				<version>3.0.0-SNAPSHOT</version>
+				<version>2.1.0-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.shell</groupId>
 				<artifactId>spring-shell-table</artifactId>
-				<version>3.0.0-SNAPSHOT</version>
+				<version>2.1.0-SNAPSHOT</version>
 			</dependency>
 		</dependencies>
 	</dependencyManagement>
diff --git a/spring-shell-docs/pom.xml b/spring-shell-docs/pom.xml
index 0cd468e7..7bf2c300 100644
--- a/spring-shell-docs/pom.xml
+++ b/spring-shell-docs/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.springframework.shell</groupId>
 		<artifactId>spring-shell-parent</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
+		<version>2.1.0-SNAPSHOT</version>
 	</parent>
 
 	<description>Spring Shell reference documentation</description>
diff --git a/spring-shell-jcommander-adapter/pom.xml b/spring-shell-jcommander-adapter/pom.xml
index 8899b98b..180b6d8b 100644
--- a/spring-shell-jcommander-adapter/pom.xml
+++ b/spring-shell-jcommander-adapter/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>org.springframework.shell</groupId>
 		<artifactId>spring-shell-parent</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
+		<version>2.1.0-SNAPSHOT</version>
 	</parent>
 	
 	<description>Adapter classes to allow JCommander type annotations and parsing via Spring Shell 2</description>
diff --git a/spring-shell-samples/pom.xml b/spring-shell-samples/pom.xml
index c61d123c..6a0f8917 100644
--- a/spring-shell-samples/pom.xml
+++ b/spring-shell-samples/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>org.springframework.shell</groupId>
 		<artifactId>spring-shell-parent</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
+		<version>2.1.0-SNAPSHOT</version>
 	</parent>
 
 	<description>Examples of using Spring Shell 2</description>
diff --git a/spring-shell-standard-commands/pom.xml b/spring-shell-standard-commands/pom.xml
index 76684a2d..2436e049 100644
--- a/spring-shell-standard-commands/pom.xml
+++ b/spring-shell-standard-commands/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>org.springframework.shell</groupId>
 		<artifactId>spring-shell-parent</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
+		<version>2.1.0-SNAPSHOT</version>
 	</parent>
 	
 	<description>Standard out-of-the-box shell commands, implemented using the Standard API</description>
diff --git a/spring-shell-standard/pom.xml b/spring-shell-standard/pom.xml
index b27ceaeb..ab5c61d3 100644
--- a/spring-shell-standard/pom.xml
+++ b/spring-shell-standard/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>org.springframework.shell</groupId>
 		<artifactId>spring-shell-parent</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
+		<version>2.1.0-SNAPSHOT</version>
 	</parent>
 
 	<description>APIs and resolvers for using the standard Spring Shell programming model</description>
diff --git a/spring-shell-starter/pom.xml b/spring-shell-starter/pom.xml
index 7a40ff7f..33135e96 100644
--- a/spring-shell-starter/pom.xml
+++ b/spring-shell-starter/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.springframework.shell</groupId>
 		<artifactId>spring-shell-parent</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
+		<version>2.1.0-SNAPSHOT</version>
 	</parent>
 
 	<description>Starter Dependency for Using Spring Shell</description>
diff --git a/spring-shell-table/pom.xml b/spring-shell-table/pom.xml
index 7e392fbd..a5d1b011 100644
--- a/spring-shell-table/pom.xml
+++ b/spring-shell-table/pom.xml
@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>org.springframework.shell</groupId>
 		<artifactId>spring-shell-parent</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
+		<version>2.1.0-SNAPSHOT</version>
 	</parent>
 
 	<description>Library to Display Fancy ASCII art Tables</description>
diff --git a/spring-shell-test-samples/pom.xml b/spring-shell-test-samples/pom.xml
index 80366feb..a3a8f464 100644
--- a/spring-shell-test-samples/pom.xml
+++ b/spring-shell-test-samples/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.springframework.shell</groupId>
     <artifactId>spring-shell-parent</artifactId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
   </parent>
   
   <description>Examples of unit, functional and integration tests using Spring Shell 2</description>