diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..4c1452b
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,12 @@
+# Do not send secrets or local junk to the Docker daemon
+.env
+*.env
+!.env.example
+.git
+.gitignore
+**/.DS_Store
+**/node_modules
+**/venv
+**/__pycache__
+**/*.pyc
+**/*.log
diff --git a/Dockerfile b/Dockerfile
index a712db6..74588fb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,6 +13,8 @@ RUN mkdir -p /root/.ssh && chmod 700 /root/.ssh
 ARG SSH_PRIVATE_KEY
 ARG SSH_PUBLIC_KEY
 ARG OLLAMA_HOST
+ARG OLLAMA_PORT
+ARG SINCE
 RUN echo "$SSH_PRIVATE_KEY" > /root/.ssh/id_rsa && \
 	echo "$SSH_PUBLIC_KEY" > /root/.ssh/id_rsa.pub && \
 	chmod 600 /root/.ssh/id_rsa && \
@@ -30,8 +32,8 @@ COPY scripts/auto-boot-ollama-host.lua .
 
 # Environment defaults (can be overridden by compose/Komodo)
 ENV CONTAINER_NAME=paperless-ai \
-	OLLAMA_HOST=192.168.222.12 \
-	OLLAMA_PORT=11434 \
-	SINCE=0s
+	OLLAMA_HOST=${OLLAMA_HOST} \
+	OLLAMA_PORT=${OLLAMA_PORT} \
+	SINCE=${SINCE:-0s}
 
 ENTRYPOINT ["lua5.4", "/app/auto-boot-ollama-host.lua"]
\ No newline at end of file
diff --git a/compose.yaml b/compose.yaml
index 811b0da..6077f71 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -1,6 +1,14 @@
 services:
   auto-boot-ollama-host:
-    build: .
+    build:
+      context: .
+      args:
+        # Build-time only (sourced from your .env)
+        SSH_PUBLIC_KEY: "${SSH_PUBLIC_KEY}"
+        SSH_PRIVATE_KEY: "${SSH_PRIVATE_KEY}"
+        OLLAMA_HOST: "${OLLAMA_HOST:-192.168.222.12}"
+        OLLAMA_PORT: "${OLLAMA_PORT:-11434}"
+        SINCE: "${SINCE:-0s}"
     container_name: auto-boot-ollama-host
     network_mode: host
     environment:
@@ -11,8 +19,6 @@ services:
       WOL_MAC: "${WOL_MAC}"
       WOL_BCAST: "${WOL_BCAST:-192.168.222.255}"    # optional
       WOL_PORT: "${WOL_PORT:-9}"                    # optional
-      #SSH_PUBLIC_KEY: "${SSH_PUBLIC_KEY}"
-      #SSH_PRIVATE_KEY: "${SSH_PRIVATE_KEY}"
     restart: unless-stopped
     volumes:
       - /etc/localtime:/etc/localtime:ro