diff --git a/cachingxslt/pom.xml b/cachingxslt/pom.xml
index b9889e3613e..7062fe476aa 100644
--- a/cachingxslt/pom.xml
+++ b/cachingxslt/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.geonetwork-opensource</groupId>
 		<artifactId>geonetwork</artifactId>
-		<version>3.0.0-0</version>
+		<version>3.0.1-SNAPSHOT</version>
 	</parent>
 
 
diff --git a/common/pom.xml b/common/pom.xml
index 241934c1765..7832d908b11 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.geonetwork-opensource</groupId>
 		<artifactId>geonetwork</artifactId>
-		<version>3.0.0-0</version>
+		<version>3.0.1-SNAPSHOT</version>
 	</parent>
 
 
diff --git a/core/pom.xml b/core/pom.xml
index 930e381689b..a49517f8414 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>geonetwork</artifactId>
         <groupId>org.geonetwork-opensource</groupId>
-        <version>3.0.0-0</version>
+        <version>3.0.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/csw-server/pom.xml b/csw-server/pom.xml
index f37c7ac2348..97f957f835c 100644
--- a/csw-server/pom.xml
+++ b/csw-server/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>geonetwork</artifactId>
 		<groupId>org.geonetwork-opensource</groupId>
-		<version>3.0.0-0</version>
+		<version>3.0.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/docs/pom.xml b/docs/pom.xml
index d0625b37a1f..75eeff6dbcd 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.geonetwork-opensource</groupId>
     <artifactId>geonetwork</artifactId>
-    <version>3.0.0-0</version>
+    <version>3.0.1-SNAPSHOT</version>
   </parent>
 
 
diff --git a/domain/pom.xml b/domain/pom.xml
index 000d00954d5..f72e3397247 100644
--- a/domain/pom.xml
+++ b/domain/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>geonetwork</artifactId>
         <groupId>org.geonetwork-opensource</groupId>
-        <version>3.0.0-0</version>
+        <version>3.0.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/e2e-tests/pom.xml b/e2e-tests/pom.xml
index 8dbded75dd2..fafe25b901b 100644
--- a/e2e-tests/pom.xml
+++ b/e2e-tests/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.geonetwork-opensource</groupId>
         <artifactId>geonetwork</artifactId>
-        <version>3.0.0-0</version>
+        <version>3.0.1-SNAPSHOT</version>
     </parent>
     <artifactId>e2e-tests</artifactId>
     <packaging>pom</packaging>
diff --git a/events/pom.xml b/events/pom.xml
index d4dc89e208b..2af40532b9a 100644
--- a/events/pom.xml
+++ b/events/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>geonetwork</artifactId>
     <groupId>org.geonetwork-opensource</groupId>
-    <version>3.0.0-0</version>
+    <version>3.0.1-SNAPSHOT</version>
   </parent>
 
   <name>GeoNetwork Events</name>
diff --git a/geoserver b/geoserver
index fb62f399dfc..1eb4c68418e 160000
--- a/geoserver
+++ b/geoserver
@@ -1 +1 @@
-Subproject commit fb62f399dfc1b0c30aaaacc9952a49abeb668884
+Subproject commit 1eb4c68418e44ac36da5cb425124118799f75e49
diff --git a/harvesters/pom.xml b/harvesters/pom.xml
index 9525f3a4e44..6349d4c7a5f 100644
--- a/harvesters/pom.xml
+++ b/harvesters/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>geonetwork</artifactId>
 		<groupId>org.geonetwork-opensource</groupId>
-		<version>3.0.0-0</version>
+		<version>3.0.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/healthmonitor/pom.xml b/healthmonitor/pom.xml
index 55967def14b..44346626431 100644
--- a/healthmonitor/pom.xml
+++ b/healthmonitor/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>geonetwork</artifactId>
 		<groupId>org.geonetwork-opensource</groupId>
-		<version>3.0.0-0</version>
+		<version>3.0.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/inspire-atom/pom.xml b/inspire-atom/pom.xml
index 34079e5e6ec..a21fdf37f52 100644
--- a/inspire-atom/pom.xml
+++ b/inspire-atom/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>geonetwork</artifactId>
         <groupId>org.geonetwork-opensource</groupId>
-        <version>3.0.0-0</version>
+        <version>3.0.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/installer/build.xml b/installer/build.xml
index 77b8e2c9225..e3152bcdc8f 100644
--- a/installer/build.xml
+++ b/installer/build.xml
@@ -21,8 +21,8 @@
   </condition>
 
   <property name="appName" value="geonetwork"/>
-  <property name="version" value="3.0.0"/>
-  <property name="subVersion" value="0"/>
+  <property name="version" value="3.0.1"/>
+  <property name="subVersion" value="SNAPSHOT"/>
   <property name="javaVersion" value="1.7.0"/>
   <!-- Minimum version required -->
   <property name="jre_url" value="http://openjdk.java.net/"/>
diff --git a/jmeter/pom.xml b/jmeter/pom.xml
index baeae4972a7..aafc2526674 100644
--- a/jmeter/pom.xml
+++ b/jmeter/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.geonetwork-opensource</groupId>
     <artifactId>geonetwork</artifactId>
-    <version>3.0.0-0</version>
+    <version>3.0.1-SNAPSHOT</version>
   </parent>
   <!-- =========================================================== -->
   <!--     Module Description                                      -->
diff --git a/oaipmh/pom.xml b/oaipmh/pom.xml
index 93a8d2d615b..55f87ecfc33 100644
--- a/oaipmh/pom.xml
+++ b/oaipmh/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.geonetwork-opensource</groupId>
 		<artifactId>geonetwork</artifactId>
-		<version>3.0.0-0</version>
+		<version>3.0.1-SNAPSHOT</version>
 	</parent>
 
 
diff --git a/pom.xml b/pom.xml
index 98afbb3efca..8e2375f7a5c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
   <groupId>org.geonetwork-opensource</groupId>
   <artifactId>geonetwork</artifactId>
   <packaging>pom</packaging>
-  <version>3.0.0-0</version>
+  <version>3.0.1-SNAPSHOT</version>
   <name>GeoNetwork opensource</name>
   <description>GeoNetwork opensource is a standards based, Free and
     Open Source catalog application to manage spatially referenced
diff --git a/schemas-test/pom.xml b/schemas-test/pom.xml
index ecf27c46b3a..b35cbd6686d 100644
--- a/schemas-test/pom.xml
+++ b/schemas-test/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>geonetwork</artifactId>
         <groupId>org.geonetwork-opensource</groupId>
-        <version>3.0.0-0</version>
+        <version>3.0.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
diff --git a/schemas/csw-record/pom.xml b/schemas/csw-record/pom.xml
index 6a447c614dd..6f9cbc740e5 100644
--- a/schemas/csw-record/pom.xml
+++ b/schemas/csw-record/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>schemas</artifactId>
     <groupId>org.geonetwork-opensource</groupId>
-    <version>3.0.0-0</version>
+    <version>3.0.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>schema-csw-record</artifactId>
diff --git a/schemas/dublin-core/pom.xml b/schemas/dublin-core/pom.xml
index de330a18f16..a793638d45e 100644
--- a/schemas/dublin-core/pom.xml
+++ b/schemas/dublin-core/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>schemas</artifactId>
     <groupId>org.geonetwork-opensource</groupId>
-    <version>3.0.0-0</version>
+    <version>3.0.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/schemas/iso19110/pom.xml b/schemas/iso19110/pom.xml
index b68a58d338e..8a1943818dc 100644
--- a/schemas/iso19110/pom.xml
+++ b/schemas/iso19110/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>schemas</artifactId>
     <groupId>org.geonetwork-opensource</groupId>
-    <version>3.0.0-0</version>
+    <version>3.0.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/schemas/iso19139/pom.xml b/schemas/iso19139/pom.xml
index b9ee60247ce..05892d9372d 100644
--- a/schemas/iso19139/pom.xml
+++ b/schemas/iso19139/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>schemas</artifactId>
     <groupId>org.geonetwork-opensource</groupId>
-    <version>3.0.0-0</version>
+    <version>3.0.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/schemas/pom.xml b/schemas/pom.xml
index a77d6fd5795..9c0e08ed4a5 100644
--- a/schemas/pom.xml
+++ b/schemas/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>geonetwork</artifactId>
     <groupId>org.geonetwork-opensource</groupId>
-    <version>3.0.0-0</version>
+    <version>3.0.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>schemas</artifactId>
diff --git a/schemas/schema-core/pom.xml b/schemas/schema-core/pom.xml
index 653ddf73924..44343da21c2 100644
--- a/schemas/schema-core/pom.xml
+++ b/schemas/schema-core/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>schemas</artifactId>
     <groupId>org.geonetwork-opensource</groupId>
-    <version>3.0.0-0</version>
+    <version>3.0.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/sde/pom.xml b/sde/pom.xml
index a66ba07b475..8f9783176e3 100644
--- a/sde/pom.xml
+++ b/sde/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.geonetwork-opensource</groupId>
     <artifactId>geonetwork</artifactId>
-    <version>3.0.0-0</version>
+    <version>3.0.1-SNAPSHOT</version>
   </parent>
   
   
diff --git a/services/pom.xml b/services/pom.xml
index e28b1f6e795..819967d488c 100644
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>geonetwork</artifactId>
 		<groupId>org.geonetwork-opensource</groupId>
-		<version>3.0.0-0</version>
+		<version>3.0.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/update-version.sh b/update-version.sh
index 8aa4d8a5419..9955dcd00e2 100755
--- a/update-version.sh
+++ b/update-version.sh
@@ -116,11 +116,11 @@ echo
 
 # Update SQL - needs improvements
 echo 'SQL script'
-sed $sedopt "s/'system/platform/version', '.*'/'system/platform/version', '${new_version_main}'/g" web/src/main/webapp/WEB-INF/classes/setup/sql/data/data-db-default.sql
-sed $sedopt "s/'system/platform/subVersion', '.*'/'system/platform/subVersion', '${sub_version}'/g" web/src/main/webapp/WEB-INF/classes/setup/sql/data/data-db-default.sql
+sed $sedopt "s/'system\/platform\/version', '.*', 0/'system\/platform\/version', '${new_version_main}', 0/g" web/src/main/webapp/WEB-INF/classes/setup/sql/data/data-db-default.sql
+sed $sedopt "s/'system\/platform\/subVersion', '.*', 0/'system\/platform\/subVersion', '${sub_version}', 0/g" web/src/main/webapp/WEB-INF/classes/setup/sql/data/data-db-default.sql
 
-find . -wholename *v${version//[.]/}/migrate-default.sql -exec sed $sedopt "s/value='${version}' WHERE name='system/platform/version'/value='${new_version_main}' WHERE name='system/platform/version'/g" {} \;
-find . -wholename *v${version//[.]/}/migrate-default.sql -exec sed $sedopt "s/value='.*' WHERE name='system/platform/subVersion'/value='${sub_version}' WHERE name='system/platform/subVersion'/g" {} \;
+find . -wholename *v${version//[.]/}/migrate-default.sql -exec sed $sedopt "s/value='${version}' WHERE name='system\/platform\/version'/value='${new_version_main}' WHERE name='system\/platform\/version'/g" {} \;
+find . -wholename *v${version//[.]/}/migrate-default.sql -exec sed $sedopt "s/value='.*' WHERE name='system\/platform\/subVersion'/value='${sub_version}' WHERE name='system\/platform\/subVersion'/g" {} \;
 
 
 # Update version pom files
diff --git a/web-client/pom.xml b/web-client/pom.xml
index 9f8c9b3bbac..bae9fe7940d 100644
--- a/web-client/pom.xml
+++ b/web-client/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.geonetwork-opensource</groupId>
     <artifactId>geonetwork</artifactId>
-    <version>3.0.0-0</version>
+    <version>3.0.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>geonetwork-client</artifactId>
diff --git a/web-ui-docs/pom.xml b/web-ui-docs/pom.xml
index 779c2d3e244..77f43374c6d 100644
--- a/web-ui-docs/pom.xml
+++ b/web-ui-docs/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>geonetwork</artifactId>
     <groupId>org.geonetwork-opensource</groupId>
-    <version>3.0.0-0</version>
+    <version>3.0.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/web-ui/pom.xml b/web-ui/pom.xml
index c87ad9b05f3..7525204487f 100644
--- a/web-ui/pom.xml
+++ b/web-ui/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.geonetwork-opensource</groupId>
     <artifactId>geonetwork</artifactId>
-    <version>3.0.0-0</version>
+    <version>3.0.1-SNAPSHOT</version>
   </parent>
 
   <groupId>org.geonetwork-opensource</groupId>
diff --git a/web/pom.xml b/web/pom.xml
index a112c4725d4..a9e278509ee 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.geonetwork-opensource</groupId>
     <artifactId>geonetwork</artifactId>
-    <version>3.0.0-0</version>
+    <version>3.0.1-SNAPSHOT</version>
   </parent>
 
 
diff --git a/web/src/main/webapp/WEB-INF/classes/setup/sql/data/data-db-default.sql b/web/src/main/webapp/WEB-INF/classes/setup/sql/data/data-db-default.sql
index 801e2014233..371e6f3ded0 100644
--- a/web/src/main/webapp/WEB-INF/classes/setup/sql/data/data-db-default.sql
+++ b/web/src/main/webapp/WEB-INF/classes/setup/sql/data/data-db-default.sql
@@ -554,8 +554,8 @@ INSERT INTO Operations (id, name) VALUES  (6,'featured');
 INSERT INTO Settings (name, value, datatype, position, internal) VALUES ('system/site/name', 'My GeoNetwork catalogue', 0, 110, 'n');
 INSERT INTO Settings (name, value, datatype, position, internal) VALUES ('system/site/siteId', '', 0, 120, 'n');
 INSERT INTO Settings (name, value, datatype, position, internal) VALUES ('system/site/organization', 'My organization', 0, 130, 'n');
-INSERT INTO Settings (name, value, datatype, position, internal) VALUES ('system/platform/version', '3.0.0', 0, 150, 'n');
-INSERT INTO Settings (name, value, datatype, position, internal) VALUES ('system/platform/subVersion', '0', 0, 160, 'n');
+INSERT INTO Settings (name, value, datatype, position, internal) VALUES ('system/platform/version', '3.0.1', 0, 150, 'n');
+INSERT INTO Settings (name, value, datatype, position, internal) VALUES ('system/platform/subVersion', 'SNAPSHOT', 0, 160, 'n');
 INSERT INTO Settings (name, value, datatype, position, internal) VALUES ('system/site/svnUuid', '', 0, 170, 'y');
 INSERT INTO Settings (name, value, datatype, position, internal) VALUES ('system/server/host', 'localhost', 0, 210, 'n');
 INSERT INTO Settings (name, value, datatype, position, internal) VALUES ('system/server/protocol', 'http', 0, 220, 'n');
diff --git a/web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/v301/migrate-default.sql b/web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/v301/migrate-default.sql
new file mode 100644
index 00000000000..03425f1889e
--- /dev/null
+++ b/web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/v301/migrate-default.sql
@@ -0,0 +1,2 @@
+UPDATE Settings SET value='3.0.1' WHERE name='system/platform/version';
+UPDATE Settings SET value='SNAPSHOT' WHERE name='system/platform/subVersion';
diff --git a/web/src/main/webapp/WEB-INF/config-db/database_migration.xml b/web/src/main/webapp/WEB-INF/config-db/database_migration.xml
index 24e1568ed45..d99ff795e9d 100644
--- a/web/src/main/webapp/WEB-INF/config-db/database_migration.xml
+++ b/web/src/main/webapp/WEB-INF/config-db/database_migration.xml
@@ -99,5 +99,10 @@
               <value>WEB-INF/classes/setup/sql/migrate/v300/migrate-cswservice-</value>
             </list>
         </entry>
+        <entry key="3.0.1">
+          <list>
+            <value>WEB-INF/classes/setup/sql/migrate/v300/migrate-</value>
+          </list>
+        </entry>
     </util:map>
 </beans>
\ No newline at end of file
diff --git a/wro4j/pom.xml b/wro4j/pom.xml
index e186f1f1f14..5910dcf529e 100644
--- a/wro4j/pom.xml
+++ b/wro4j/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.geonetwork-opensource</groupId>
         <artifactId>geonetwork</artifactId>
-        <version>3.0.0-0</version>
+        <version>3.0.1-SNAPSHOT</version>
     </parent>