diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ee878e0..77d5e3b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -47,7 +47,7 @@ jobs:
     name: build ${{ matrix.base-image }}
     strategy:
       matrix:
-        base-image: [xenial]
+        base-image: [xenial, bionic]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
diff --git a/bionic/Dockerfile b/bionic/Dockerfile
new file mode 100644
index 0000000..197274b
--- /dev/null
+++ b/bionic/Dockerfile
@@ -0,0 +1,109 @@
+ARG nominatim_version=3.5.2
+
+FROM ubuntu:bionic as builder
+
+ARG nominatim_version
+
+# Let the container know that there is no TTY
+ARG DEBIAN_FRONTEND=noninteractive
+
+# Install packages
+RUN apt-get -y update \
+ && apt-get install -y -qq --no-install-recommends \
+    build-essential \
+    cmake \
+    g++ \
+    libboost-dev \
+    libboost-system-dev \
+    libboost-filesystem-dev \
+    libexpat1-dev \
+    zlib1g-dev \
+    libxml2-dev \
+    libbz2-dev \
+    libpq-dev \
+    libgeos-dev \
+    libgeos++-dev \
+    libproj-dev \
+    postgresql-server-dev-10 \
+    php \
+    curl
+
+# Build Nominatim
+RUN cd /srv \
+ && curl --silent -L http://www.nominatim.org/release/Nominatim-${nominatim_version}.tar.bz2 -o v${nominatim_version}.tar.bz2 \
+ && tar xf v${nominatim_version}.tar.bz2 \
+ && rm v${nominatim_version}.tar.bz2 \
+ && mv Nominatim-${nominatim_version} nominatim \
+ && cd nominatim \
+ && mkdir build \
+ && cd build \
+ && cmake .. \
+ && make
+
+
+FROM ubuntu:bionic
+
+ARG nominatim_version
+
+LABEL \
+  maintainer="Peter Evans <mail@peterevans.dev>" \
+  org.opencontainers.image.title="nominatim" \
+  org.opencontainers.image.description="Docker image for Nominatim." \
+  org.opencontainers.image.authors="Peter Evans <mail@peterevans.dev>" \
+  org.opencontainers.image.url="https://github.com/peter-evans/nominatim-docker" \
+  org.opencontainers.image.vendor="https://peterevans.dev" \
+  org.opencontainers.image.licenses="MIT" \
+  app.tag="nominatim${nominatim_version}"
+
+# Let the container know that there is no TTY
+ARG DEBIAN_FRONTEND=noninteractive
+
+# Set locale and install packages
+ENV LANG C.UTF-8
+RUN apt-get -y update \
+ && apt-get install -y -qq --no-install-recommends locales \
+ && locale-gen en_US.UTF-8 \
+ && update-locale LANG=en_US.UTF-8 \
+ && apt-get install -y -qq --no-install-recommends \
+    postgresql-server-dev-10 \
+    postgresql-10-postgis-2.4 \
+    postgresql-10-postgis-2.4-scripts \
+    postgresql-contrib-10 \
+    apache2 \
+    php \
+    php-pgsql \
+    libapache2-mod-php \
+    php-pear \
+    php-db \
+    php-intl \
+    python3-dev \
+    python3-psycopg2 \
+    curl \
+    ca-certificates \
+    sudo \
+    libboost-system1.65.1\
+    libboost-filesystem1.65.1\
+ && apt-get clean \
+ && rm -rf /var/lib/apt/lists/* \
+ && rm -rf /tmp/* /var/tmp/*
+
+# Copy the application from the builder image
+COPY --from=builder /srv/nominatim /srv/nominatim
+
+# Configure Nominatim
+COPY local.php /srv/nominatim/build/settings/local.php
+
+# Configure Apache
+COPY nominatim.conf /etc/apache2/sites-enabled/000-default.conf
+
+# Allow remote connections to PostgreSQL
+RUN echo "host all  all    0.0.0.0/0  trust" >> /etc/postgresql/10/main/pg_hba.conf \
+ && echo "listen_addresses='*'" >> /etc/postgresql/10/main/postgresql.conf
+
+# Set the entrypoint
+COPY docker-entrypoint.sh /
+RUN chmod +x /docker-entrypoint.sh
+ENTRYPOINT ["/docker-entrypoint.sh"]
+
+EXPOSE 5432
+EXPOSE 8080
diff --git a/bionic/docker-entrypoint.sh b/bionic/docker-entrypoint.sh
new file mode 100644
index 0000000..a6182b5
--- /dev/null
+++ b/bionic/docker-entrypoint.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+# Defaults
+NOMINATIM_DATA_PATH=${NOMINATIM_DATA_PATH:="/srv/nominatim/data"}
+NOMINATIM_DATA_LABEL=${NOMINATIM_DATA_LABEL:="data"}
+NOMINATIM_PBF_URL=${NOMINATIM_PBF_URL:="http://download.geofabrik.de/asia/maldives-latest.osm.pbf"}
+
+
+# Retrieve the PBF file
+curl -L $NOMINATIM_PBF_URL --create-dirs -o $NOMINATIM_DATA_PATH/$NOMINATIM_DATA_LABEL.osm.pbf
+# Allow user accounts read access to the data
+chmod 755 $NOMINATIM_DATA_PATH
+
+# Start PostgreSQL
+service postgresql start
+
+# Import data
+sudo -u postgres psql postgres -tAc "SELECT 1 FROM pg_roles WHERE rolname='nominatim'" | grep -q 1 || sudo -u postgres createuser -s nominatim
+sudo -u postgres psql postgres -tAc "SELECT 1 FROM pg_roles WHERE rolname='www-data'" | grep -q 1 || sudo -u postgres createuser -SDR www-data
+sudo -u postgres psql postgres -c "DROP DATABASE IF EXISTS nominatim"
+useradd -m -p password1234 nominatim
+sudo -u nominatim /srv/nominatim/build/utils/setup.php --osm-file $NOMINATIM_DATA_PATH/$NOMINATIM_DATA_LABEL.osm.pbf --all --threads 2
+
+
+# Tail Apache logs
+tail -f /var/log/apache2/* &
+
+# Run Apache in the foreground
+/usr/sbin/apache2ctl -D FOREGROUND
diff --git a/bionic/local.php b/bionic/local.php
new file mode 100644
index 0000000..dc2394e
--- /dev/null
+++ b/bionic/local.php
@@ -0,0 +1,7 @@
+<?php
+ // Paths
+ @define('CONST_Postgresql_Version', '10');
+ @define('CONST_Postgis_Version', '2.4');
+ // Website settings
+ @define('CONST_Website_BaseURL', '/');
+?>
diff --git a/bionic/nominatim.conf b/bionic/nominatim.conf
new file mode 100644
index 0000000..10b2250
--- /dev/null
+++ b/bionic/nominatim.conf
@@ -0,0 +1,13 @@
+Listen 8080
+<VirtualHost *:8080>
+        DocumentRoot /srv/nominatim/build/website
+        CustomLog /var/log/apache2/access.log combined
+        ErrorLog /var/log/apache2/error.log
+        LogLevel warn
+        <Directory /srv/nominatim/build/website>
+                Options FollowSymLinks MultiViews
+                DirectoryIndex search.php
+                Require all granted
+        </Directory>
+        AddType text/html .php
+</VirtualHost>