diff --git a/musicbrainz-picard/Dockerfile b/musicbrainz-picard/Dockerfile
new file mode 100644
index 000000000..b77e76855
--- /dev/null
+++ b/musicbrainz-picard/Dockerfile
@@ -0,0 +1,28 @@
+ARG BUILD_FROM=hassioaddons/base:8.0.1
+# hadolint ignore=DL3006
+FROM ${BUILD_FROM}
+
+# Update and Add musicbrainz Repo
+RUN apt-get update && \
+    apt-get -y --no-install-recommends install software-properties-common && \
+    rm -rf /var/lib/apt/lists/* && \
+    add-apt-repository ppa:musicbrainz-developers/stable
+
+# Install musicbrainz & fpcalc (provided by Chromaprint) 
+RUN apt-get update && \
+    apt-get -y --no-install-recommends install picard libchromaprint-tools && \
+    rm -rf /var/lib/apt/lists/*
+
+# Locale
+ENV LANG=es_ES.UTF-8
+RUN apt-get update && \
+    apt-get -y --no-install-recommends install locales && \
+    locale-gen en_US.UTF-8 && \
+    locale-gen es_ES.UTF-8 && \
+    rm -rf /var/lib/apt/lists/*
+
+# Define Run
+ENV APP_NAME="musicbrainz"
+COPY startapp.sh /startapp.sh
+
+RUN /startapp.sh
diff --git a/musicbrainz-picard/build.json b/musicbrainz-picard/build.json
new file mode 100644
index 000000000..00a28bf95
--- /dev/null
+++ b/musicbrainz-picard/build.json
@@ -0,0 +1,11 @@
+{
+    "squash": false,
+    "build_from": {
+        "aarch64": "hassioaddons/base-aarch64:8.0.1",
+        "amd64": "hassioaddons/base-amd64:8.0.1",
+        "armhf": "hassioaddons/base-armhf:8.0.1",
+        "armv7": "hassioaddons/base-armv7:8.0.1",
+        "i386": "hassioaddons/base-i386:8.0.1"
+    },
+    "args": {}
+}