diff --git a/promtail/Dockerfile b/promtail/Dockerfile
index c3a07e9..413ef08 100644
--- a/promtail/Dockerfile
+++ b/promtail/Dockerfile
@@ -43,6 +43,8 @@ RUN promtail --version
 COPY rootfs /
 WORKDIR /data/promtail
 
+COPY s6-overlay /package/admin/s6-overlay-3.1.5.0/
+
 # Build arguments
 ARG BUILD_ARCH
 ARG BUILD_DATE
diff --git a/promtail/build.yaml b/promtail/build.yaml
index f540c35..603bd5c 100644
--- a/promtail/build.yaml
+++ b/promtail/build.yaml
@@ -1,9 +1,9 @@
 ---
 build_from:
-  amd64: ghcr.io/hassio-addons/ubuntu-base/amd64:8.2.1
-  armhf: ghcr.io/hassio-addons/ubuntu-base/armhf:8.2.1
-  armv7: ghcr.io/hassio-addons/ubuntu-base/armv7:8.2.1
-  aarch64: ghcr.io/hassio-addons/ubuntu-base/aarch64:8.2.1
+  amd64: ghcr.io/hassio-addons/debian-base/amd64:7.1.0
+  armhf: ghcr.io/hassio-addons/debian-base/armhf:7.1.0
+  armv7: ghcr.io/hassio-addons/debian-base/armv7:7.1.0
+  aarch64: ghcr.io/hassio-addons/debian-base/aarch64:7.1.0
 args:
   YQ_VERSION: 4.35.1
   PROMTAIL_VERSION: 2.8.4
\ No newline at end of file
diff --git a/promtail/s6-overlay/etc/s6-rc/scripts/base-addon-timezone b/promtail/s6-overlay/etc/s6-rc/scripts/base-addon-timezone
new file mode 100644
index 0000000..30b85bd
--- /dev/null
+++ b/promtail/s6-overlay/etc/s6-rc/scripts/base-addon-timezone
@@ -0,0 +1,14 @@
+#!/command/with-contenv bashio
+# shellcheck shell=bash
+# ==============================================================================
+# Home Assistant Community Add-on: Base Images
+# Configures the timezone
+# ==============================================================================
+
+set -x
+
+bashio::log.info "Configuring timezone (${TZ:-None})..."
+
+ln --symbolic --no-dereference --force "/usr/share/zoneinfo/${TZ:-UTC}" /etc/localtime
+echo "${TZ:-UTC}" > /etc/timezone
+dpkg-reconfigure --frontend noninteractive tzdata 2> /dev/null
\ No newline at end of file