diff --git a/Dockerfile b/Dockerfile
index 517e180..41c198f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,24 +1,21 @@
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 
 ARG DEBIAN_FRONTEND=noninteractive
 ENV TZ=America/New_York
 
 RUN apt-get update && apt-get install -y \
     cmake \
+    libjpeg8-dev \
     g++ \
     wget \
     unzip \
-    psmisc \
     git \
-    python-virtualenv \
+    python2 \
     virtualenv \
-    python-dev \
-    libffi-dev \
-    build-essential \
-    tzdata \
-    zlib1g-dev \
-    libjpeg-dev
-
+    python3-dev \
+    python3-virtualenv \
+    tzdata
+    
 EXPOSE 5000
 
 ARG tag=master
@@ -74,6 +71,9 @@ USER octoprint
 
 WORKDIR /home/octoprint
 
+# Update the install script for Ubuntu 20
+RUN sed -i 's/python-virtualenv //' ./klipper/scripts/install-ubuntu-18.04.sh
+
 RUN git clone https://github.com/KevinOConnor/klipper
 
 RUN ./klipper/scripts/install-ubuntu-18.04.sh