diff --git a/musicbrainz/Dockerfile b/musicbrainz/Dockerfile
index debd96578..374b6bf2f 100644
--- a/musicbrainz/Dockerfile
+++ b/musicbrainz/Dockerfile
@@ -5,29 +5,8 @@ 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
+RUN sed -i "s|/config|/musicbrainz|g" /etc/services.d/server/run
 
diff --git a/musicbrainz/README.md b/musicbrainz/README.md
index a687cc846..0eb7ee096 100644
--- a/musicbrainz/README.md
+++ b/musicbrainz/README.md
@@ -14,14 +14,13 @@ 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. Start the add-on. The initial import and setup of the database can take quite a long time, dependant on your download speed etc, be patient and don't restart the container before it's complete.
 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.
+1. You must register here to receive a MusicBrainz code to allow you to receive database updates, it is free. Get Code [here] (https://metabrainz.org/supporters/account-type).
 
 
 ## 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
index 73e456eb6..2afee8deb 100644
--- a/musicbrainz/build.json
+++ b/musicbrainz/build.json
@@ -1,8 +1,4 @@
 {
-    "build_from_template": {
-        "image": "linuxserver/musicbrainz",
-        "version": "latest"
-    },
     "build_from": {
         "armv7": "linuxserver/musicbrainz:arm32v7-latest",
         "armhf": "linuxserver/musicbrainz:arm32v7-latest",
diff --git a/musicbrainz/config.json b/musicbrainz/config.json
index f8649ed1a..cb921e01c 100644
--- a/musicbrainz/config.json
+++ b/musicbrainz/config.json
@@ -1,18 +1,19 @@
 {
-  "name": "musicbrainz with smb and hdd",
-  "version": "2.0",
-  "slug": "musicbrainz_nas",
+  "name": "musicbrainz with smb and hdd (test)",
+  "version": "1.0",
+  "slug": "musicbrainz_nas_test",
   "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",
+  "url": "https://github.com/alexbelgium/hassio-addons/tree/master/musicbrainz#readme",
   "startup": "services",
   "arch": [
     "aarch64",
     "amd64",
+    "armhf",
     "armv7"
   ],
   "ports": {
@@ -23,8 +24,7 @@
   "map": [
     "config:rw",
     "share:rw",
-    "media:rw",
-    "ssl"
+    "media:rw"
   ],
   "webui": "http://[HOST]:[PORT:5000]",
   "boot": "auto",