diff --git a/cloudslang-all/pom.xml b/cloudslang-all/pom.xml
index eb483eb53d..e7fd8a986a 100644
--- a/cloudslang-all/pom.xml
+++ b/cloudslang-all/pom.xml
@@ -11,7 +11,7 @@ http://www.apache.org/licenses/LICENSE-2.0
     <parent>
         <artifactId>cloudslang</artifactId>
         <groupId>io.cloudslang.lang</groupId>
-        <version>2.0.17</version>
+        <version>2.0.18-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/cloudslang-api-commons/pom.xml b/cloudslang-api-commons/pom.xml
index fb2520e0d1..17a0ddc2a2 100644
--- a/cloudslang-api-commons/pom.xml
+++ b/cloudslang-api-commons/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>cloudslang</artifactId>
         <groupId>io.cloudslang.lang</groupId>
-        <version>2.0.17</version>
+        <version>2.0.18-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/cloudslang-cli/pom.xml b/cloudslang-cli/pom.xml
index 402b1e4e69..e37eee41c9 100644
--- a/cloudslang-cli/pom.xml
+++ b/cloudslang-cli/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>cloudslang</artifactId>
         <groupId>io.cloudslang.lang</groupId>
-        <version>2.0.17</version>
+        <version>2.0.18-SNAPSHOT</version>
     </parent>
 
     <artifactId>cloudslang-cli</artifactId>
diff --git a/cloudslang-commons/pom.xml b/cloudslang-commons/pom.xml
index 3160745069..eedd784a60 100644
--- a/cloudslang-commons/pom.xml
+++ b/cloudslang-commons/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>cloudslang</artifactId>
         <groupId>io.cloudslang.lang</groupId>
-        <version>2.0.17</version>
+        <version>2.0.18-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/cloudslang-compiler/pom.xml b/cloudslang-compiler/pom.xml
index 38379a0ad0..daae088035 100644
--- a/cloudslang-compiler/pom.xml
+++ b/cloudslang-compiler/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <artifactId>cloudslang</artifactId>
         <groupId>io.cloudslang.lang</groupId>
-        <version>2.0.17</version>
+        <version>2.0.18-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/cloudslang-content-maven-compiler/pom.xml b/cloudslang-content-maven-compiler/pom.xml
index 7a2b91d506..b9a509812d 100644
--- a/cloudslang-content-maven-compiler/pom.xml
+++ b/cloudslang-content-maven-compiler/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <artifactId>cloudslang</artifactId>
         <groupId>io.cloudslang.lang</groupId>
-        <version>2.0.17</version>
+        <version>2.0.18-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/cloudslang-content-verifier/pom.xml b/cloudslang-content-verifier/pom.xml
index 1903e757f1..9b732f592b 100644
--- a/cloudslang-content-verifier/pom.xml
+++ b/cloudslang-content-verifier/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>cloudslang</artifactId>
         <groupId>io.cloudslang.lang</groupId>
-        <version>2.0.17</version>
+        <version>2.0.18-SNAPSHOT</version>
     </parent>
 
     <artifactId>cloudslang-content-verifier</artifactId>
diff --git a/cloudslang-enforcer/pom.xml b/cloudslang-enforcer/pom.xml
index ffcb334821..8e13cc3904 100644
--- a/cloudslang-enforcer/pom.xml
+++ b/cloudslang-enforcer/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>cloudslang</artifactId>
         <groupId>io.cloudslang.lang</groupId>
-        <version>2.0.17</version>
+        <version>2.0.18-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/cloudslang-entities/pom.xml b/cloudslang-entities/pom.xml
index 20fa6a245d..31d6370fa5 100644
--- a/cloudslang-entities/pom.xml
+++ b/cloudslang-entities/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <artifactId>cloudslang</artifactId>
         <groupId>io.cloudslang.lang</groupId>
-        <version>2.0.17</version>
+        <version>2.0.18-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/cloudslang-runtime/pom.xml b/cloudslang-runtime/pom.xml
index f0638782c1..54293cf1e5 100644
--- a/cloudslang-runtime/pom.xml
+++ b/cloudslang-runtime/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <artifactId>cloudslang</artifactId>
         <groupId>io.cloudslang.lang</groupId>
-        <version>2.0.17</version>
+        <version>2.0.18-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/cloudslang-spi/pom.xml b/cloudslang-spi/pom.xml
index 951cac7e6f..d32f580ef4 100644
--- a/cloudslang-spi/pom.xml
+++ b/cloudslang-spi/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <artifactId>cloudslang</artifactId>
         <groupId>io.cloudslang.lang</groupId>
-        <version>2.0.17</version>
+        <version>2.0.18-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/cloudslang-tests/pom.xml b/cloudslang-tests/pom.xml
index 7f79302cfa..211aaf9e38 100644
--- a/cloudslang-tests/pom.xml
+++ b/cloudslang-tests/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <artifactId>cloudslang</artifactId>
         <groupId>io.cloudslang.lang</groupId>
-        <version>2.0.17</version>
+        <version>2.0.18-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/pom.xml b/pom.xml
index fd6f8a4567..5ad806a250 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
     -->
     <groupId>io.cloudslang.lang</groupId>
     <artifactId>cloudslang</artifactId>
-    <version>2.0.17</version>
+    <version>2.0.18-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>${project.groupId}:${project.artifactId}</name>
@@ -28,7 +28,7 @@
         <connection>scm:git:https://github.com/CloudSlang/cloud-slang.git</connection>
         <developerConnection>scm:git:git@github.com:CloudSlang/cloud-slang.git</developerConnection>
         <url>https://github.com/CloudSlang/cloud-slang.git</url>
-        <tag>cloudslang-2.0.17</tag>
+        <tag>master</tag>
     </scm>
 
     <properties>