diff --git a/archive/archive-core/pom.xml b/archive/archive-core/pom.xml
index ff701ae692..77356e677b 100644
--- a/archive/archive-core/pom.xml
+++ b/archive/archive-core/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.netarchivesuite</groupId>
     <artifactId>archive</artifactId>
-    <version>5.7-SNAPSHOT</version>
+    <version>6.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>archive-core</artifactId>
diff --git a/archive/archive-test/pom.xml b/archive/archive-test/pom.xml
index aa81d7d6c1..f4f6570c5c 100644
--- a/archive/archive-test/pom.xml
+++ b/archive/archive-test/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.netarchivesuite</groupId>
     <artifactId>archive</artifactId>
-    <version>5.7-SNAPSHOT</version>
+    <version>6.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>archive-test</artifactId>
diff --git a/archive/bitpreservation-gui/pom.xml b/archive/bitpreservation-gui/pom.xml
index d10efb92a9..c7280f3c24 100644
--- a/archive/bitpreservation-gui/pom.xml
+++ b/archive/bitpreservation-gui/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.netarchivesuite</groupId>
     <artifactId>archive</artifactId>
-    <version>5.7-SNAPSHOT</version>
+    <version>6.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>bitpreservation-gui</artifactId>
diff --git a/archive/pom.xml b/archive/pom.xml
index 32b2b6fcc9..1c9ec3a72e 100644
--- a/archive/pom.xml
+++ b/archive/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.netarchivesuite</groupId>
     <artifactId>netarchivesuite</artifactId>
-    <version>5.7-SNAPSHOT</version>
+    <version>6.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>archive</artifactId>
diff --git a/build-tools/pom.xml b/build-tools/pom.xml
index 7cfca579d3..1cc17c0075 100644
--- a/build-tools/pom.xml
+++ b/build-tools/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.netarchivesuite</groupId>
     <artifactId>netarchivesuite</artifactId>
-    <version>5.7-SNAPSHOT</version>
+    <version>6.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>build-tools</artifactId>
diff --git a/common/common-core/pom.xml b/common/common-core/pom.xml
index 58003687ba..0eee0a8a52 100644
--- a/common/common-core/pom.xml
+++ b/common/common-core/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.netarchivesuite</groupId>
     <artifactId>common</artifactId>
-    <version>5.7-SNAPSHOT</version>
+    <version>6.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>common-core</artifactId>
diff --git a/common/common-test/pom.xml b/common/common-test/pom.xml
index 1508a65c64..50d6789e7f 100644
--- a/common/common-test/pom.xml
+++ b/common/common-test/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.netarchivesuite</groupId>
     <artifactId>common</artifactId>
-    <version>5.7-SNAPSHOT</version>
+    <version>6.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>common-test</artifactId>
diff --git a/common/netarchivesuite-test-utils/pom.xml b/common/netarchivesuite-test-utils/pom.xml
index d9509645d9..895102cc35 100644
--- a/common/netarchivesuite-test-utils/pom.xml
+++ b/common/netarchivesuite-test-utils/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.netarchivesuite</groupId>
     <artifactId>common</artifactId>
-    <version>5.7-SNAPSHOT</version>
+    <version>6.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/common/pom.xml b/common/pom.xml
index 73aa7dd8f7..a6b9dd504f 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.netarchivesuite</groupId>
     <artifactId>netarchivesuite</artifactId>
-    <version>5.7-SNAPSHOT</version>
+    <version>6.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>common</artifactId>
diff --git a/deploy/deploy-core/pom.xml b/deploy/deploy-core/pom.xml
index d66abb43c5..c05b1326a2 100644
--- a/deploy/deploy-core/pom.xml
+++ b/deploy/deploy-core/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.netarchivesuite</groupId>
     <artifactId>deploy</artifactId>
-    <version>5.7-SNAPSHOT</version>
+    <version>6.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>deploy-core</artifactId>
diff --git a/deploy/deploy-test/pom.xml b/deploy/deploy-test/pom.xml
index 45ea13fd31..30c317c56a 100644
--- a/deploy/deploy-test/pom.xml
+++ b/deploy/deploy-test/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.netarchivesuite</groupId>
     <artifactId>deploy</artifactId>
-    <version>5.7-SNAPSHOT</version>
+    <version>6.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>deploy-test</artifactId>
@@ -31,7 +31,7 @@
     <dependency>
       <groupId>org.netarchivesuite</groupId>
       <artifactId>common-test</artifactId>
-      <version>5.7-SNAPSHOT</version>
+      <version>6.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/deploy/distribution/pom.xml b/deploy/distribution/pom.xml
index 64ca7ed207..eab2a3e8ac 100644
--- a/deploy/distribution/pom.xml
+++ b/deploy/distribution/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.netarchivesuite</groupId>
     <artifactId>deploy</artifactId>
-    <version>5.7-SNAPSHOT</version>
+    <version>6.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>distribution</artifactId>
@@ -94,7 +94,7 @@
     <dependency>
       <groupId>org.netarchivesuite</groupId>
       <artifactId>heritrix3-monitor</artifactId>
-      <version>5.7-SNAPSHOT</version>
+      <version>6.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/deploy/pom.xml b/deploy/pom.xml
index 8ff24dfa96..fcc9639a3b 100644
--- a/deploy/pom.xml
+++ b/deploy/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.netarchivesuite</groupId>
     <artifactId>netarchivesuite</artifactId>
-    <version>5.7-SNAPSHOT</version>
+    <version>6.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>deploy</artifactId>
diff --git a/harvester/harvest-scheduler/pom.xml b/harvester/harvest-scheduler/pom.xml
index 6f7ae26a1a..5fe65181e3 100644
--- a/harvester/harvest-scheduler/pom.xml
+++ b/harvester/harvest-scheduler/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.netarchivesuite</groupId>
     <artifactId>harvester</artifactId>
-    <version>5.7-SNAPSHOT</version>
+    <version>6.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>harvest-scheduler</artifactId>
diff --git a/harvester/harvestchannel-gui/pom.xml b/harvester/harvestchannel-gui/pom.xml
index e191eb0cbb..d25a289be2 100644
--- a/harvester/harvestchannel-gui/pom.xml
+++ b/harvester/harvestchannel-gui/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.netarchivesuite</groupId>
     <artifactId>harvester</artifactId>
-    <version>5.7-SNAPSHOT</version>
+    <version>6.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>harvestchannel-gui</artifactId>
diff --git a/harvester/harvestdefinition-gui/pom.xml b/harvester/harvestdefinition-gui/pom.xml
index e56b455e55..b9d7bbc054 100644
--- a/harvester/harvestdefinition-gui/pom.xml
+++ b/harvester/harvestdefinition-gui/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.netarchivesuite</groupId>
     <artifactId>harvester</artifactId>
-    <version>5.7-SNAPSHOT</version>
+    <version>6.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>harvestdefinition-gui</artifactId>
diff --git a/harvester/harvester-core/pom.xml b/harvester/harvester-core/pom.xml
index a697f57c31..c0933130fd 100644
--- a/harvester/harvester-core/pom.xml
+++ b/harvester/harvester-core/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.netarchivesuite</groupId>
     <artifactId>harvester</artifactId>
-    <version>5.7-SNAPSHOT</version>
+    <version>6.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>harvester-core</artifactId>
diff --git a/harvester/harvester-test/pom.xml b/harvester/harvester-test/pom.xml
index 3a759a4b2c..bd17d55776 100644
--- a/harvester/harvester-test/pom.xml
+++ b/harvester/harvester-test/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.netarchivesuite</groupId>
     <artifactId>harvester</artifactId>
-    <version>5.7-SNAPSHOT</version>
+    <version>6.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>harvester-test</artifactId>
diff --git a/harvester/heritrix3/heritrix3-bundler/pom.xml b/harvester/heritrix3/heritrix3-bundler/pom.xml
index 6a8860dbb3..099b28a496 100644
--- a/harvester/heritrix3/heritrix3-bundler/pom.xml
+++ b/harvester/heritrix3/heritrix3-bundler/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.netarchivesuite</groupId>
     <artifactId>heritrix3</artifactId>
-    <version>5.7-SNAPSHOT</version>
+    <version>6.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>heritrix3-bundler</artifactId>
diff --git a/harvester/heritrix3/heritrix3-controller/pom.xml b/harvester/heritrix3/heritrix3-controller/pom.xml
index f535e66ccf..716a689eba 100644
--- a/harvester/heritrix3/heritrix3-controller/pom.xml
+++ b/harvester/heritrix3/heritrix3-controller/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.netarchivesuite</groupId>
     <artifactId>heritrix3</artifactId>
-    <version>5.7-SNAPSHOT</version>
+    <version>6.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>heritrix3-controller</artifactId>
diff --git a/harvester/heritrix3/heritrix3-extensions/pom.xml b/harvester/heritrix3/heritrix3-extensions/pom.xml
index e9e16fd3f6..f6d92eeade 100644
--- a/harvester/heritrix3/heritrix3-extensions/pom.xml
+++ b/harvester/heritrix3/heritrix3-extensions/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.netarchivesuite</groupId>
     <artifactId>heritrix3</artifactId>
-    <version>5.7-SNAPSHOT</version>
+    <version>6.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>heritrix3-extensions</artifactId>
diff --git a/harvester/heritrix3/heritrix3-monitor/pom.xml b/harvester/heritrix3/heritrix3-monitor/pom.xml
index 96dcea8176..9d768df3be 100644
--- a/harvester/heritrix3/heritrix3-monitor/pom.xml
+++ b/harvester/heritrix3/heritrix3-monitor/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.netarchivesuite</groupId>
     <artifactId>heritrix3</artifactId>
-    <version>5.7-SNAPSHOT</version>
+    <version>6.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>heritrix3-monitor</artifactId>
diff --git a/harvester/heritrix3/pom.xml b/harvester/heritrix3/pom.xml
index a9c1daf652..a0ad5c4b6c 100644
--- a/harvester/heritrix3/pom.xml
+++ b/harvester/heritrix3/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.netarchivesuite</groupId>
     <artifactId>harvester</artifactId>
-    <version>5.7-SNAPSHOT</version>
+    <version>6.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/harvester/history-gui/pom.xml b/harvester/history-gui/pom.xml
index 567793b226..04a2356463 100644
--- a/harvester/history-gui/pom.xml
+++ b/harvester/history-gui/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.netarchivesuite</groupId>
     <artifactId>harvester</artifactId>
-    <version>5.7-SNAPSHOT</version>
+    <version>6.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>history-gui</artifactId>
diff --git a/harvester/pom.xml b/harvester/pom.xml
index dc6ca963a5..1065210766 100644
--- a/harvester/pom.xml
+++ b/harvester/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.netarchivesuite</groupId>
     <artifactId>netarchivesuite</artifactId>
-    <version>5.7-SNAPSHOT</version>
+    <version>6.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>harvester</artifactId>
diff --git a/harvester/qa-gui/pom.xml b/harvester/qa-gui/pom.xml
index 8ce45d4ace..7b6082aae2 100644
--- a/harvester/qa-gui/pom.xml
+++ b/harvester/qa-gui/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.netarchivesuite</groupId>
     <artifactId>netarchivesuite</artifactId>
-    <version>5.7-SNAPSHOT</version>
+    <version>6.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/integration-test/pom.xml b/integration-test/pom.xml
index 5a16b9cb10..2d4af51a38 100644
--- a/integration-test/pom.xml
+++ b/integration-test/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.netarchivesuite</groupId>
     <artifactId>netarchivesuite</artifactId>
-    <version>5.7-SNAPSHOT</version>
+    <version>6.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>integration-test</artifactId>
diff --git a/integration-test/system-test/pom.xml b/integration-test/system-test/pom.xml
index 499f486187..0e5add0a11 100644
--- a/integration-test/system-test/pom.xml
+++ b/integration-test/system-test/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.netarchivesuite</groupId>
     <artifactId>integration-test</artifactId>
-    <version>5.7-SNAPSHOT</version>
+    <version>6.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>system-test</artifactId>
diff --git a/monitor/monitor-core/pom.xml b/monitor/monitor-core/pom.xml
index 5efca1d840..3010931141 100644
--- a/monitor/monitor-core/pom.xml
+++ b/monitor/monitor-core/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.netarchivesuite</groupId>
     <artifactId>monitor</artifactId>
-    <version>5.7-SNAPSHOT</version>
+    <version>6.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>monitor-core</artifactId>
diff --git a/monitor/monitor-test/pom.xml b/monitor/monitor-test/pom.xml
index 3bb8f4c0b9..22109f1759 100644
--- a/monitor/monitor-test/pom.xml
+++ b/monitor/monitor-test/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.netarchivesuite</groupId>
     <artifactId>monitor</artifactId>
-    <version>5.7-SNAPSHOT</version>
+    <version>6.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>monitor-test</artifactId>
diff --git a/monitor/pom.xml b/monitor/pom.xml
index 3405178528..80b96a321d 100644
--- a/monitor/pom.xml
+++ b/monitor/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.netarchivesuite</groupId>
     <artifactId>netarchivesuite</artifactId>
-    <version>5.7-SNAPSHOT</version>
+    <version>6.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>monitor</artifactId>
diff --git a/monitor/status-gui/pom.xml b/monitor/status-gui/pom.xml
index 1486010592..c10f08adbd 100644
--- a/monitor/status-gui/pom.xml
+++ b/monitor/status-gui/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.netarchivesuite</groupId>
     <artifactId>monitor</artifactId>
-    <version>5.7-SNAPSHOT</version>
+    <version>6.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>status-gui</artifactId>
diff --git a/pom.xml b/pom.xml
index 2349528938..cc5d7159fb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
   <groupId>org.netarchivesuite</groupId>
   <artifactId>netarchivesuite</artifactId>
-  <version>5.7-SNAPSHOT</version>
+  <version>6.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>NetarchiveSuite</name>
@@ -19,7 +19,7 @@
     <logback.version>${logback-core.version}</logback.version>
     <webarchive-commons.version>1.1.5</webarchive-commons.version>
     <!-- Icelandic special brew of H3. -->
-    <heritrix3.version>3.3.0-BDB-5.0.x-NAS-6.0-SNAPSHOT</heritrix3.version>
+    <heritrix3.version>3.4.0-20200518-NAS-6.0</heritrix3.version>
     <heritrix3-wrapper.version>1.0.4-SNAPSHOT</heritrix3-wrapper.version>
     <wayback.version>1.8.0-20130411</wayback.version>
     <openwayback.version>2.0.0</openwayback.version>
@@ -872,7 +872,7 @@
             <dependency>
               <groupId>org.netarchivesuite</groupId>
               <artifactId>build-tools</artifactId>
-              <version>5.7-SNAPSHOT</version>
+              <version>6.0-SNAPSHOT</version>
             </dependency>
           </dependencies>
         </plugin>
diff --git a/wayback/pom.xml b/wayback/pom.xml
index 704b438361..9105bfc436 100644
--- a/wayback/pom.xml
+++ b/wayback/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.netarchivesuite</groupId>
     <artifactId>netarchivesuite</artifactId>
-    <version>5.7-SNAPSHOT</version>
+    <version>6.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>wayback</artifactId>
diff --git a/wayback/wayback-indexer/pom.xml b/wayback/wayback-indexer/pom.xml
index f5d5060e7a..0a92345e1a 100644
--- a/wayback/wayback-indexer/pom.xml
+++ b/wayback/wayback-indexer/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.netarchivesuite</groupId>
     <artifactId>wayback</artifactId>
-    <version>5.7-SNAPSHOT</version>
+    <version>6.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>wayback-indexer</artifactId>
diff --git a/wayback/wayback-resourcestore/pom.xml b/wayback/wayback-resourcestore/pom.xml
index fe3f271996..2a4e401801 100644
--- a/wayback/wayback-resourcestore/pom.xml
+++ b/wayback/wayback-resourcestore/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.netarchivesuite</groupId>
     <artifactId>wayback</artifactId>
-    <version>5.7-SNAPSHOT</version>
+    <version>6.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>wayback-resourcestore</artifactId>
diff --git a/wayback/wayback-test/pom.xml b/wayback/wayback-test/pom.xml
index 8ad6be3213..21e7ff4278 100644
--- a/wayback/wayback-test/pom.xml
+++ b/wayback/wayback-test/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.netarchivesuite</groupId>
     <artifactId>wayback</artifactId>
-    <version>5.7-SNAPSHOT</version>
+    <version>6.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>wayback-test</artifactId>
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>org.netarchivesuite</groupId>
       <artifactId>archive-core</artifactId>
-      <version>5.7-SNAPSHOT</version>
+      <version>6.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>