diff --git a/Dockerfile b/Dockerfile
index 949f92a..1f4b218 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,12 +1,44 @@
-FROM ghcr.io/hassio-addons/debian-base:7.2.0
+# syntax=docker/dockerfile:1
 
-# Install dependencies and fahclient
-RUN apt-get update && apt-get install -y curl gnupg && \
-    curl -o /tmp/fahclient.deb -L "https://download.foldingathome.org/releases/public/fah-client/debian-10-64bit/release/fah-client_8.4.9_amd64.deb" && \
-    dpkg -i /tmp/fahclient.deb && apt-get install -f -y && \
-    rm /tmp/fahclient.deb && apt-get clean
+FROM ghcr.io/linuxserver/baseimage-ubuntu:noble
 
-# Add local files
+# set version label
+ARG BUILD_DATE
+ARG VERSION
+ARG FOLDINGATHOME_RELEASE
+LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
+LABEL maintainer="aptalca"
+
+#Add needed nvidia environment variables for container toolkit
+ENV NVIDIA_DRIVER_CAPABILITIES="compute,video,utility"
+
+# global environment settings
+ENV DEBIAN_FRONTEND="noninteractive"
+
+RUN \
+  echo "**** install runtime packages ****" && \
+  apt-get update && \
+  apt-get install -y \
+    bzip2 \
+    intel-opencl-icd \
+    libexpat1 && \
+  ln -s libOpenCL.so.1 /usr/lib/x86_64-linux-gnu/libOpenCL.so && \
+  echo "**** install foldingathome ****" && \
+  download_url="https://download.foldingathome.org/releases/public/fah-client/"$(curl -s https://download.foldingathome.org/releases/public/fah-client/meta.json | jq -r '.[] | select((.package | contains("debian")) and (.package | contains("release"))) | .package' | grep -v "arm64" | grep "tar.bz2") && \
+  curl -o \
+    /tmp/fah.tar.bz2 -L \
+    ${download_url} && \
+  tar xf /tmp/fah.tar.bz2 -C /app --strip-components=1 && \
+  printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
+  echo "**** cleanup ****" && \
+  apt-get clean && \
+  rm -rf \
+    /tmp/* \
+    /var/lib/apt/lists/* \
+    /var/tmp/* \
+    /var/log/*
+
+# add local files
 COPY root/ /
 
 # Environment and entrypoint