diff --git a/.github/workflows/build-and-push.yml b/.github/workflows/build-and-push.yml
index a785ad3..c6ba132 100644
--- a/.github/workflows/build-and-push.yml
+++ b/.github/workflows/build-and-push.yml
@@ -35,7 +35,7 @@ jobs:
     needs: [build-and-push-base]
     strategy:
       matrix:
-        year: [2017, 2018, 2019, 2020, 2021, 2022]
+        year: [2017, 2018, 2019, 2020, 2021, 2022, 2023]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -62,7 +62,7 @@ jobs:
     needs: [build-and-push-base]
     strategy:
       matrix:
-        year: [2023]
+        year: [2024]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -91,7 +91,7 @@ jobs:
     needs: [build-and-push-image, build-and-push-latest-image]
     strategy:
       matrix:
-        year: [2022-gradle, 2023-gradle, 2023-python]
+        year: [2022-gradle, 2023-gradle, 2023-python, 2024-gradle, 2024-python]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
diff --git a/.github/workflows/build-only.yml b/.github/workflows/build-only.yml
index 8490eb2..dc66b42 100644
--- a/.github/workflows/build-only.yml
+++ b/.github/workflows/build-only.yml
@@ -30,7 +30,7 @@ jobs:
     needs: [build-base]
     strategy:
       matrix:
-        year: [2017, 2018, 2019, 2020, 2021, 2022]
+        year: [2017, 2018, 2019, 2020, 2021, 2022, 2023]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -51,7 +51,7 @@ jobs:
     needs: [build-image]
     strategy:
       matrix:
-        year: [2022-gradle, 2023-gradle, 2023-python]
+        year: [2022-gradle, 2023-gradle, 2023-python, 2024-gradle, 2024-python]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -73,7 +73,7 @@ jobs:
     needs: [build-base]
     strategy:
       matrix:
-        year: [2023]
+        year: [2024]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
diff --git a/2023/Dockerfile b/2023/Dockerfile
index 5784cd8..888b774 100644
--- a/2023/Dockerfile
+++ b/2023/Dockerfile
@@ -4,9 +4,9 @@ LABEL maintainer="Max Kratz <account@maxkratz.com>"
 
 # Install texlive
 COPY texlive.profile .
-RUN wget http://ctan.mirror.norbert-ruehl.de/systems/texlive/tlnet/install-tl-unx.tar.gz
+RUN wget http://ftp.math.utah.edu/pub/tex/historic/systems/texlive/2023/install-tl-unx.tar.gz
 RUN tar xvzf install-tl-unx.tar.gz
-RUN ./install-tl-*/install-tl -profile texlive.profile
+RUN ./install-tl-*/install-tl -profile texlive.profile -repository http://ftp.math.utah.edu/pub/tex/historic/systems/texlive/2023/tlnet-final/ --no-verify-downloads
 
 # Add texlive to path
 ENV PATH="/usr/local/texlive/2023/bin/x86_64-linux:$PATH"
diff --git a/2024-gradle/Dockerfile b/2024-gradle/Dockerfile
new file mode 100644
index 0000000..1b7926e
--- /dev/null
+++ b/2024-gradle/Dockerfile
@@ -0,0 +1,24 @@
+# texlive base image
+FROM maxkratz/texlive:2024
+LABEL maintainer="Max Kratz <account@maxkratz.com>"
+
+# Config
+ARG GRADLE_VERSION=8.1.1
+
+# Install OpenJDK 17
+RUN apt-get update -q && \
+    apt-get install -yq \
+        openjdk-17-jre-headless
+
+# Install Gradle
+RUN wget -q -c https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-bin.zip -P /tmp
+RUN unzip -d /opt/gradle /tmp/gradle-${GRADLE_VERSION}-bin.zip
+RUN rm -f /opt/gradle-${GRADLE_VERSION}-bin.zip
+ENV GRADLE_HOME /opt/gradle/gradle-${GRADLE_VERSION}
+ENV PATH /opt/gradle/gradle-${GRADLE_VERSION}/bin:$PATH
+
+# Remove apt lists (for storage efficiency)
+RUN rm -rf /var/lib/apt/lists/*
+
+WORKDIR /data
+CMD ["bash"]
diff --git a/2024-python/Dockerfile b/2024-python/Dockerfile
new file mode 100644
index 0000000..656f068
--- /dev/null
+++ b/2024-python/Dockerfile
@@ -0,0 +1,14 @@
+# texlive base image
+FROM maxkratz/texlive:2024
+LABEL maintainer="Max Kratz <account@maxkratz.com>"
+
+# Install Python 3.x
+RUN apt-get update -q && \
+    apt-get install -yq \
+        python3 python3-pip
+
+# Remove apt lists (for storage efficiency)
+RUN rm -rf /var/lib/apt/lists/*
+
+WORKDIR /data
+CMD ["bash"]
diff --git a/2024/Dockerfile b/2024/Dockerfile
new file mode 100644
index 0000000..94bfbf2
--- /dev/null
+++ b/2024/Dockerfile
@@ -0,0 +1,21 @@
+# texlive base image
+FROM maxkratz/texlive:base
+LABEL maintainer="Max Kratz <account@maxkratz.com>"
+
+# Install texlive
+COPY texlive.profile .
+RUN wget http://ctan.mirror.norbert-ruehl.de/systems/texlive/tlnet/install-tl-unx.tar.gz
+RUN tar xvzf install-tl-unx.tar.gz
+RUN ./install-tl-*/install-tl -profile texlive.profile
+
+# Add texlive to path
+ENV PATH="/usr/local/texlive/2024/bin/x86_64-linux:$PATH"
+ENV PATH="/usr/local/texlive/2024/bin/aarch64-linux:$PATH"
+ENV PATH="/usr/local/texlive/2024/bin/armhf-linux:$PATH"
+
+# Update tlmgr + tex-packages
+RUN tlmgr update --self --all --reinstall-forcibly-removed
+RUN luaotfload-tool -v -vvv -u
+
+WORKDIR /data
+CMD ["bash"]
diff --git a/2024/texlive.profile b/2024/texlive.profile
new file mode 100644
index 0000000..ef7b239
--- /dev/null
+++ b/2024/texlive.profile
@@ -0,0 +1,10 @@
+selected_scheme scheme-full
+TEXDIR /usr/local/texlive/2024
+TEXMFCONFIG ~/.texlive2024/texmf-config
+TEXMFHOME ~/texmf
+TEXMFLOCAL /usr/local/texlive/texmf-local
+TEXMFSYSCONFIG /usr/local/texlive/2024/texmf-config
+TEXMFSYSVAR /usr/local/texlive/2024/texmf-var
+TEXMFVAR ~/.texlive2024/texmf-var
+option_doc 0
+option_src 0