diff --git a/.github/workflows/builder.yml b/.github/workflows/builder.yml
index 35d1fbd..a272211 100644
--- a/.github/workflows/builder.yml
+++ b/.github/workflows/builder.yml
@@ -56,7 +56,7 @@ jobs:
       run: echo "BUILD_ARGS=--test" >> $GITHUB_ENV
 
     - name: Build landingpage
-      uses: home-assistant/builder@2022.06.2
+      uses: home-assistant/builder@2022.07.0
       with:
         args: |
           $BUILD_ARGS \
diff --git a/Dockerfile b/Dockerfile
index df9fe17..5d15838 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -29,3 +29,5 @@ FROM ${BUILD_FROM}
 WORKDIR /
 COPY --from=builder /usr/src/landingpage/landingpage /usr/bin/landingpage
 COPY rootfs /
+
+ENTRYPOINT ["/usr/bin/landingpage"]
diff --git a/build.yaml b/build.yaml
index 4f2a330..d6494ac 100644
--- a/build.yaml
+++ b/build.yaml
@@ -1,11 +1,11 @@
 image: homeassistant/{machine}-homeassistant
 shadow_repository: ghcr.io/home-assistant
 build_from:
-  aarch64: ghcr.io/home-assistant/aarch64-base:3.16
-  armv7: ghcr.io/home-assistant/armv7-base:3.16
-  armhf: ghcr.io/home-assistant/armhf-base:3.16
-  amd64: ghcr.io/home-assistant/amd64-base:3.16
-  i386: ghcr.io/home-assistant/i386-base:3.16
+  aarch64: scratch
+  armv7: scratch
+  armhf: scratch
+  amd64: scratch
+  i386: scratch
 codenotary:
   signer: notary@home-assistant.io
   base_image: notary@home-assistant.io
diff --git a/rootfs/etc/services.d/landingpage/run b/rootfs/etc/services.d/landingpage/run
deleted file mode 100644
index b6200d8..0000000
--- a/rootfs/etc/services.d/landingpage/run
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/with-contenv bashio
-# ==============================================================================
-# Start Home Assistant landingpage service
-# ==============================================================================
-
-exec landingpage