diff --git a/SAS/OTB/OTB-distribution/pom.xml b/SAS/OTB/OTB-distribution/pom.xml
index d888780e1cc4a0f92d63fa98c7d81f4d6873100a..c076ac21716cf29c291ab970e91bb2dd6eba6ce5 100644
--- a/SAS/OTB/OTB-distribution/pom.xml
+++ b/SAS/OTB/OTB-distribution/pom.xml
@@ -10,18 +10,18 @@
   <parent>
     <groupId>nl.astron.lofar.sas.otb</groupId>
     <artifactId>otb-parent</artifactId>
-    <version>2.16.3</version>
+    <version>2.21.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>OTB-distribution</artifactId>
-  <version>2.16.3</version>
+  <version>2.21.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
 
   <!-- Specification for the SCM used by the project, such as CVS, Subversion, etc. -->
   <scm>
-    <connection>scm:svn:https://svn.astron.nl/LOFAR/tags/Maven-Release-nl.astron.lofar.sas.otb.otb-parent-2.16.3/OTB-distribution</connection>
-    <developerConnection>scm:svn:https://svn.astron.nl/LOFAR/tags/Maven-Release-nl.astron.lofar.sas.otb.otb-parent-2.16.3/OTB-distribution</developerConnection>
+    <connection>scm:svn:https://svn.astron.nl/LOFAR/tags/Maven-Release-nl.astron.lofar.sas.otb.otb-parent-1.17.4/OTB-distribution</connection>
+    <developerConnection>scm:svn:https://svn.astron.nl/LOFAR/tags/Maven-Release-nl.astron.lofar.sas.otb.otb-parent-1.17.4/OTB-distribution</developerConnection>
   </scm>
 
 
diff --git a/SAS/OTB/OTB/pom.xml b/SAS/OTB/OTB/pom.xml
index 584ff140306f1db839b7709d505f0cd2e4ee091f..80ba64fe141ce6464ea4f3f547ba79b2b7a09772 100644
--- a/SAS/OTB/OTB/pom.xml
+++ b/SAS/OTB/OTB/pom.xml
@@ -10,7 +10,7 @@
   <parent>
     <groupId>nl.astron.lofar.sas.otb</groupId>
     <artifactId>otb-parent</artifactId>
-    <version>2.16.3</version>
+    <version>2.21.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>OTB</artifactId>
@@ -23,8 +23,8 @@
 
   <!-- Specification for the SCM used by the project, such as CVS, Subversion, etc. -->
   <scm>
-    <connection>scm:svn:https://svn.astron.nl/LOFAR/tags/Maven-Release-nl.astron.lofar.sas.otb.otb-parent-2.16.3/OTB</connection>
-    <developerConnection>scm:svn:https://svn.astron.nl/LOFAR/tags/Maven-Release-nl.astron.lofar.sas.otb.otb-parent-2.16.3/OTB</developerConnection>
+    <connection>scm:svn:https://svn.astron.nl/LOFAR/trunk/SAS/OTB/OTB</connection>
+    <developerConnection>scm:svn:https://svn.astron.nl/LOFAR/trunk/SAS/OTB/OTB</developerConnection>
   </scm>
 
 
diff --git a/SAS/OTB/RSP/pom.xml b/SAS/OTB/RSP/pom.xml
index 16e11e365eb62c4c57c1f4252bfd80043622f95b..8813c250551420cd24efc3b7b9829309dbd7f11e 100644
--- a/SAS/OTB/RSP/pom.xml
+++ b/SAS/OTB/RSP/pom.xml
@@ -9,16 +9,16 @@
   <parent>
     <groupId>nl.astron.lofar.sas.otb</groupId>
     <artifactId>otb-parent</artifactId>
-    <version>2.16.3</version>
+    <version>2.21.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>RSP</artifactId>
-  <version>2.16.3</version>
+  <version>1.17.4</version>
 
   <!-- Specification for the SCM used by the project, such as CVS, Subversion, etc. -->
   <scm>
-    <connection>scm:svn:https://svn.astron.nl/LOFAR/tags/Maven-Release-nl.astron.lofar.sas.otb.otb-parent-2.16.3/RSP</connection>
-    <developerConnection>scm:svn:https://svn.astron.nl/LOFAR/tags/Maven-Release-nl.astron.lofar.sas.otb.otb-parent-2.16.3/RSP</developerConnection>
+    <connection>scm:svn:https://svn.astron.nl/LOFAR/tags/Maven-Release-nl.astron.lofar.sas.otb.otb-parent-1.17.4/RSP</connection>
+    <developerConnection>scm:svn:https://svn.astron.nl/LOFAR/tags/Maven-Release-nl.astron.lofar.sas.otb.otb-parent-1.17.4/RSP</developerConnection>
   </scm>
 
 
diff --git a/SAS/OTB/jOTDB3/pom.xml b/SAS/OTB/jOTDB3/pom.xml
index 40c2e41ed1d6254a73fa68828a61356b7dec5fe1..5922d492aeb3122069dacec62249f9bfd4970216 100644
--- a/SAS/OTB/jOTDB3/pom.xml
+++ b/SAS/OTB/jOTDB3/pom.xml
@@ -10,15 +10,15 @@
   <parent>
     <groupId>nl.astron.lofar.sas.otb</groupId>
     <artifactId>otb-parent</artifactId>
-    <version>2.16.3</version>
+    <version>2.21.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>jOTDB3</artifactId>
 
   <!-- Specification for the SCM used by the project, such as CVS, Subversion, etc. -->
   <scm>
-    <connection>scm:svn:https://svn.astron.nl/LOFAR/tags/Maven-Release-nl.astron.lofar.sas.otb.otb-parent-2.16.3/jOTDB3</connection>
-    <developerConnection>scm:svn:https://svn.astron.nl/LOFAR/tags/Maven-Release-nl.astron.lofar.sas.otb.otb-parent-2.16.3/jOTDB3</developerConnection>
+    <connection>scm:svn:https://svn.astron.nl/LOFAR/trunk/SAS/OTB/jOTDB3</connection>
+    <developerConnection>scm:svn:https://svn.astron.nl/LOFAR/trunk/SAS/OTB/jOTDB3</developerConnection>
   </scm>
 
 
diff --git a/SAS/OTB/jParmFacade/pom.xml b/SAS/OTB/jParmFacade/pom.xml
index 891660812d24920343c1e57fddde1e5090063f35..a5396873cfe7d46d744a415f5a1b15b16cffc3e6 100644
--- a/SAS/OTB/jParmFacade/pom.xml
+++ b/SAS/OTB/jParmFacade/pom.xml
@@ -10,15 +10,15 @@
   <parent>
     <groupId>nl.astron.lofar.sas.otb</groupId>
     <artifactId>otb-parent</artifactId>
-    <version>2.16.3</version>
+    <version>2.21.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>jParmFacade</artifactId>
 
   <!-- Specification for the SCM used by the project, such as CVS, Subversion, etc. -->
   <scm>
-    <connection>scm:svn:https://svn.astron.nl/LOFAR/tags/Maven-Release-nl.astron.lofar.sas.otb.otb-parent-2.16.3/jParmFacade</connection>
-    <developerConnection>scm:svn:https://svn.astron.nl/LOFAR/tags/Maven-Release-nl.astron.lofar.sas.otb.otb-parent-2.16.3/jParmFacade</developerConnection>
+    <connection>scm:svn:https://svn.astron.nl/LOFAR/trunk/SAS/OTB/jParmFacade</connection>
+    <developerConnection>scm:svn:https://svn.astron.nl/LOFAR/trunk/SAS/OTB/jParmFacade</developerConnection>
   </scm>
 
 
diff --git a/SAS/OTB/jRSP/pom.xml b/SAS/OTB/jRSP/pom.xml
index 730bead4c9841ea98a0775e3a29822118e6b2e0e..95c61c2af69d54471f0838e937b72429398400c4 100644
--- a/SAS/OTB/jRSP/pom.xml
+++ b/SAS/OTB/jRSP/pom.xml
@@ -9,15 +9,15 @@
   <parent>
     <groupId>nl.astron.lofar.sas.otb</groupId>
     <artifactId>otb-parent</artifactId>
-    <version>2.16.3</version>
+    <version>2.21.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>jRSP</artifactId>
 
   <!-- Specification for the SCM used by the project, such as CVS, Subversion, etc. -->
   <scm>
-    <connection>scm:svn:https://svn.astron.nl/LOFAR/tags/Maven-Release-nl.astron.lofar.sas.otb.otb-parent-2.16.3/jRSP</connection>
-    <developerConnection>scm:svn:https://svn.astron.nl/LOFAR/tags/Maven-Release-nl.astron.lofar.sas.otb.otb-parent-2.16.3/jRSP</developerConnection>
+    <connection>scm:svn:https://svn.astron.nl/LOFAR/trunk/SAS/OTB/jRSP</connection>
+    <developerConnection>scm:svn:https://svn.astron.nl/LOFAR/trunk/OTB/jRSP</developerConnection>
   </scm>
 
 
diff --git a/SAS/OTB/pom.xml b/SAS/OTB/pom.xml
index f2eb00d852ff24be37faa2efb5a0a6ca991e9fcf..624b638c18fa7fa2d0b9972b3a86d526fe177745 100644
--- a/SAS/OTB/pom.xml
+++ b/SAS/OTB/pom.xml
@@ -15,7 +15,7 @@
 
   <groupId>nl.astron.lofar.sas.otb</groupId>
   <artifactId>otb-parent</artifactId>
-  <version>2.16.3</version>
+  <version>2.21.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
 
@@ -28,8 +28,8 @@
 
   <!-- Specification for the SCM used by the project, such as CVS, Subversion, etc. -->
   <scm>
-    <connection>scm:svn:http://svn.astron.nl/LOFAR/tags/Maven-Release-nl.astron.lofar.sas.otb.otb-parent-2.16.3</connection>
-    <developerConnection>scm:svn:https://svn.astron.nl/LOFAR/tags/Maven-Release-nl.astron.lofar.sas.otb.otb-parent-2.16.3</developerConnection>
+    <connection>scm:svn:http://svn.astron.nl/LOFAR/trunk/SAS/OTB</connection>
+    <developerConnection>scm:svn:https://svn.astron.nl/LOFAR/trunk/SAS/OTB</developerConnection>
   </scm>
 
 
@@ -145,7 +145,7 @@
       <dependency>
         <groupId>${project.groupId}</groupId>
         <artifactId>OTB-distribution</artifactId>
-        <version>2.16.3</version>
+        <version>2.21.0-SNAPSHOT</version>
       </dependency>
 
       <!-- Import the group 'nl.astron.lofar.lib' -->