diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index a105af5..fe7ee00 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ 'centos-7', 'rocky-8', 'rocky-9', 'debian-11', 'debian-12', 'fedora', 'ubuntu-20.04', 'ubuntu-22.04']
+        os: [ 'centos-7', 'rocky-8', 'rocky-9', 'debian-11', 'debian-12', 'fedora', 'ubuntu-20.04', 'ubuntu-22.04', 'ubuntu-24.04']
     steps:
       - name: Checkout
         uses: actions/checkout@v3
diff --git a/docker/ubuntu-24.04/Dockerfile b/docker/ubuntu-24.04/Dockerfile
new file mode 100644
index 0000000..5276f4a
--- /dev/null
+++ b/docker/ubuntu-24.04/Dockerfile
@@ -0,0 +1,70 @@
+# syntax=docker/dockerfile:1
+ARG BRANCH=master
+ARG RSTUDIO=2023.06.2-561
+
+# Build image
+FROM ubuntu:24.04 AS builder
+ARG BRANCH
+ENV DEBIAN_FRONTEND noninteractive
+
+# Install.
+RUN \
+#  apt-get update && \
+#  apt-get -y dist-upgrade && \
+#  apt-get install -y software-properties-common && \
+#  add-apt-repository -y ppa:opencpu/opencpu-2.2 && \
+  apt-get update && \
+  apt-get install -y wget make devscripts apache2-dev apache2 libapreq2-dev r-base r-base-dev libapparmor-dev libcurl4-openssl-dev libprotobuf-dev protobuf-compiler libcairo2-dev xvfb xauth xfonts-base curl libssl-dev libxml2-dev libicu-dev pkg-config libssh2-1-dev locales apt-utils cmake && \
+  useradd -ms /bin/bash builder
+
+# Different from debian
+RUN apt-get install -y language-pack-en-base
+
+USER builder
+
+RUN \
+  cd ~ && \
+  wget --quiet https://github.com/opencpu/opencpu-server/archive/${BRANCH}.tar.gz && \
+  tar xzf ${BRANCH}.tar.gz && rm ${BRANCH}.tar.gz && \
+  cd opencpu-server-* && \
+  dpkg-buildpackage -us -uc
+
+FROM ubuntu:22.04
+USER root
+ARG RSTUDIO
+ENV DEBIAN_FRONTEND noninteractive
+WORKDIR /root/
+COPY --from=builder /home/builder/opencpu*deb ./
+
+RUN \
+  apt-get update && \
+  apt-get -y dist-upgrade && \
+  apt-get install -y software-properties-common gdebi-core git wget sudo cron && \
+  add-apt-repository -y ppa:opencpu/opencpu-2.2 && \
+  gdebi --non-interactive opencpu-lib_*.deb && \
+  gdebi --non-interactive opencpu-server_*.deb
+
+RUN \
+  wget --quiet https://download2.rstudio.org/server/jammy/amd64/rstudio-server-${RSTUDIO}-amd64.deb && \
+  gdebi --non-interactive rstudio-server-${RSTUDIO}-amd64.deb && \
+  rm -f rstudio-server-${RSTUDIO}-amd64.deb && \
+  echo "server-app-armor-enabled=0" >> /etc/rstudio/rserver.conf
+
+# Prints apache logs to stdout
+RUN \
+  ln -sf /proc/self/fd/1 /var/log/apache2/access.log && \
+  ln -sf /proc/self/fd/1 /var/log/apache2/error.log && \
+  ln -sf /proc/self/fd/1 /var/log/opencpu/apache_access.log && \
+  ln -sf /proc/self/fd/1 /var/log/opencpu/apache_error.log
+
+# Set opencpu password so that we can login
+RUN \
+  echo "opencpu:opencpu" | chpasswd
+
+# Apache ports
+EXPOSE 80
+EXPOSE 443
+EXPOSE 8004
+
+# Start non-daemonized webserver
+CMD service cron start && /usr/lib/rstudio-server/bin/rserver && apachectl -DFOREGROUND