diff --git a/musicbrainz/Dockerfile b/musicbrainz/Dockerfile
new file mode 100644
index 0000000000..debd96578e
--- /dev/null
+++ b/musicbrainz/Dockerfile
@@ -0,0 +1,33 @@
+ARG BUILD_FROM
+# hadolint ignore=DL3006
+FROM $BUILD_FROM
+
+# Set shell
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+
+RUN apt-get update \
+    \
+    && apt-get install -y --no-install-recommends \
+        jq=1.5+dfsg-2 \
+    \
+    && apt-get -y upgrade cifs-utils \
+    && curl -J -L -o /tmp/bashio.tar.gz \
+        "https://github.com/hassio-addons/bashio/archive/v0.7.1.tar.gz" \
+    && mkdir /tmp/bashio \
+    && tar zxvf \
+        /tmp/bashio.tar.gz \
+        --strip 1 -C /tmp/bashio \
+    \
+    && mv /tmp/bashio/lib /usr/lib/bashio \
+    && ln -s /usr/lib/bashio/bashio /usr/bin/bashio \
+    && rm -fr \
+      /tmp/* \
+      /var/{cache,log}/* \
+      /var/lib/apt/lists/*
+
+# copy local files
+COPY root/ /
+
+RUN sed -i "s|/config|/musicbrainz|g" /etc/services.d/musicbrainz/run \
+    && sed -i "s|/config|/musicbrainz|g" /etc/cont-init.d/30-config
+
diff --git a/musicbrainz/README.md b/musicbrainz/README.md
new file mode 100644
index 0000000000..a687cc846d
--- /dev/null
+++ b/musicbrainz/README.md
@@ -0,0 +1,27 @@
+# Hassio Add-ons by alexbelgium: musicbrainz
+
+## About
+
+[musicbrainz](https://musicbrainz.org/) is an open music encyclopedia that collects music metadata and makes it available to the public.
+
+This addon is based on the [docker image](https://github.com/linuxserver/docker-musicbrainz) from linuxserver.io.
+
+## Installation
+
+The installation of this add-on is pretty straightforward and not different in
+comparison to installing any other Hass.io add-on.
+
+1. [Add my Hass.io add-ons repository][repository] to your Hass.io instance.
+1. Install this add-on.
+1. Click the `Save` button to store your configuration.
+1. Start the add-on.
+1. Check the logs of the add-on to see if everything went well.
+1. Carefully configure the add-on to your preferences, see the official documentation for for that.
+
+
+## Configuration
+
+Webui can be found at `<your-ip>:5000`.
+
+
+[repository]: https://github.com/alexbelgium/hassio-addons
diff --git a/musicbrainz/build.json b/musicbrainz/build.json
new file mode 100644
index 0000000000..73e456eb68
--- /dev/null
+++ b/musicbrainz/build.json
@@ -0,0 +1,14 @@
+{
+    "build_from_template": {
+        "image": "linuxserver/musicbrainz",
+        "version": "latest"
+    },
+    "build_from": {
+        "armv7": "linuxserver/musicbrainz:arm32v7-latest",
+        "armhf": "linuxserver/musicbrainz:arm32v7-latest",
+        "aarch64": "linuxserver/musicbrainz:arm64v8-latest",
+        "amd64": "linuxserver/musicbrainz:amd64-latest"
+    },
+    "squash": false,
+    "args": {}
+}
diff --git a/musicbrainz/config.json b/musicbrainz/config.json
new file mode 100644
index 0000000000..f8649ed1ad
--- /dev/null
+++ b/musicbrainz/config.json
@@ -0,0 +1,51 @@
+{
+  "name": "musicbrainz with smb and hdd",
+  "version": "2.0",
+  "slug": "musicbrainz_nas",
+  "legacy": false,
+  "maintenance": {
+    "github_release": "https://github.com/linuxserver/docker-musicbrainz",
+    "version_regex": "(\\d+\\.\\d+\\.\\d+.\\d+)-(ls\\d+)"
+  },
+  "description": "A free open music encyclopedia that collects music metadata and makes it available to the public.",
+  "url": "https://github.com/petersendev/hassio-addons/tree/master/musicbrainz#readme",
+  "startup": "services",
+  "arch": [
+    "aarch64",
+    "amd64",
+    "armv7"
+  ],
+  "ports": {
+    "5000/tcp": 5000  },
+  "ports_description": {
+    "5000/tcp": "web interface"
+  },
+  "map": [
+    "config:rw",
+    "share:rw",
+    "media:rw",
+    "ssl"
+  ],
+  "webui": "http://[HOST]:[PORT:5000]",
+  "boot": "auto",
+  "privileged": ["SYS_ADMIN", "DAC_READ_SEARCH"],
+  "full_access": true,
+  "options": {
+    "PUID": 1001,
+    "PGID": 1001,
+    "localdisks": "/dev/sdb1",
+    "networkdisks": "<//SERVER/SHARE>",
+    "cifsusername": "<username>",
+    "cifspassword": "<password>"
+  },
+  "schema": {
+    "PUID": "int",
+    "PGID": "int",
+    "TZ": "str?",
+    "localdisks": "str",
+    "networkdisks": "str",
+    "cifsusername": "str",
+    "cifspassword": "str"
+  }
+
+}
diff --git a/musicbrainz/icon.png b/musicbrainz/icon.png
new file mode 100644
index 0000000000..fe71933dac
Binary files /dev/null and b/musicbrainz/icon.png differ
diff --git a/musicbrainz/logo.png b/musicbrainz/logo.png
new file mode 100644
index 0000000000..fe71933dac
Binary files /dev/null and b/musicbrainz/logo.png differ
diff --git a/musicbrainz/root/etc/cont-init.d/00-ha-env b/musicbrainz/root/etc/cont-init.d/00-ha-env
new file mode 100644
index 0000000000..3b3e692469
--- /dev/null
+++ b/musicbrainz/root/etc/cont-init.d/00-ha-env
@@ -0,0 +1,5 @@
+#!/usr/bin/with-contenv bashio
+
+for k in $(bashio::jq "${__BASHIO_ADDON_CONFIG}" 'keys | .[]'); do
+    printf "$(bashio::config $k)" > /var/run/s6/container_environment/$k
+done
\ No newline at end of file
diff --git a/musicbrainz/root/etc/cont-init.d/50-mounts b/musicbrainz/root/etc/cont-init.d/50-mounts
new file mode 100644
index 0000000000..ab6c54ec24
--- /dev/null
+++ b/musicbrainz/root/etc/cont-init.d/50-mounts
@@ -0,0 +1,46 @@
+#!/usr/bin/with-contenv bashio
+
+#!/usr/bin/with-contenv bashio
+bashio::log.info 'Mounting external hdd...'
+
+# Mount local Share if configured and if Protection Mode is active
+if bashio::config.has_value 'localdisks'; then
+    MOREDISKS=$(bashio::config 'localdisks')
+    bashio::log.info "Local Disks mounting.. ${MOREDISKS}" && \
+    for disk in $MOREDISKS 
+    do
+        bashio::log.info "Mount ${disk}"
+        mkdir -p /share/storage && \
+            if [ ! -d /share/storage ]; then
+              echo "Creating /share/storage"
+              mkdir -p /share/storage
+              chown -R abc:abc /share/storage
+            fi
+
+            mount $disk /share/storage && \
+            bashio::log.info "Success!"   
+    done || \
+    bashio::log.warning "Protection mode is ON. Unable to mount local drives!"
+fi
+
+# Mount CIFS Share if configured and if Protection Mode is active
+if bashio::config.has_value 'networkdisks'; then
+    MOREDISKS=$(bashio::config 'networkdisks')
+    CIFS_USERNAME=$(bashio::config 'cifsusername')
+    CIFS_PASSWORD=$(bashio::config 'cifspassword')
+    bashio::log.info "Network Disks mounting.. ${MOREDISKS}" && \
+    for disk in $MOREDISKS 
+    do
+        bashio::log.info "Mount ${disk}"
+        mkdir -p /share/storagecifs && \
+            if [ ! -d /share/storagecifs ]; then
+              echo "Creating /share/storagecifs"
+              mkdir -p /share/storagecifs
+              chown -R abc:abc /share/storagecifs
+            fi
+
+            mount -t cifs -o username=$CIFS_USERNAME,password=$CIFS_PASSWORD $disk /share/storagecifs && \
+            bashio::log.info "Success!"   
+    done || \
+    bashio::log.warning "Protection mode is ON. Unable to mount external drives!"
+fi