diff --git a/README.md b/README.md
index 44ea7da9c..bcc377d2a 100644
--- a/README.md
+++ b/README.md
@@ -72,6 +72,7 @@ This repository contains Dockerfile files used to build solutions provided by
 
 * [18.04](https://github.com/ursais/docker/blob/master/ubuntu/18.04/Dockerfile)
 * [20.04](https://github.com/ursais/docker/blob/master/ubuntu/20.04/Dockerfile)
+* [22.04](https://github.com/ursais/docker/blob/master/ubuntu/22.04/Dockerfile)
 
 # Support
 
diff --git a/frepple/6/Dockerfile b/frepple/6/Dockerfile
index dd29c4673..d4cdd4a8e 100644
--- a/frepple/6/Dockerfile
+++ b/frepple/6/Dockerfile
@@ -1,7 +1,8 @@
-FROM ursa/ubuntu-18.04:latest
+FROM ursa/ubuntu-20.04:latest
 MAINTAINER Open Source Integrators <support@opensourceintegrators.com>
 
 # Install FrePPLe
+ENV VERSION=6.21.0
 RUN apt update \
     && apt install -y --no-install-recommends \
         at \
@@ -13,13 +14,13 @@ RUN apt update \
         python3-psycopg2 \
         python3-setuptools \
         python3-wheel \
-    && curl -o frepple.deb -sSL https://github.com/frePPLe/frepple/releases/download/6.16.0/ubuntu18-frepple-6.16.0.deb \
+    && curl -o frepple.deb -sSL https://github.com/frePPLe/frepple/releases/download/$VERSION/ubuntu20-frepple-$VERSION.deb \
     && apt install -y --no-install-recommends ./frepple.deb \
     && rm -rf /var/lib/apt/lists/* frepple.deb
 
 # Update the PostgreSQL client to match the server
 ENV PGVERSION=14
-RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ bionic-pgdg main' > /etc/apt/sources.list.d/pgdg.list \
+RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ focal-pgdg main' > /etc/apt/sources.list.d/pgdg.list \
     && curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
     && apt update \
     && apt install --no-install-recommends -y postgresql-client-$PGVERSION \
diff --git a/frepple/6/requirements.txt b/frepple/6/requirements.txt
index 0ad4f29f0..bc63e7302 100644
--- a/frepple/6/requirements.txt
+++ b/frepple/6/requirements.txt
@@ -11,11 +11,11 @@ jdcal == 1.4.1
 Markdown == 3.1.1
 openpyxl == 2.6.2
 lxml == 4.6.5
-PyJWT == 1.7.1
 requests == 2.23.0
-python-dateutil == 2.8.1
-pillow == 9.0.1
+Pillow == 9.1.0
 psutil == 5.7.3
+PyJWT == 1.7.1
+python-dateutil == 2.8.1
 https://github.com/frePPLe/django/tarball/frepple_6.0
 
 # Postgres database connection
diff --git a/ubuntu/22.04/Dockerfile b/ubuntu/22.04/Dockerfile
new file mode 100644
index 000000000..258f276fc
--- /dev/null
+++ b/ubuntu/22.04/Dockerfile
@@ -0,0 +1,28 @@
+FROM ubuntu:jammy
+MAINTAINER Open Source Integrators <support@opensourceintegrators.com>
+
+SHELL ["/bin/bash", "-xo", "pipefail", "-c"]
+
+# Generate locale C.UTF-8
+ENV LANG C.UTF-8
+ENV TZ=UTC
+RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
+
+RUN apt update \
+  && apt upgrade -y \
+  && apt install -y --no-install-recommends \
+    ca-certificates \
+    curl \
+    htop \
+    iotop \
+    rsync \
+    tar \
+    vim \
+    unzip \
+  && apt clean all \
+  && apt autoremove
+
+# Install dockerize for config files
+RUN curl -sfL $(curl -s https://api.github.com/repos/powerman/dockerize/releases/latest \
+  | grep -i /dockerize-$(uname -s)-$(uname -m)\" | cut -d\" -f4) \
+  | install /dev/stdin /usr/local/bin/dockerize