diff --git a/apps/aws-signing-helper/docker-bake.hcl b/apps/aws-signing-helper/docker-bake.hcl
index a760adf6e..9b8d193ea 100644
--- a/apps/aws-signing-helper/docker-bake.hcl
+++ b/apps/aws-signing-helper/docker-bake.hcl
@@ -6,7 +6,7 @@ variable "APP" {
 
 variable "VERSION" {
   // renovate: datasource=github-releases depName=aws/rolesanywhere-credential-helper
-  default = "1.7.0"
+  default = "1.8.0"
 }
 
 variable "SOURCE" {
diff --git a/apps/whisparr-v3/Dockerfile b/apps/whisparr-v3/Dockerfile
new file mode 100644
index 000000000..98bcb44b7
--- /dev/null
+++ b/apps/whisparr-v3/Dockerfile
@@ -0,0 +1,41 @@
+# syntax=docker/dockerfile:1
+
+FROM docker.io/library/alpine:3.23
+ARG TARGETARCH
+ARG VENDOR
+ARG VERSION
+
+ENV COMPlus_EnableDiagnostics=0
+
+USER root
+WORKDIR /app
+
+RUN \
+    apk add --no-cache \
+        bash \
+        ca-certificates \
+        catatonit \
+        coreutils \
+        curl \
+        icu-libs \
+        jq \
+        libintl \
+        nano \
+        sqlite-libs \
+        tzdata \
+    && mkdir -p /app/bin \
+    && curl -fsSL "https://github.com/Whisparr/Whisparr-Eros/releases/download/v${VERSION}/Whisparr.eros.${VERSION}.linux-musl-${TARGETARCH/amd64/x64}.tar.gz" \
+        | tar xzf - -C /app/bin --strip-components=1 \
+    && printf "UpdateMethod=docker\nPackageVersion=%s\nPackageAuthor=[%s](https://github.com/%s)\n" "${VERSION}" "${VENDOR}" "${VENDOR}" > /app/package_info \
+    && chown -R root:root /app && chmod -R 755 /app \
+    && rm -rf /tmp/* /app/bin/Whisparr.Update
+
+COPY . /
+
+USER nobody:nogroup
+WORKDIR /config
+VOLUME ["/config"]
+
+ENTRYPOINT ["/usr/bin/catatonit", "--", "/entrypoint.sh"]
+
+LABEL org.opencontainers.image.source="https://github.com/Whisparr/Whisparr-Eros"
diff --git a/apps/whisparr-v3/docker-bake.hcl b/apps/whisparr-v3/docker-bake.hcl
new file mode 100644
index 000000000..562edf6ec
--- /dev/null
+++ b/apps/whisparr-v3/docker-bake.hcl
@@ -0,0 +1,42 @@
+target "docker-metadata-action" {}
+
+variable "APP" {
+  default = "whisparr"
+}
+
+variable "VERSION" {
+  // renovate: datasource=github-releases depName=whisparr versioning=loose
+  default = "3.3.2-release.604"
+}
+
+variable "SOURCE" {
+  default = "https://github.com/Whisparr/Whisparr-Eros"
+}
+
+group "default" {
+  targets = ["image-local"]
+}
+
+target "image" {
+  inherits = ["docker-metadata-action"]
+  args = {
+    VERSION = "${VERSION}"
+  }
+  labels = {
+    "org.opencontainers.image.source" = "${SOURCE}"
+  }
+}
+
+target "image-local" {
+  inherits = ["image"]
+  output = ["type=docker"]
+  tags = ["${APP}:${VERSION}"]
+}
+
+target "image-all" {
+  inherits = ["image"]
+  platforms = [
+    "linux/amd64",
+    "linux/arm64"
+  ]
+}
diff --git a/apps/whisparr-v3/entrypoint.sh b/apps/whisparr-v3/entrypoint.sh
new file mode 100755
index 000000000..24af3ed06
--- /dev/null
+++ b/apps/whisparr-v3/entrypoint.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+exec \
+    /app/bin/Whisparr \
+        --nobrowser \
+        --data=/config \
+        "$@"