diff --git a/Dockerfile b/Dockerfile
index 60a1925..cfc589f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,17 +1,23 @@
 FROM ghcr.io/hassio-addons/debian-base:7.2.0
-RUN \
-    echo "deb http://deb.debian.org/debian bullseye main" > /etc/apt/sources.list && \
-    apt-get update && \
-    apt-get install -y --no-install-recommends \
-        curl \
-        ca-certificates && \
-    curl -sSL https://download.foldingathome.org/releases/public/fah-client/debian-10-64bit/release/fah-client_8.4.9_amd64.deb -o /fahclient.deb && \
-    ls -l /fahclient.deb && \
-    dpkg -i /fahclient.deb || true && \
-    apt-get install -f -y && \
-    rm /fahclient.deb && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/*
+
+# Set up package sources
+RUN echo "deb http://deb.debian.org/debian bullseye main" > /etc/apt/sources.list && \
+  apt-get update && \
+  apt-get install -y --no-install-recommends \
+      curl \
+      ca-certificates \
+      gnupg && \
+  curl -sSL https://download.foldingathome.org/releases/public/fah-client/debian-10-64bit/v8.4.9/fahclient_8.4.9_amd64.deb -o /fahclient.deb && \
+  dpkg -i /fahclient.deb || apt-get install -f -y && \
+  rm /fahclient.deb && \
+  apt-get clean && \
+  rm -rf /var/lib/apt/lists/*
+
+# Copy rootfs
 COPY rootfs /
+
+# Expose port
 EXPOSE 7396
-ENTRYPOINT [ "/init" ]
\ No newline at end of file
+
+# Default command with support for CLI args
+CMD ["/usr/bin/fahclient", "--config", "/config/config.xml", "${CLI_ARGS}"]
\ No newline at end of file