diff --git a/bin/docker-gerbera.sh b/bin/docker-gerbera.sh
deleted file mode 100755
index f0d994b..0000000
--- a/bin/docker-gerbera.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-docker run \
-    -d \
-    --net=host \
-    --name gerbera \
-    --hostname gerbera \
-    --restart always \
-    --volume /srv/gerbera/config:/root/.config \
-    --volume /srv/gerbera/books:/books \
-    --volume /srv/gerbera/music:/music \
-    --volume /srv/gerbera/video:/video \
-    --volume /mnt/hdd/download/movies:/hdd_video2 \
-    --volume /mnt/hdd2/public/movies:/hdd_video \
-    --volume /mnt/hdd/public/music:/hdd_music  \
-    gerbera/gerbera
-
diff --git a/docker/gerbera/docker-compose.yml b/docker/gerbera/docker-compose.yml
new file mode 100644
index 0000000..b3b66c9
--- /dev/null
+++ b/docker/gerbera/docker-compose.yml
@@ -0,0 +1,17 @@
+version: '2'
+
+
+services:
+    gerbera:
+        hostname: gerbera
+        image: gerbera/gerbera:latest
+        network_mode: host
+        volumes:
+            - /srv/nextcloud:/var/www/html
+            - gerbera:/root/.config
+            - /srv/gerbera/music:/music
+            - /mnt/hdd2_2/movies:/video
+        restart: always
+
+volumes:
+    gerbera:
diff --git a/docker/nextcloud/docker-compose.yml b/docker/nextcloud/docker-compose.yml
index 4727d43..9346abe 100644
--- a/docker/nextcloud/docker-compose.yml
+++ b/docker/nextcloud/docker-compose.yml
@@ -7,6 +7,7 @@ services:
             - 8090:80
         volumes:
             - /srv/nextcloud:/var/www/html
+            - nextcloud:/var/www/html2
         restart: always
 
 volumes: