diff --git a/frontend/Dockerfile b/frontend/Dockerfile
index 764f5b3..78b1972 100644
--- a/frontend/Dockerfile
+++ b/frontend/Dockerfile
@@ -2,11 +2,10 @@ FROM debian as unzip
 
 ARG FRONTEND_ZIP_URL=https://github.com/cadriel/fluidd/releases/latest/download/fluidd.zip
 
-ARG DEBIAN_FRONTEND=noninteractive
 WORKDIR /frontend
 
 ADD ${FRONTEND_ZIP_URL} /tmp/frontend.zip
-RUN apt-get update && apt-get install -y unzip
+RUN DEBIAN_FRONTEND=noninteractive && apt-get update && apt-get install -y unzip
 RUN unzip /tmp/frontend.zip -d /frontend
 
 FROM nginx:alpine as image
diff --git a/klipper/Dockerfile b/klipper/Dockerfile
index 3e2215a..c32c703 100644
--- a/klipper/Dockerfile
+++ b/klipper/Dockerfile
@@ -41,7 +41,6 @@ FROM python:3.9-slim as image
 ARG DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update && \
-    apt-get upgrade -y && \
     apt-get install -y \
     git \
     gcc \
@@ -88,6 +87,7 @@ RUN useradd --user-group --no-log-init --shell /bin/false -m -d ${HOME} ${USER}
     mkdir -p /var/log/klipper && chown ${USER}:${USER} /var/log/klipper ${HOME} && \
     pip install --no-cache supervisord-dependent-startup gpiod
 
+RUN mkdir -p /usr/lib/python3 && ln -s /usr/local/lib/python3.9/site-packages /usr/lib/python3/dist-packages
 
 USER ${USER}
 WORKDIR ${HOME}
diff --git a/klipper/moonraker.ini b/klipper/moonraker.ini
index 13cb189..d28eaca 100644
--- a/klipper/moonraker.ini
+++ b/klipper/moonraker.ini
@@ -1,7 +1,7 @@
 [program:moonraker]
 user=klippy
 command=/home/klippy/moonraker-env/bin/python /home/klippy/moonraker/moonraker/moonraker.py -l /var/log/klipper/moonraker.log -c /home/klippy/.config/moonraker.conf
-environment=USER=klippy,HOME=/home/klippy,PYTHONHOME=/home/klippy/moonraker-env
+environment=USER=klippy,HOME=/home/klippy
 stdout_logfile=/dev/fd/1
 stdout_logfile_maxbytes = 0
 stderr_logfile=/dev/fd/2