diff --git a/immich_frame/CHANGELOG.md b/immich_frame/CHANGELOG.md
new file mode 100644
index 000000000..108d8df64
--- /dev/null
+++ b/immich_frame/CHANGELOG.md
@@ -0,0 +1 @@
+- First build
diff --git a/immich_frame/Dockerfile b/immich_frame/Dockerfile
new file mode 100644
index 000000000..b536e4a74
--- /dev/null
+++ b/immich_frame/Dockerfile
@@ -0,0 +1,131 @@
+#============================#
+#  ALEXBELGIUM'S DOCKERFILE  #
+#============================#
+#           _.------.
+#       _.-`    ('>.-`"""-.
+# '.--'`       _'`   _ .--.)
+#    -'         '-.-';`   `
+#    ' -      _.'  ``'--.
+#      d  '---`    .-'""`
+#               /`
+#=== Home Assistant Addon ===#
+
+#################
+# 1 Build Image #
+#################
+
+ARG BUILD_VERSION
+ARG BUILD_FROM
+FROM $BUILD_FROM
+
+##################
+# 2 Modify Image #
+##################
+
+# Set S6 wait time
+ENV S6_CMD_WAIT_FOR_SERVICES=1 \
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
+    S6_SERVICES_GRACETIME=0
+
+USER root
+
+##################
+# 3 Install apps #
+##################
+
+# Add rootfs
+COPY rootfs/ /
+
+# Uses /bin for compatibility purposes
+# hadolint ignore=DL4005
+RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then ln -s /usr/bin/sh /bin/sh; fi && \
+    if [ ! -f /bin/bash ] && [ -f /usr/bin/bash ]; then ln -s /usr/bin/bash /bin/bash; fi
+
+# Modules
+ARG MODULES="00-banner.sh 01-custom_script.sh 00-global_var.sh 00-local_mounts.sh 00-smb_mounts.sh"
+
+# Automatic modules download
+ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_automodules.sh" "/ha_automodules.sh"
+RUN chmod 744 /ha_automodules.sh && /ha_automodules.sh "$MODULES" && rm /ha_automodules.sh
+
+# Manual apps
+ENV PACKAGES="sudo"
+
+# Automatic apps & bashio
+ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_autoapps.sh" "/ha_autoapps.sh"
+RUN chmod 744 /ha_autoapps.sh && /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh
+
+################
+# 4 Entrypoint #
+################
+
+# Add entrypoint
+#ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
+ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
+
+# Entrypoint modifications
+ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint_modif.sh" "/ha_entrypoint_modif.sh"
+RUN chmod 777 /ha_entrypoint.sh /ha_entrypoint_modif.sh && /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh
+
+ENTRYPOINT [ "/usr/bin/env" ]
+CMD [ "/ha_entrypoint.sh" ]
+
+############
+# 5 Labels #
+############
+
+ARG BUILD_ARCH
+ARG BUILD_DATE
+ARG BUILD_DESCRIPTION
+ARG BUILD_NAME
+ARG BUILD_REF
+ARG BUILD_REPOSITORY
+ARG BUILD_VERSION
+ENV BUILD_VERSION="${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="alexbelgium (https://github.com/alexbelgium)" \
+    org.opencontainers.image.title="${BUILD_NAME}" \
+    org.opencontainers.image.description="${BUILD_DESCRIPTION}" \
+    org.opencontainers.image.vendor="Home Assistant Add-ons" \
+    org.opencontainers.image.authors="alexbelgium (https://github.com/alexbelgium)" \
+    org.opencontainers.image.licenses="MIT" \
+    org.opencontainers.image.url="https://github.com/alexbelgium" \
+    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}
+
+#################
+# 6 Healthcheck #
+#################
+
+# Avoid spamming logs
+# hadolint ignore=SC2016
+RUN \
+    # Handle Apache configuration
+    if [ -d /etc/apache2/sites-available ]; then \
+        for file in /etc/apache2/sites-*/*.conf; do \
+            sed -i '/<VirtualHost/a \ \n    # Match requests with the custom User-Agent "HealthCheck" \n    SetEnvIf User-Agent "HealthCheck" dontlog \n    # Exclude matching requests from access logs \n    CustomLog ${APACHE_LOG_DIR}/access.log combined env=!dontlog' "$file"; \
+        done; \
+    fi && \
+    \
+    # Handle Nginx configuration
+    if [ -f /etc/nginx/nginx.conf ]; then \
+        awk '/http \{/{print; print "map $http_user_agent $dontlog {\n  default 0;\n  \"~*HealthCheck\" 1;\n}\naccess_log /var/log/nginx/access.log combined if=$dontlog;"; next}1' /etc/nginx/nginx.conf > /etc/nginx/nginx.conf.new && \
+        mv /etc/nginx/nginx.conf.new /etc/nginx/nginx.conf; \
+    fi
+
+ENV HEALTH_PORT="3000" \
+    HEALTH_URL="/"
+HEALTHCHECK \
+    --interval=5s \
+    --retries=5 \
+    --start-period=30s \
+    --timeout=25s \
+    CMD ! nc -z 127.0.0.1 -p ${HEALTH_PORT} &>/dev/null || exit 1
diff --git a/immich_frame/README.md b/immich_frame/README.md
new file mode 100644
index 000000000..5cb68f5ea
--- /dev/null
+++ b/immich_frame/README.md
@@ -0,0 +1,3 @@
+# Home assistant add-on: Immich Power Tools
+
+https://immichframe.online/
\ No newline at end of file
diff --git a/immich_frame/apparmor.txt b/immich_frame/apparmor.txt
new file mode 100644
index 000000000..d8a246fd1
--- /dev/null
+++ b/immich_frame/apparmor.txt
@@ -0,0 +1,66 @@
+#include <tunables/global>
+
+profile db21ed7f_immich_frame flags=(attach_disconnected,mediate_deleted) {
+  #include <abstractions/base>
+
+  capability,
+  file,
+  signal,
+  mount,
+  umount,
+  remount,
+  network udp,
+  network tcp,
+  network dgram,
+  network stream,
+  network inet,
+  network inet6,
+  network netlink raw,
+  network unix dgram,
+
+  capability setgid,
+  capability setuid,
+  capability sys_admin,
+  capability dac_read_search,
+  # capability dac_override,
+  # capability sys_rawio,
+
+# S6-Overlay
+  /init ix,
+  /run/{s6,s6-rc*,service}/** ix,
+  /package/** ix,
+  /command/** ix,
+  /run/{,**} rwk,
+  /dev/tty rw,
+  /bin/** ix,
+  /usr/bin/** ix,
+  /usr/lib/bashio/** ix,
+  /etc/s6/** rix,
+  /run/s6/** rix,
+  /etc/services.d/** rwix,
+  /etc/cont-init.d/** rwix,
+  /etc/cont-finish.d/** rwix,
+  /init rix,
+  /var/run/** mrwkl,
+  /var/run/ mrwkl,
+  /dev/i2c-1 mrwkl,
+  # Files required
+  /dev/fuse mrwkl,
+  /dev/sda1 mrwkl,
+  /dev/sdb1 mrwkl,
+  /dev/nvme0 mrwkl,
+  /dev/nvme1 mrwkl,
+  /dev/mmcblk0p1 mrwkl,
+  /dev/* mrwkl,
+  /tmp/** mrkwl,
+
+  # Data access
+  /data/** rw,
+
+  # suppress ptrace denials when using 'docker ps' or using 'ps' inside a container
+  ptrace (trace,read) peer=docker-default,
+
+  # docker daemon confinement requires explict allow rule for signal
+  signal (receive) set=(kill,term) peer=/usr/bin/docker,
+
+}
diff --git a/immich_frame/build.json b/immich_frame/build.json
new file mode 100644
index 000000000..bc6e5123e
--- /dev/null
+++ b/immich_frame/build.json
@@ -0,0 +1,9 @@
+{
+  "build_from": {
+    "aarch64": "ghcr.io/immichframe/immichframe:latest",
+    "amd64": "ghcr.io/immichframe/immichframe:latest"
+  },
+  "codenotary": {
+    "signer": "alexandrep.github@gmail.com"
+  }
+}
diff --git a/immich_frame/config.json b/immich_frame/config.json
new file mode 100644
index 000000000..4b8c6f1cf
--- /dev/null
+++ b/immich_frame/config.json
@@ -0,0 +1,30 @@
+{
+  "arch": [
+    "aarch64",
+    "amd64"
+  ],
+  "codenotary": "alexandrep.github@gmail.com",
+  "description": "Display your immich gallery as a digital photo frame",
+  "hassio_api": true,
+  "image": "ghcr.io/alexbelgium/immich_frame-{arch}",
+  "init": false,
+  "map": [
+    "addon_config:rw"
+  ],
+  "name": "Immich Frame",
+  "ports": {
+    "8080/tcp": 8171
+  },
+  "ports_description": {
+    "8080/tcp": "Web UI port"
+  },
+  "schema": {
+    "TZ": "str?",
+    "ImmichServerUrl": "str",
+    "ApiKey": "str"
+  },
+  "slug": "immich_frame",
+  "url": "https://github.com/alexbelgium/hassio-addons",
+  "version": "1.0.26.2",
+  "webui": "http://[HOST]:[PORT:8080]"
+}
diff --git a/immich_frame/icon.png b/immich_frame/icon.png
new file mode 100644
index 000000000..3ac70964f
Binary files /dev/null and b/immich_frame/icon.png differ
diff --git a/immich_frame/logo.png b/immich_frame/logo.png
new file mode 100644
index 000000000..3ac70964f
Binary files /dev/null and b/immich_frame/logo.png differ
diff --git a/immich_frame/rootfs/etc/cont-init.d/99-run.sh b/immich_frame/rootfs/etc/cont-init.d/99-run.sh
new file mode 100755
index 000000000..9e510d870
--- /dev/null
+++ b/immich_frame/rootfs/etc/cont-init.d/99-run.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bashio
+
+bashio::log.info "Starting Immich Frame"
+
+mkdir -p /config/config
+ln -sf /app/Config /config/Config
+
+exec dotnet ImmichFrame.WebApi.dll
diff --git a/immich_frame/stats.png b/immich_frame/stats.png
new file mode 100644
index 000000000..8d808a917
Binary files /dev/null and b/immich_frame/stats.png differ
diff --git a/immich_frame/updater.json b/immich_frame/updater.json
new file mode 100644
index 000000000..869134bf9
--- /dev/null
+++ b/immich_frame/updater.json
@@ -0,0 +1,9 @@
+{
+  "github_beta": "false",
+  "last_update": "24-05-2025",
+  "repository": "alexbelgium/hassio-addons",
+  "slug": "immich_frame",
+  "source": "github",
+  "upstream_repo": "immichFrame/ImmichFrame",
+  "upstream_version": "1.0.26.2"
+}