diff --git a/docker_compose/musicbrainz-picard/docker-compose.yaml b/docker_compose/musicbrainz-picard/docker-compose.yaml
new file mode 100644
index 0000000..2cc6c33
--- /dev/null
+++ b/docker_compose/musicbrainz-picard/docker-compose.yaml
@@ -0,0 +1,24 @@
+# musicbrainz-picard - https://hub.docker.com/r/jlesage/musicbrainz-picard
+---
+services:
+  musicbrainz-picard:
+    image: jlesage/musicbrainz-picard:latest
+    container_name: musicbrainz_picard
+    environment:
+      - PUID=1000
+      - PGID=1000
+      - TZ=America/New_York
+    volumes:
+      - ${DATA_PATH}/config:/config:rw
+      - music_nfs:/storage:rw
+    ports:
+      - "${PICARD_PORT}:5800"
+    restart: unless-stopped
+
+volumes:
+  music_nfs:
+    name: music_nfs_picard
+    driver_opts:
+      type: nfs
+      o: addr=${NAS_ADDR},nolock,soft,rw
+      device: :${MUSIC_PATH}