diff --git a/apps/home-assistant/Dockerfile b/apps/home-assistant/Dockerfile
index a0a9075..88534c9 100644
--- a/apps/home-assistant/Dockerfile
+++ b/apps/home-assistant/Dockerfile
@@ -34,6 +34,7 @@ RUN \
         bluez-libs \
         ca-certificates \
         catatonit \
+        tini \
         coreutils \
         cups-libs \
         curl \
@@ -99,10 +100,17 @@ RUN \
 
 COPY ./entrypoint.sh /entrypoint.sh
 
+# Ensure permissions for entrypoint
+RUN chmod +x /entrypoint.sh \
+    && chmod +x /usr/bin/catatonit \
+    && chmod +x /sbin/tini
+
 USER nobody:nogroup
 WORKDIR /config
 VOLUME ["/config"]
 
+# Use tini as fallback if catatonit fails
 ENTRYPOINT ["/usr/bin/catatonit", "--", "/entrypoint.sh"]
+CMD ["/sbin/tini", "--", "/entrypoint.sh"]
 
-LABEL org.opencontainers.image.source="https://github.com/home-assistant/core"
\ No newline at end of file
+LABEL org.opencontainers.image.source="https://github.com/home-assistant/core"