diff --git a/docker-compose.yml b/docker-compose.yml
index b668036a6ad00ff77d1e6e17d7e27674041e1bd6..6f555f01d8514c71654c9322429f0bda189b2578 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,7 +13,7 @@ services:
       - MYSQL_USER=mozen_user
       - MYSQL_PASSWORD=1234
     volumes:
-      - /data/mozen_db_data:/config
+      - /data/mozen_data/db:/config
     restart: unless-stopped
 
   mozen_web:
@@ -23,4 +23,6 @@ services:
     container_name: mozen_web
     ports:
       - 8007:8181
+    volumes:
+      - /data/mozen_data/store:/home/data
     restart: unless-stopped
diff --git a/mozen/pom.xml b/mozen/pom.xml
index 0ec4db7c1c11f6354fbed5d0bfcdd1bc66327e78..fdf4046af0716ba3137c286b9fa0b8f582104e90 100644
--- a/mozen/pom.xml
+++ b/mozen/pom.xml
@@ -48,7 +48,7 @@
 		</dependency>
 		<dependency>
 			<groupId>com.github.paulcwarren</groupId>
-			<artifactId>spring-content-jpa-boot-starter</artifactId>
+			<artifactId>spring-content-fs-boot-starter</artifactId>
 			<version>1.0.0.M10</version>
 		</dependency>
 
diff --git a/mozen/src/main/java/mozen/MozenApplication.java b/mozen/src/main/java/mozen/MozenApplication.java
index 273029a391f699817eabbe764ae2ec5abde477eb..eae15a1f108af106e730e1b69283aa0342341b0b 100644
--- a/mozen/src/main/java/mozen/MozenApplication.java
+++ b/mozen/src/main/java/mozen/MozenApplication.java
@@ -3,7 +3,7 @@ package mozen;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
-import org.springframework.content.jpa.config.EnableJpaStores;
+import org.springframework.content.fs.config.EnableFilesystemStores;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.PropertySource;
@@ -15,7 +15,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 @EnableJpaRepositories(basePackageClasses = MozenApplication.class)
 @EntityScan(basePackages = "mozen.model")
 @ComponentScan(basePackages = "mozen")
-@EnableJpaStores
+@EnableFilesystemStores
 @EnableTransactionManagement
 @PropertySource("classpath:application.properties")
 public class MozenApplication {
diff --git a/mozen/src/main/resources/application.properties b/mozen/src/main/resources/application.properties
index 4d10c8991625874e9442803c1b173e43dd415bca..75886fba8594446f501cba88e11a10343ff67044 100644
--- a/mozen/src/main/resources/application.properties
+++ b/mozen/src/main/resources/application.properties
@@ -31,4 +31,6 @@ spring.jpa.hibernate.ddl-auto=update
 spring.servlet.multipart.max-file-size=10GB
 spring.servlet.multipart.max-request-size=10GB
 
-spring.jackson.serialization.fail-on-empty-beans=false
\ No newline at end of file
+spring.jackson.serialization.fail-on-empty-beans=false
+
+spring.content.fs.filesystem-root=data
\ No newline at end of file