diff --git a/Dockerfile b/Dockerfile
index b6a8234..36206a7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,10 +18,7 @@ WORKDIR /var/lib/boinc
 EXPOSE 31416
 
 # Install
-RUN dnf install -y dnf-plugins-core
-RUN dnf config-manager --add-repo https://boinc.berkeley.edu/dl/linux/alpha/fc40
-RUN dnf config-manager --set-enabled boinc.berkeley.edu_dl_linux_alpha_fc40
-RUN rpm --import https://boinc.berkeley.edu/dl/linux/alpha/fc40/boinc.gpg
-RUN dnf install -y boinc-client
+RUN dnf install boinc-client -y
+RUN dnf clean all
 
-CMD ["start-boinc.sh"]
+CMD ["start-boinc.sh"]
\ No newline at end of file
diff --git a/Dockerfile.vanilla b/Dockerfile.vanilla
new file mode 100644
index 0000000..fff81b8
--- /dev/null
+++ b/Dockerfile.vanilla
@@ -0,0 +1,29 @@
+FROM registry.fedoraproject.org/fedora:40
+
+LABEL maintainer="TechTransThai" \
+      description="Fedora image for BOINC client."
+
+# Global environment settings
+ENV BOINC_GUI_RPC_PASSWORD="123" \
+    BOINC_REMOTE_HOST="127.0.0.1" \
+    BOINC_CMD_LINE_OPTIONS=""
+
+# Copy files
+COPY bin/ /usr/bin/
+
+# Configure
+WORKDIR /var/lib/boinc
+
+# BOINC RPC port
+EXPOSE 31416
+
+# Install
+RUN dnf install -y dnf-plugins-core
+RUN dnf config-manager --add-repo https://boinc.berkeley.edu/dl/linux/alpha/fc40
+RUN dnf config-manager --set-enabled boinc.berkeley.edu_dl_linux_alpha_fc40
+RUN rpm --import https://boinc.berkeley.edu/dl/linux/alpha/fc40/boinc.gpg
+RUN dnf install -y boinc-client
+RUN dnf clean all
+RUN ln -s /usr/local/bin/boinc /usr/bin/
+
+CMD ["start-boinc.sh"]