diff --git a/config/service/navidrome/Containerfile b/config/service/navidrome/Containerfile
index 60b53b8..998e53b 100644
--- a/config/service/navidrome/Containerfile
+++ b/config/service/navidrome/Containerfile
@@ -1,11 +1,11 @@
-FROM debian:bullseye-slim
+FROM docker.io/debian:bullseye-slim
 ARG VERSION=0.47.0
 
 RUN apt-get update -y && apt-get upgrade -y && \
     apt-get install -y --no-install-recommends curl ca-certificates gosu ffmpeg
 
 ENV PACKAGE_URL https://github.com/deluan/navidrome/releases/download/v${VERSION}/navidrome_${VERSION}_Linux_x86_64.tar.gz
-RUN curl -L ${PACKAGE_URL} | tar -C /bin -xvzf - navidrome && chmod +x /bin/navidrome
+RUN curl -L ${PACKAGE_URL} | tar -C /bin --no-same-owner -xvzf - navidrome && chmod +x /bin/navidrome
 
 RUN apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false curl
 
diff --git a/config/service/rss2email/Containerfile b/config/service/rss2email/Containerfile
index 4c501dc..fafbde6 100644
--- a/config/service/rss2email/Containerfile
+++ b/config/service/rss2email/Containerfile
@@ -1,4 +1,4 @@
-FROM debian:bullseye-slim
+FROM docker.io/debian:bullseye-slim
 ARG VERSION=4a088c7efe1c76fa1ebe842adc8e2a796df8f313
 
 RUN apt-get update -y && apt-get install -y --no-install-recommends \
diff --git a/config/service/rss2email/systemd/rss2email.service b/config/service/rss2email/systemd/rss2email.service
index f2153f4..181c59a 100644
--- a/config/service/rss2email/systemd/rss2email.service
+++ b/config/service/rss2email/systemd/rss2email.service
@@ -6,7 +6,7 @@ After=container-build@%N.service postfix.service
 [Service]
 Type=oneshot
 SyslogIdentifier=%N
-ExecStart=/bin/podman run --replace --name %N --net internal \
+ExecStart=/bin/podman run --replace --rm --name %N --net internal \
                           --env-file %E/coreos-home-server/%N/%N.env \
                           --volume %N-feeds:/etc/%N/conf.d:z,ro \
                           --volume %N:/var/lib/%N:z \