diff --git a/Dockerfile b/Dockerfile
index 170dc7c..f076903 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,4 +16,31 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     FLASK_HOST=0.0.0.0 \
     FLASK_PORT=4470
 
-LABEL org.opencontainers.image.version=${BUILD_VERSION}
\ No newline at end of file
+############
+# 5 Labels #
+############
+ARG BUILD_ARCH
+ARG BUILD_DATE
+ARG BUILD_DESCRIPTION
+ARG BUILD_NAME
+ARG BUILD_REF
+ARG BUILD_REPOSITORY
+ARG BUILD_VERSION
+LABEL \
+    io.hass.name="${BUILD_NAME}" \
+    io.hass.description="${BUILD_DESCRIPTION}" \
+    io.hass.arch="${BUILD_ARCH}" \
+    io.hass.type="addon" \
+    io.hass.version=${BUILD_VERSION} \
+    maintainer="ankermgmt (https://github.com/ankermgmt)" \
+    org.opencontainers.image.title="${BUILD_NAME}" \
+    org.opencontainers.image.description="${BUILD_DESCRIPTION}" \
+    org.opencontainers.image.vendor="Home Assistant Add-ons" \
+    org.opencontainers.image.authors="kvanzuijlen (https://github.com/kvanzuijlen)" \
+    org.opencontainers.image.licenses="MIT" \
+    org.opencontainers.image.url="https://github.com/ankermgmt" \
+    org.opencontainers.image.source="https://github.com/${BUILD_REPOSITORY}" \
+    org.opencontainers.image.documentation="https://github.com/${BUILD_REPOSITORY}/blob/main/README.md" \
+    org.opencontainers.image.created=${BUILD_DATE} \
+    org.opencontainers.image.revision=${BUILD_REF} \
+    org.opencontainers.image.version=${BUILD_VERSION}
diff --git a/build.yaml b/build.yaml
index 714fc5c..ad0fd72 100644
--- a/build.yaml
+++ b/build.yaml
@@ -1,9 +1,9 @@
 build_from:
-  aarch64: "ghcr.io/kvanzuijlen/ankerctl:v1.0.0"
-  amd64: "ghcr.io/kvanzuijlen/ankerctl:v1.0.0"
-  armv7: "ghcr.io/kvanzuijlen/ankerctl:v1.0.0"
+  aarch64: "ghcr.io/ankermgmt/ankermake-m5-protocol:v1.0.0"
+  amd64: "ghcr.io/ankermgmt/ankermake-m5-protocol:v1.0.0"
+  armv7: "ghcr.io/ankermgmt/ankermake-m5-protocol:v1.0.0"
 labels:
-  org.opencontainers.image.title: "Home Assistant Add-on: AnkerCTL"
-  org.opencontainers.image.description: "AnkerCTL"
-  org.opencontainers.image.source: "https://github.com/AnkerMGMT/AnkerMGMT-homeassistant-addons"
-  org.opencontainers.image.licenses: "Apache License 2.0"
+  org.opencontainers.image.title: "Home Assistant Add-on: ankerctl"
+  org.opencontainers.image.description: "ankerctl"
+  org.opencontainers.image.source: "https://github.com/ankermgmt/ankermgmt-homeassistant-addons"
+  org.opencontainers.image.licenses: "GPLv3"
diff --git a/config.yaml b/config.yaml
index 2c24050..6799bf9 100644
--- a/config.yaml
+++ b/config.yaml
@@ -1,12 +1,17 @@
-name: "AnkerCTL"
-description: "The official AnkerCTL addon"
-version: "1.0.0-5"
+name: "ankerctl"
+description: "The official ankerctl addon"
+version: "1.0.0-0"
 slug: "ankerctl"
-ingress: true
+ingress: false # Doesn't work yet, might need some source code changes
 ingress_port: 4470
-ingress_stream: true
+ingress_stream: false
 init: false
+host_network: true
 arch:
   - aarch64
   - amd64
   - armv7
+ports:
+  "4470": 4470
+ports_description:
+  "4470": "The webinterface for ankerctl"
diff --git a/icon.png b/icon.png
new file mode 100644
index 0000000..ea05e5c
Binary files /dev/null and b/icon.png differ
diff --git a/logo.png b/logo.png
new file mode 100644
index 0000000..ea05e5c
Binary files /dev/null and b/logo.png differ