diff --git a/accounts/pom.xml b/accounts/pom.xml
index 1c56c97..b3e0956 100644
--- a/accounts/pom.xml
+++ b/accounts/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.hawkular.accounts</groupId>
     <artifactId>hawkular-accounts-parent</artifactId>
-    <version>1.0.17.Final</version>
+    <version>1.0.18.Final-SNAPSHOT</version>
   </parent>
 
   <name>Hawkular - Accounts - Backend</name>
@@ -38,12 +38,12 @@
     <dependency>
       <groupId>org.hawkular.accounts</groupId>
       <artifactId>hawkular-accounts-api</artifactId>
-      <version>1.0.17.Final</version>
+      <version>1.0.18.Final-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.hawkular.accounts</groupId>
       <artifactId>hawkular-accounts-undertow-filter</artifactId>
-      <version>1.0.17.Final</version>
+      <version>1.0.18.Final-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -57,7 +57,7 @@
     <dependency>
       <groupId>org.hawkular.accounts</groupId>
       <artifactId>hawkular-accounts-liquibase</artifactId>
-      <version>1.0.17.Final</version>
+      <version>1.0.18.Final-SNAPSHOT</version>
     </dependency>
 
     <!-- Provided runtime dependencies, present on the Wildfly BOM -->
diff --git a/api/pom.xml b/api/pom.xml
index bc9898f..15d8239 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.hawkular.accounts</groupId>
     <artifactId>hawkular-accounts-parent</artifactId>
-    <version>1.0.17.Final</version>
+    <version>1.0.18.Final-SNAPSHOT</version>
   </parent>
 
   <name>Hawkular - Accounts - API</name>
@@ -38,7 +38,7 @@
     <dependency>
       <groupId>org.hawkular.accounts</groupId>
       <artifactId>hawkular-accounts-jaxb-adapters</artifactId>
-      <version>1.0.17.Final</version>
+      <version>1.0.18.Final-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.jboss.spec.javax.annotation</groupId>
diff --git a/common/pom.xml b/common/pom.xml
index f99999b..dc1bc6e 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.hawkular.accounts</groupId>
     <artifactId>hawkular-accounts-parent</artifactId>
-    <version>1.0.17.Final</version>
+    <version>1.0.18.Final-SNAPSHOT</version>
   </parent>
 
   <name>Hawkular - Accounts - API</name>
diff --git a/dist/pom.xml b/dist/pom.xml
index 4683ecf..500a9ba 100644
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.hawkular.accounts</groupId>
     <artifactId>hawkular-accounts-parent</artifactId>
-    <version>1.0.17.Final</version>
+    <version>1.0.18.Final-SNAPSHOT</version>
   </parent>
 
   <name>Hawkular - Accounts - Distribution</name>
@@ -38,38 +38,38 @@
     <dependency>
       <groupId>org.hawkular.accounts</groupId>
       <artifactId>hawkular-accounts</artifactId>
-      <version>1.0.17.Final</version>
+      <version>1.0.18.Final-SNAPSHOT</version>
       <type>war</type>
     </dependency>
     <dependency>
       <groupId>org.hawkular.accounts</groupId>
       <artifactId>hawkular-accounts-events-backend</artifactId>
-      <version>1.0.17.Final</version>
+      <version>1.0.18.Final-SNAPSHOT</version>
       <type>war</type>
     </dependency>
     <dependency>
       <groupId>org.hawkular.accounts</groupId>
       <artifactId>hawkular-accounts-secret-store</artifactId>
-      <version>1.0.17.Final</version>
+      <version>1.0.18.Final-SNAPSHOT</version>
       <type>war</type>
     </dependency>
     <dependency>
       <groupId>org.hawkular.accounts</groupId>
       <artifactId>hawkular-accounts-keycloak-theme</artifactId>
-      <version>1.0.17.Final</version>
+      <version>1.0.18.Final-SNAPSHOT</version>
       <type>jar</type>
     </dependency>
     <dependency>
       <groupId>org.hawkular.accounts</groupId>
       <artifactId>hawkular-accounts-keycloak-event-listener-rest</artifactId>
-      <version>1.0.17.Final</version>
+      <version>1.0.18.Final-SNAPSHOT</version>
       <classifier>module</classifier>
       <type>zip</type>
     </dependency>
     <dependency>
       <groupId>org.hawkular.accounts</groupId>
       <artifactId>hawkular-accounts-keycloak-event-listener-jms</artifactId>
-      <version>1.0.17.Final</version>
+      <version>1.0.18.Final-SNAPSHOT</version>
       <classifier>module</classifier>
       <type>zip</type>
     </dependency>
diff --git a/events-backend/pom.xml b/events-backend/pom.xml
index 9eee813..b56b9e7 100644
--- a/events-backend/pom.xml
+++ b/events-backend/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.hawkular.accounts</groupId>
     <artifactId>hawkular-accounts-parent</artifactId>
-    <version>1.0.17.Final</version>
+    <version>1.0.18.Final-SNAPSHOT</version>
   </parent>
 
   <name>Hawkular - Accounts - Events Backend</name>
diff --git a/events-listener/pom.xml b/events-listener/pom.xml
index 8bd6fef..7bcbb77 100644
--- a/events-listener/pom.xml
+++ b/events-listener/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.hawkular.accounts</groupId>
     <artifactId>hawkular-accounts-parent</artifactId>
-    <version>1.0.17.Final</version>
+    <version>1.0.18.Final-SNAPSHOT</version>
   </parent>
 
   <name>Hawkular - Accounts - Event Listener</name>
@@ -38,7 +38,7 @@
     <dependency>
       <groupId>org.hawkular.accounts</groupId>
       <artifactId>hawkular-accounts-api</artifactId>
-      <version>1.0.17.Final</version>
+      <version>1.0.18.Final-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.jboss.spec.javax.ejb</groupId>
diff --git a/jaxb-adapters/pom.xml b/jaxb-adapters/pom.xml
index 0e4237f..423070c 100644
--- a/jaxb-adapters/pom.xml
+++ b/jaxb-adapters/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.hawkular.accounts</groupId>
     <artifactId>hawkular-accounts-parent</artifactId>
-    <version>1.0.17.Final</version>
+    <version>1.0.18.Final-SNAPSHOT</version>
   </parent>
 
   <name>Hawkular - Accounts - JAXB Adapters</name>
diff --git a/keycloak-event-listener-jms/pom.xml b/keycloak-event-listener-jms/pom.xml
index 1b07cee..2d06f1b 100644
--- a/keycloak-event-listener-jms/pom.xml
+++ b/keycloak-event-listener-jms/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.hawkular.accounts</groupId>
     <artifactId>hawkular-accounts-parent</artifactId>
-    <version>1.0.17.Final</version>
+    <version>1.0.18.Final-SNAPSHOT</version>
   </parent>
 
   <name>Hawkular - Accounts - Keycloak Event Listener JMS</name>
diff --git a/keycloak-event-listener-rest/pom.xml b/keycloak-event-listener-rest/pom.xml
index ed4f61c..2aa9d91 100644
--- a/keycloak-event-listener-rest/pom.xml
+++ b/keycloak-event-listener-rest/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.hawkular.accounts</groupId>
     <artifactId>hawkular-accounts-parent</artifactId>
-    <version>1.0.17.Final</version>
+    <version>1.0.18.Final-SNAPSHOT</version>
   </parent>
 
   <name>Hawkular - Accounts - Keycloak Event Listener REST</name>
diff --git a/keycloak-theme/pom.xml b/keycloak-theme/pom.xml
index 3fdd367..82a47a8 100644
--- a/keycloak-theme/pom.xml
+++ b/keycloak-theme/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.hawkular.accounts</groupId>
     <artifactId>hawkular-accounts-parent</artifactId>
-    <version>1.0.17.Final</version>
+    <version>1.0.18.Final-SNAPSHOT</version>
   </parent>
 
   <name>Hawkular - Accounts - Keycloak Theme</name>
diff --git a/liquibase/pom.xml b/liquibase/pom.xml
index 7e723c1..a5bb589 100644
--- a/liquibase/pom.xml
+++ b/liquibase/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.hawkular.accounts</groupId>
     <artifactId>hawkular-accounts-parent</artifactId>
-    <version>1.0.17.Final</version>
+    <version>1.0.18.Final-SNAPSHOT</version>
   </parent>
 
   <name>Hawkular - Accounts - Liquibase Temporary Fixes</name>
diff --git a/pom.xml b/pom.xml
index d1c34b8..fd5db01 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
   <name>Hawkular - Accounts - Parent</name>
   <groupId>org.hawkular.accounts</groupId>
   <artifactId>hawkular-accounts-parent</artifactId>
-  <version>1.0.17.Final</version>
+  <version>1.0.18.Final-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <parent>
diff --git a/sample-websocket-backend/pom.xml b/sample-websocket-backend/pom.xml
index 8736d92..eb73709 100644
--- a/sample-websocket-backend/pom.xml
+++ b/sample-websocket-backend/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.hawkular.accounts</groupId>
     <artifactId>hawkular-accounts-parent</artifactId>
-    <version>1.0.17.Final</version>
+    <version>1.0.18.Final-SNAPSHOT</version>
   </parent>
 
   <name>Hawkular - Accounts - Web Sockets Sample - Backend</name>
@@ -38,13 +38,13 @@
     <dependency>
       <groupId>org.hawkular.accounts</groupId>
       <artifactId>hawkular-accounts-websocket-api</artifactId>
-      <version>1.0.17.Final</version>
+      <version>1.0.18.Final-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.hawkular.accounts</groupId>
       <artifactId>hawkular-accounts-common</artifactId>
-      <version>1.0.17.Final</version>
+      <version>1.0.18.Final-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/sample-websocket-frontend/pom.xml b/sample-websocket-frontend/pom.xml
index 43020a0..c384168 100644
--- a/sample-websocket-frontend/pom.xml
+++ b/sample-websocket-frontend/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.hawkular.accounts</groupId>
     <artifactId>hawkular-accounts-parent</artifactId>
-    <version>1.0.17.Final</version>
+    <version>1.0.18.Final-SNAPSHOT</version>
   </parent>
 
   <name>Hawkular - Accounts - Web Sockets Sample - Frontend</name>
diff --git a/sample-websocket-secured/pom.xml b/sample-websocket-secured/pom.xml
index ea320ad..eb02944 100644
--- a/sample-websocket-secured/pom.xml
+++ b/sample-websocket-secured/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.hawkular.accounts</groupId>
     <artifactId>hawkular-accounts-parent</artifactId>
-    <version>1.0.17.Final</version>
+    <version>1.0.18.Final-SNAPSHOT</version>
   </parent>
 
   <name>Hawkular - Accounts - Web Sockets Sample - Secured</name>
@@ -38,13 +38,13 @@
     <dependency>
       <groupId>org.hawkular.accounts</groupId>
       <artifactId>hawkular-accounts-websocket-api</artifactId>
-      <version>1.0.17.Final</version>
+      <version>1.0.18.Final-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.hawkular.accounts</groupId>
       <artifactId>hawkular-accounts-common</artifactId>
-      <version>1.0.17.Final</version>
+      <version>1.0.18.Final-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/sample/pom.xml b/sample/pom.xml
index 4a6a0c1..8748122 100644
--- a/sample/pom.xml
+++ b/sample/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.hawkular.accounts</groupId>
     <artifactId>hawkular-accounts-parent</artifactId>
-    <version>1.0.17.Final</version>
+    <version>1.0.18.Final-SNAPSHOT</version>
   </parent>
 
   <name>Hawkular - Accounts - Sample</name>
@@ -38,23 +38,23 @@
     <dependency>
       <groupId>org.hawkular.accounts</groupId>
       <artifactId>hawkular-accounts-api</artifactId>
-      <version>1.0.17.Final</version>
+      <version>1.0.18.Final-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.hawkular.accounts</groupId>
       <artifactId>hawkular-accounts-event-listener</artifactId>
-      <version>1.0.17.Final</version>
+      <version>1.0.18.Final-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.hawkular.accounts</groupId>
       <artifactId>hawkular-accounts-jaxb-adapters</artifactId>
-      <version>1.0.17.Final</version>
+      <version>1.0.18.Final-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.hawkular.accounts</groupId>
       <artifactId>hawkular-accounts-undertow-filter</artifactId>
-      <version>1.0.17.Final</version>
+      <version>1.0.18.Final-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/secret-store-api/pom.xml b/secret-store-api/pom.xml
index bdee12b..0b539e9 100644
--- a/secret-store-api/pom.xml
+++ b/secret-store-api/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.hawkular.accounts</groupId>
     <artifactId>hawkular-accounts-parent</artifactId>
-    <version>1.0.17.Final</version>
+    <version>1.0.18.Final-SNAPSHOT</version>
   </parent>
 
   <name>Hawkular - Accounts - Secret Store - API</name>
@@ -38,7 +38,7 @@
     <dependency>
       <groupId>org.hawkular.accounts</groupId>
       <artifactId>hawkular-accounts-common</artifactId>
-      <version>1.0.17.Final</version>
+      <version>1.0.18.Final-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.jboss.spec.javax.ejb</groupId>
diff --git a/secret-store/pom.xml b/secret-store/pom.xml
index 4544a5b..aaf3763 100644
--- a/secret-store/pom.xml
+++ b/secret-store/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.hawkular.accounts</groupId>
     <artifactId>hawkular-accounts-parent</artifactId>
-    <version>1.0.17.Final</version>
+    <version>1.0.18.Final-SNAPSHOT</version>
   </parent>
 
   <name>Hawkular - Accounts - Secret Store</name>
@@ -38,7 +38,7 @@
     <dependency>
       <groupId>org.hawkular.accounts</groupId>
       <artifactId>hawkular-accounts-secret-store-api</artifactId>
-      <version>1.0.17.Final</version>
+      <version>1.0.18.Final-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/undertow-filter/pom.xml b/undertow-filter/pom.xml
index 7991709..e91b50b 100644
--- a/undertow-filter/pom.xml
+++ b/undertow-filter/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.hawkular.accounts</groupId>
     <artifactId>hawkular-accounts-parent</artifactId>
-    <version>1.0.17.Final</version>
+    <version>1.0.18.Final-SNAPSHOT</version>
   </parent>
 
   <name>Hawkular - Accounts - Undertow Filter</name>
@@ -38,12 +38,12 @@
     <dependency>
       <groupId>org.hawkular.accounts</groupId>
       <artifactId>hawkular-accounts-common</artifactId>
-      <version>1.0.17.Final</version>
+      <version>1.0.18.Final-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.hawkular.accounts</groupId>
       <artifactId>hawkular-accounts-secret-store-api</artifactId>
-      <version>1.0.17.Final</version>
+      <version>1.0.18.Final-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.undertow</groupId>
diff --git a/websocket-api/pom.xml b/websocket-api/pom.xml
index 8ab89f5..1cf32e1 100644
--- a/websocket-api/pom.xml
+++ b/websocket-api/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.hawkular.accounts</groupId>
     <artifactId>hawkular-accounts-parent</artifactId>
-    <version>1.0.17.Final</version>
+    <version>1.0.18.Final-SNAPSHOT</version>
   </parent>
 
   <name>Hawkular - Accounts - WebSocket API</name>
@@ -38,13 +38,13 @@
     <dependency>
       <groupId>org.hawkular.accounts</groupId>
       <artifactId>hawkular-accounts-api</artifactId>
-      <version>1.0.17.Final</version>
+      <version>1.0.18.Final-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.hawkular.accounts</groupId>
       <artifactId>hawkular-accounts-common</artifactId>
-      <version>1.0.17.Final</version>
+      <version>1.0.18.Final-SNAPSHOT</version>
     </dependency>
 
     <dependency>