diff --git a/adapter-cqld4/pom.xml b/adapter-cqld4/pom.xml
index bb1431284..ac48f0ca0 100644
--- a/adapter-cqld4/pom.xml
+++ b/adapter-cqld4/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>io.nosqlbench</groupId>
         <artifactId>mvn-defaults</artifactId>
-        <version>4.17.20</version>
+        <version>4.17.21-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -55,13 +55,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-            <version>4.17.20</version>
+            <version>4.17.21-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-basics</artifactId>
-            <version>4.17.20</version>
+            <version>4.17.21-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/adapter-diag/pom.xml b/adapter-diag/pom.xml
index d05700440..48c048726 100644
--- a/adapter-diag/pom.xml
+++ b/adapter-diag/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.17.20</version>
+        <version>4.17.21-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -37,13 +37,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-annotations</artifactId>
-            <version>4.17.20</version>
+            <version>4.17.21-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-            <version>4.17.20</version>
+            <version>4.17.21-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/adapter-dynamodb/pom.xml b/adapter-dynamodb/pom.xml
index 3330065e0..2236fdc63 100644
--- a/adapter-dynamodb/pom.xml
+++ b/adapter-dynamodb/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>io.nosqlbench</groupId>
         <artifactId>mvn-defaults</artifactId>
-        <version>4.17.20</version>
+        <version>4.17.21-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>adapters-api</artifactId>
-            <version>4.17.20</version>
+            <version>4.17.21-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/adapter-http/pom.xml b/adapter-http/pom.xml
index 119c30b2f..55be58abc 100644
--- a/adapter-http/pom.xml
+++ b/adapter-http/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.17.20</version>
+        <version>4.17.21-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-            <version>4.17.20</version>
+            <version>4.17.21-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/adapter-mongodb/pom.xml b/adapter-mongodb/pom.xml
index 68d9f7cec..a430f7677 100644
--- a/adapter-mongodb/pom.xml
+++ b/adapter-mongodb/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.17.20</version>
+        <version>4.17.21-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -36,7 +36,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.17.20</version>
+          <version>4.17.21-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/adapter-stdout/pom.xml b/adapter-stdout/pom.xml
index 901d961ec..d35cdc366 100644
--- a/adapter-stdout/pom.xml
+++ b/adapter-stdout/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.17.20</version>
+        <version>4.17.21-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -38,14 +38,14 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-annotations</artifactId>
-            <version>4.17.20</version>
+            <version>4.17.21-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>adapters-api</artifactId>
-            <version>4.17.20</version>
+            <version>4.17.21-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/adapter-tcp/pom.xml b/adapter-tcp/pom.xml
index 3c3f7de11..96176e093 100644
--- a/adapter-tcp/pom.xml
+++ b/adapter-tcp/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.17.20</version>
+        <version>4.17.21-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -40,7 +40,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-          <version>4.17.20</version>
+          <version>4.17.21-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/adapters-api/pom.xml b/adapters-api/pom.xml
index 8804d3a6d..ba2c0955b 100644
--- a/adapters-api/pom.xml
+++ b/adapters-api/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.17.20</version>
+        <version>4.17.21-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -39,19 +39,19 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-spectest</artifactId>
-            <version>4.17.20</version>
+            <version>4.17.21-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-api</artifactId>
-            <version>4.17.20</version>
+            <version>4.17.21-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-userlibs</artifactId>
-            <version>4.17.20</version>
+            <version>4.17.21-SNAPSHOT</version>
         </dependency>
 
 
diff --git a/docsys/pom.xml b/docsys/pom.xml
index 2330e0771..46782afc0 100644
--- a/docsys/pom.xml
+++ b/docsys/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.17.20</version>
+        <version>4.17.21-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-api</artifactId>
-            <version>4.17.20</version>
+            <version>4.17.21-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -133,7 +133,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-            <version>4.17.20</version>
+            <version>4.17.21-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/engine-api/pom.xml b/engine-api/pom.xml
index 383750690..fbc5e3412 100644
--- a/engine-api/pom.xml
+++ b/engine-api/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.17.20</version>
+        <version>4.17.21-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -39,31 +39,31 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-api</artifactId>
-            <version>4.17.20</version>
+            <version>4.17.21-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>adapters-api</artifactId>
-            <version>4.17.20</version>
+            <version>4.17.21-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-spectest</artifactId>
-            <version>4.17.20</version>
+            <version>4.17.21-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-annotations</artifactId>
-            <version>4.17.20</version>
+            <version>4.17.21-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-userlibs</artifactId>
-            <version>4.17.20</version>
+            <version>4.17.21-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/engine-cli/pom.xml b/engine-cli/pom.xml
index 930676269..8da912155 100644
--- a/engine-cli/pom.xml
+++ b/engine-cli/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.17.20</version>
+        <version>4.17.21-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,13 +23,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-core</artifactId>
-            <version>4.17.20</version>
+            <version>4.17.21-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-docker</artifactId>
-            <version>4.17.20</version>
+            <version>4.17.21-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/engine-clients/pom.xml b/engine-clients/pom.xml
index cacb8e9a5..4b010b2bf 100644
--- a/engine-clients/pom.xml
+++ b/engine-clients/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-    <version>4.17.20</version>
+    <version>4.17.21-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -21,7 +21,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-        <version>4.17.20</version>
+        <version>4.17.21-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/engine-core/pom.xml b/engine-core/pom.xml
index 9f4dd959f..5d0ca325c 100644
--- a/engine-core/pom.xml
+++ b/engine-core/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.17.20</version>
+        <version>4.17.21-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-            <version>4.17.20</version>
+            <version>4.17.21-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -89,7 +89,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-clients</artifactId>
-          <version>4.17.20</version>
+          <version>4.17.21-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/engine-docker/pom.xml b/engine-docker/pom.xml
index f96ad657d..e399ba9d5 100644
--- a/engine-docker/pom.xml
+++ b/engine-docker/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.17.20</version>
+        <version>4.17.21-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -56,7 +56,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-            <version>4.17.20</version>
+            <version>4.17.21-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/engine-docs/pom.xml b/engine-docs/pom.xml
index a9070251f..6fb8b53dc 100644
--- a/engine-docs/pom.xml
+++ b/engine-docs/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-    <version>4.17.20</version>
+    <version>4.17.21-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -28,7 +28,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>docsys</artifactId>
-        <version>4.17.20</version>
+        <version>4.17.21-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/engine-extensions/pom.xml b/engine-extensions/pom.xml
index 1111bfb0d..7b5ffb3fd 100644
--- a/engine-extensions/pom.xml
+++ b/engine-extensions/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.17.20</version>
+        <version>4.17.21-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-            <version>4.17.20</version>
+            <version>4.17.21-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/engine-rest/pom.xml b/engine-rest/pom.xml
index 02183a3dc..ac0429f09 100644
--- a/engine-rest/pom.xml
+++ b/engine-rest/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.17.20</version>
+        <version>4.17.21-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -35,7 +35,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-cli</artifactId>
-            <version>4.17.20</version>
+            <version>4.17.21-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml
index 2d8919258..106dd6b65 100644
--- a/mvn-defaults/pom.xml
+++ b/mvn-defaults/pom.xml
@@ -19,7 +19,7 @@
 
     <groupId>io.nosqlbench</groupId>
     <artifactId>mvn-defaults</artifactId>
-    <version>4.17.20</version>
+    <version>4.17.21-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <properties>
@@ -90,7 +90,7 @@
     <scm>
         <url>scm:git:https://github.com/nosqlbench/nosqlbench.git</url>
         <!--        <tag>nosqlbench-2.0.102-SNAPSHOT</tag>-->
-        <tag>nosqlbench-4.17.20</tag>
+        <tag>HEAD</tag>
     </scm>
 
     <dependencyManagement>
diff --git a/nb-annotations/pom.xml b/nb-annotations/pom.xml
index 4bde8521d..57bb3610a 100644
--- a/nb-annotations/pom.xml
+++ b/nb-annotations/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.17.20</version>
+        <version>4.17.21-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
diff --git a/nb-api/pom.xml b/nb-api/pom.xml
index 02e749c8c..6709bf117 100644
--- a/nb-api/pom.xml
+++ b/nb-api/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.17.20</version>
+        <version>4.17.21-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -52,7 +52,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nb-annotations</artifactId>
-            <version>4.17.20</version>
+            <version>4.17.21-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/nb-spectest/pom.xml b/nb-spectest/pom.xml
index 2dd9bea5d..3004dbafb 100644
--- a/nb-spectest/pom.xml
+++ b/nb-spectest/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.17.20</version>
+        <version>4.17.21-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
diff --git a/nb5/pom.xml b/nb5/pom.xml
index d52f54ad2..12080783c 100644
--- a/nb5/pom.xml
+++ b/nb5/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.17.20</version>
+        <version>4.17.21-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -40,7 +40,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nbr</artifactId>
-            <version>4.17.20</version>
+            <version>4.17.21-SNAPSHOT</version>
         </dependency>
 
         <!-- Everything below this line is in common between nb and nb5 -->
@@ -49,37 +49,37 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>adapter-tcp</artifactId>
-            <version>4.17.20</version>
+            <version>4.17.21-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>adapter-stdout</artifactId>
-            <version>4.17.20</version>
+            <version>4.17.21-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>adapter-diag</artifactId>
-            <version>4.17.20</version>
+            <version>4.17.21-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>adapter-dynamodb</artifactId>
-            <version>4.17.20</version>
+            <version>4.17.21-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>adapter-cqld4</artifactId>
-            <version>4.17.20</version>
+            <version>4.17.21-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>adapter-http</artifactId>
-            <version>4.17.20</version>
+            <version>4.17.21-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
@@ -154,7 +154,7 @@
                 <dependency>
                     <groupId>io.nosqlbench</groupId>
                     <artifactId>adapter-mongodb</artifactId>
-                    <version>4.17.20</version>
+                    <version>4.17.21-SNAPSHOT</version>
                 </dependency>
             </dependencies>
         </profile>
diff --git a/nbr-examples/pom.xml b/nbr-examples/pom.xml
index 0c276144b..e2b5fb5e7 100644
--- a/nbr-examples/pom.xml
+++ b/nbr-examples/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.17.20</version>
+        <version>4.17.21-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -39,13 +39,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>nbr</artifactId>
-            <version>4.17.20</version>
+            <version>4.17.21-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>adapter-diag</artifactId>
-            <version>4.17.20</version>
+            <version>4.17.21-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/nbr/pom.xml b/nbr/pom.xml
index a5fc6f6b1..bb097fa03 100644
--- a/nbr/pom.xml
+++ b/nbr/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.17.20</version>
+        <version>4.17.21-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -40,37 +40,37 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-rest</artifactId>
-            <version>4.17.20</version>
+            <version>4.17.21-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-cli</artifactId>
-            <version>4.17.20</version>
+            <version>4.17.21-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-docs</artifactId>
-            <version>4.17.20</version>
+            <version>4.17.21-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-core</artifactId>
-            <version>4.17.20</version>
+            <version>4.17.21-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-extensions</artifactId>
-            <version>4.17.20</version>
+            <version>4.17.21-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>adapter-diag</artifactId>
-            <version>4.17.20</version>
+            <version>4.17.21-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/pom.xml b/pom.xml
index 770fb30a3..69a32d5a1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.17.20</version>
+        <version>4.17.21-SNAPSHOT</version>
         <relativePath>mvn-defaults</relativePath>
     </parent>
 
@@ -165,7 +165,7 @@
             scm:git:https://github.com/nosqlbench/nosqlbench.git
         </developerConnection>
         <url>scm:git:git@github.com:nosqlbench/nosqlbench.git</url>
-        <tag>nosqlbench-4.17.20</tag>
+        <tag>HEAD</tag>
     </scm>
 
     <distributionManagement>
diff --git a/virtdata-api/pom.xml b/virtdata-api/pom.xml
index eb4be0fd9..cc2d22734 100644
--- a/virtdata-api/pom.xml
+++ b/virtdata-api/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.nosqlbench</groupId>
         <artifactId>mvn-defaults</artifactId>
-        <version>4.17.20</version>
+        <version>4.17.21-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,14 +23,14 @@
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
-            <version>4.17.20</version>
+            <version>4.17.21-SNAPSHOT</version>
             <artifactId>nb-api</artifactId>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lang</artifactId>
-            <version>4.17.20</version>
+            <version>4.17.21-SNAPSHOT</version>
         </dependency>
 
 
diff --git a/virtdata-lang/pom.xml b/virtdata-lang/pom.xml
index 14708687d..17e4cc3b4 100644
--- a/virtdata-lang/pom.xml
+++ b/virtdata-lang/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.17.20</version>
+        <version>4.17.21-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
diff --git a/virtdata-lib-basics/pom.xml b/virtdata-lib-basics/pom.xml
index 892ca315f..111999fd7 100644
--- a/virtdata-lib-basics/pom.xml
+++ b/virtdata-lib-basics/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.17.20</version>
+        <version>4.17.21-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-            <version>4.17.20</version>
+            <version>4.17.21-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/virtdata-lib-curves4/pom.xml b/virtdata-lib-curves4/pom.xml
index dd8b33e56..c275589a9 100644
--- a/virtdata-lib-curves4/pom.xml
+++ b/virtdata-lib-curves4/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.17.20</version>
+        <version>4.17.21-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-            <version>4.17.20</version>
+            <version>4.17.21-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-basics</artifactId>
-            <version>4.17.20</version>
+            <version>4.17.21-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/virtdata-lib-random/pom.xml b/virtdata-lib-random/pom.xml
index b8fd35fb9..4ca0eae8c 100644
--- a/virtdata-lib-random/pom.xml
+++ b/virtdata-lib-random/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.17.20</version>
+        <version>4.17.21-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,13 +20,13 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-            <version>4.17.20</version>
+            <version>4.17.21-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-basics</artifactId>
-            <version>4.17.20</version>
+            <version>4.17.21-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/virtdata-lib-realer/pom.xml b/virtdata-lib-realer/pom.xml
index 58fabab00..61e31970a 100644
--- a/virtdata-lib-realer/pom.xml
+++ b/virtdata-lib-realer/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.17.20</version>
+        <version>4.17.21-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-basics</artifactId>
-            <version>4.17.20</version>
+            <version>4.17.21-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/virtdata-realdata/pom.xml b/virtdata-realdata/pom.xml
index d06bdba8e..9a14134c7 100644
--- a/virtdata-realdata/pom.xml
+++ b/virtdata-realdata/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.17.20</version>
+        <version>4.17.21-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-            <version>4.17.20</version>
+            <version>4.17.21-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/virtdata-userlibs/pom.xml b/virtdata-userlibs/pom.xml
index d4f110734..f0b09b6de 100644
--- a/virtdata-userlibs/pom.xml
+++ b/virtdata-userlibs/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>4.17.20</version>
+        <version>4.17.21-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -18,42 +18,42 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-realdata</artifactId>
-            <version>4.17.20</version>
+            <version>4.17.21-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-realer</artifactId>
-            <version>4.17.20</version>
+            <version>4.17.21-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-            <version>4.17.20</version>
+            <version>4.17.21-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-random</artifactId>
-            <version>4.17.20</version>
+            <version>4.17.21-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
-            <version>4.17.20</version>
+            <version>4.17.21-SNAPSHOT</version>
             <artifactId>virtdata-lib-basics</artifactId>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
-            <version>4.17.20</version>
+            <version>4.17.21-SNAPSHOT</version>
             <artifactId>virtdata-lib-curves4</artifactId>
         </dependency>
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>docsys</artifactId>
-            <version>4.17.20</version>
+            <version>4.17.21-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>