diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index bfd784d..2ed7f32 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -42,3 +42,7 @@ jobs:
             --${{ matrix.arch }} \
             --target /data/ \
             --addon
+
+      - name: Image labels
+        run: |
+          docker inspect ghcr.io/lildude/ha-addon-ghostfolio-${{ matrix.arch }} --format='{{json .Config.Labels}}' | jq
diff --git a/Dockerfile b/Dockerfile
index fce5384..16f7a59 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -24,32 +24,23 @@ RUN apt-get update && apt-get install -y \
     && S6_ARCH="${BUILD_ARCH}" \
     && if [ "${BUILD_ARCH}" = "amd64" ]; then S6_ARCH="x86_64"; \
     elif [ "${BUILD_ARCH}" = "armv7" ]; then S6_ARCH="arm"; fi \
-    && rm -rf /var/lib/apt/lists/* \
     && curl -Ls "https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-noarch.tar.xz" | tar xpJ -C / \
     && curl -Ls "https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-${S6_ARCH}.tar.xz" | tar xpJ -C / \
     && curl -Ls "https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-symlinks-noarch.tar.xz" | tar Jxp -C /  \
     && curl -Ls "https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-symlinks-arch.tar.xz" | tar Jxp -C / \
-    && mkdir -p /etc/fix-attrs.d \
-    && mkdir -p /etc/services.d \
     && mkdir -p /tmp/bashio \
     && curl -Ls "https://github.com/hassio-addons/bashio/archive/v${BASHIO_VERSION}.tar.gz" | tar xz --strip 1 -C /tmp/bashio \
     && mv /tmp/bashio/lib /usr/lib/bashio \
+    && apt purge -y xz-utils \
     && ln -s /usr/lib/bashio/bashio /usr/bin/bashio \
-    && rm -rf /tmp/bashio \
+    && rm -rf /var/lib/apt/lists/* /tmp/* \
     && npm install -g npm@latest
 
 COPY rootfs /
-RUN chmod a+x /etc/services.d/*/run /etc/services.d/*/finish
 USER node
 
 ENTRYPOINT ["/init"]
 
-LABEL \
-    org.opencontainers.image.title="Home Assistant Add-on: Ghostfolio" \
-    org.opencontainers.image.description="Privacy-first, open source dashboard for your personal finances." \
-    org.opencontainers.image.source="https://github.com/lildude/ha-addon-ghostfolio/" \
-    org.opencontainers.image.licenses="MIT"
-
 HEALTHCHECK \
     --interval=10s \
     --retries=5 \
diff --git a/build.json b/build.json
index 88314f4..22519f0 100644
--- a/build.json
+++ b/build.json
@@ -9,5 +9,14 @@
   },
   "codenotary": {
     "signer": "colin@symr.io"
+  },
+  "labels":{
+    "maintainer": "Colin Seymour (https://github.com/lildude)",
+    "org.opencontainers.image.authors": "Colin Seymour (https://github.com/lildude)",
+    "org.opencontainers.image.description": "Privacy-first, open source dashboard for your personal finances.",
+    "org.opencontainers.image.documentation": "https://github.com/lildude/ha-addon-ghostfolio/blob/main/DOCS.md",
+    "org.opencontainers.image.licenses": "MIT",
+    "org.opencontainers.image.source": "https://github.com/lildude/ha-addon-ghostfolio/",
+    "org.opencontainers.image.title": "Home Assistant Add-on: Ghostolio"
   }
 }
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/ghostfolio/dependencies.d/base b/rootfs/etc/s6-overlay/s6-rc.d/ghostfolio/dependencies.d/base
new file mode 100644
index 0000000..e69de29
diff --git a/rootfs/etc/services.d/ghostfolio/finish b/rootfs/etc/s6-overlay/s6-rc.d/ghostfolio/finish
old mode 100644
new mode 100755
similarity index 100%
rename from rootfs/etc/services.d/ghostfolio/finish
rename to rootfs/etc/s6-overlay/s6-rc.d/ghostfolio/finish
diff --git a/rootfs/etc/services.d/ghostfolio/run b/rootfs/etc/s6-overlay/s6-rc.d/ghostfolio/run
old mode 100644
new mode 100755
similarity index 100%
rename from rootfs/etc/services.d/ghostfolio/run
rename to rootfs/etc/s6-overlay/s6-rc.d/ghostfolio/run
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/ghostfolio/type b/rootfs/etc/s6-overlay/s6-rc.d/ghostfolio/type
new file mode 100644
index 0000000..1780f9f
--- /dev/null
+++ b/rootfs/etc/s6-overlay/s6-rc.d/ghostfolio/type
@@ -0,0 +1 @@
+longrun
\ No newline at end of file
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/nginx/dependencies.d/base b/rootfs/etc/s6-overlay/s6-rc.d/nginx/dependencies.d/base
new file mode 100644
index 0000000..e69de29
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/nginx/dependencies.d/ghostfolio b/rootfs/etc/s6-overlay/s6-rc.d/nginx/dependencies.d/ghostfolio
new file mode 100644
index 0000000..e69de29
diff --git a/rootfs/etc/services.d/nginx/finish b/rootfs/etc/s6-overlay/s6-rc.d/nginx/finish
old mode 100644
new mode 100755
similarity index 100%
rename from rootfs/etc/services.d/nginx/finish
rename to rootfs/etc/s6-overlay/s6-rc.d/nginx/finish
diff --git a/rootfs/etc/services.d/nginx/run b/rootfs/etc/s6-overlay/s6-rc.d/nginx/run
old mode 100644
new mode 100755
similarity index 100%
rename from rootfs/etc/services.d/nginx/run
rename to rootfs/etc/s6-overlay/s6-rc.d/nginx/run
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/nginx/type b/rootfs/etc/s6-overlay/s6-rc.d/nginx/type
new file mode 100644
index 0000000..1780f9f
--- /dev/null
+++ b/rootfs/etc/s6-overlay/s6-rc.d/nginx/type
@@ -0,0 +1 @@
+longrun
\ No newline at end of file
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/ghostfolio b/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/ghostfolio
new file mode 100644
index 0000000..e69de29
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/nginx b/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/nginx
new file mode 100644
index 0000000..e69de29