diff --git a/challenge/Dockerfile b/challenge/Dockerfile
index e595b2df..08e8ccd6 100644
--- a/challenge/Dockerfile
+++ b/challenge/Dockerfile
@@ -1,582 +1,8 @@
-# syntax=docker/dockerfile:1-labs
+FROM ubuntu:24.04
 
-ARG UBUNTU_VERSION=20.04
-ARG DEFAULT_INSTALL_SELECTION=yes
-ARG INSTALL_KERNEL=${DEFAULT_INSTALL_SELECTION}
-ARG INSTALL_TCPDUMP=${DEFAULT_INSTALL_SELECTION}
-ARG INSTALL_CAPSTONE=${DEFAULT_INSTALL_SELECTION}
-ARG INSTALL_RADARE2=${DEFAULT_INSTALL_SELECTION}
-ARG INSTALL_AFL=${DEFAULT_INSTALL_SELECTION}
-ARG INSTALL_RAPPEL=${DEFAULT_INSTALL_SELECTION}
-ARG INSTALL_RP=${DEFAULT_INSTALL_SELECTION}
-ARG INSTALL_GECKODRIVER=${DEFAULT_INSTALL_SELECTION}
-ARG INSTALL_BURPSUITE=${DEFAULT_INSTALL_SELECTION}
-ARG INSTALL_BUSYBOX=${DEFAULT_INSTALL_SELECTION}
-ARG INSTALL_GLOW=${DEFAULT_INSTALL_SELECTION}
-ARG INSTALL_VIRTIOFSD=${DEFAULT_INSTALL_SELECTION}
-ARG INSTALL_IDA_FREE=${DEFAULT_INSTALL_SELECTION}
-ARG INSTALL_BINJA_FREE=${DEFAULT_INSTALL_SELECTION}
-ARG INSTALL_GHIDRA=${DEFAULT_INSTALL_SELECTION}
-ARG INSTALL_ANGR_MANAGEMENT=${DEFAULT_INSTALL_SELECTION}
-ARG INSTALL_GDB=${DEFAULT_INSTALL_SELECTION}
-ARG INSTALL_TOOLS_PIP=${DEFAULT_INSTALL_SELECTION}
-ARG INSTALL_TOOLS_APT=${DEFAULT_INSTALL_SELECTION}
-
-FROM ubuntu:${UBUNTU_VERSION} as essentials
-
-SHELL ["/bin/bash", "-ceov", "pipefail"]
-
-ENV DEBIAN_FRONTEND=noninteractive
-ENV LC_CTYPE=C.UTF-8
-
-RUN <<EOF
-    rm -f /etc/apt/apt.conf.d/docker-clean
-    echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache
-
-    (set +o pipefail; yes | unminimize)
-
-    dpkg --add-architecture i386
-
-    apt-get clean && rm -rf /var/lib/apt/lists/*
-EOF
-
-RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
-    --mount=type=cache,target=/var/lib/apt,sharing=locked \
-    apt-get update && xargs apt-get install --no-install-recommends -yqq <<EOF && \
-    apt-get clean && rm -rf /var/lib/apt/lists/*
-        build-essential
-        ca-certificates
-        curl
-        python-is-python3
-        sudo
-        wget
-        unzip
-EOF
-
-RUN rm -f /usr/lib/python3.*/EXTERNALLY-MANAGED
-
-################################################################################
-
-FROM essentials as builder-pwn.college
-
-RUN mkdir /opt/pwn.college
-COPY docker-initialize.sh /opt/pwn.college/docker-initialize.sh
-COPY docker-entrypoint.d /opt/pwn.college/docker-entrypoint.d
-COPY docker-entrypoint.sh /opt/pwn.college/docker-entrypoint.sh
-COPY bash.bashrc /opt/pwn.college/bash.bashrc
-COPY vm /opt/pwn.college/vm
-COPY .tmux.conf /opt/pwn.college/.tmux.conf
-COPY .gdbinit /opt/pwn.college/.gdbinit
-COPY .radare2rc /opt/pwn.college/.radare2rc
-COPY .pwn.conf /opt/pwn.college/.pwn.conf
-
-RUN <<EOF
-    ln -sf /run/dojo/bin/python-suid /opt/pwn.college/python
-    ln -sf /run/dojo/bin/bash-suid /opt/pwn.college/bash
-    ln -sf /run/dojo/bin/sh-suid /opt/pwn.college/sh
-
-    ln -sf /opt/pwn.college/vm/vm /usr/local/bin/vm
-
-    ln -sf /home/hacker/.tmux.conf /root/.tmux.conf
-    ln -sf /home/hacker/.gdbinit /root/.gdbinit
-    ln -sf /home/hacker/.radare2rc /root/.radare2rc
-    ln -sf /home/hacker/.pwn.conf /root/.pwn.conf
-
-    mkdir /challenge
-    install -m 400 <(echo 'pwn.college{uninitialized}') /flag
-EOF
-
-################################################################################
-
-FROM essentials as builder
-
-RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
-    --mount=type=cache,target=/var/lib/apt,sharing=locked \
-    apt-get update && xargs apt-get install --no-install-recommends -yqq <<EOF && \
-    apt-get clean && rm -rf /var/lib/apt/lists/*
-        autoconf
-        bc
-        bison
-        cargo
-        clang
-        cmake
-        cpio
-        openjdk-17-jdk
-        flex
-        dwarves
-        g++-multilib
-        gcc-multilib
-        git
-        libc6-dev-i386
-        libc6:i386
-        libedit-dev
-        libelf-dev
-        libffi-dev
-        libglib2.0-dev
-        libgmp-dev
-        libini-config-dev
-        libncurses5:i386
-        libpcap-dev
-        libpixman-1-dev
-        libseccomp-dev
-        libssl-dev
-        libstdc++6:i386
-        libtool-bin
-        llvm
-        man-db
-        manpages-dev
-        nasm
-        python-is-python3
-        python3-dev
-        python3-pip
-        rubygems
-        squashfs-tools
-        upx-ucl
-EOF
-
-################################################################################
-
-FROM scratch as builder-kernel-no
-WORKDIR /opt/linux
-FROM builder as builder-kernel-yes
-
-RUN <<EOF
-    mkdir /opt/linux
-    wget -O - https://mirrors.edge.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.gz | tar xzC /opt/linux
-    cd /opt/linux/linux-5.4
-    make defconfig
-EOF
-
-RUN awk '{$1=$1};1' >> /opt/linux/linux-5.4/.config <<EOF
-    CONFIG_9P_FS=y
-    CONFIG_9P_FS_POSIX_ACL=y
-    CONFIG_9P_FS_SECURITY=y
-    CONFIG_BALLOON_COMPACTION=y
-    CONFIG_CRYPTO_DEV_VIRTIO=y
-    CONFIG_DEBUG_FS=y
-    CONFIG_DEBUG_INFO=y
-    CONFIG_DEBUG_INFO_BTF=y
-    CONFIG_DEBUG_INFO_DWARF4=y
-    CONFIG_DEBUG_INFO_REDUCED=n
-    CONFIG_DEBUG_INFO_SPLIT=n
-    CONFIG_DEVPTS_FS=y
-    CONFIG_DRM_VIRTIO_GPU=y
-    CONFIG_FRAME_POINTER=y
-    CONFIG_GDB_SCRIPTS=y
-    CONFIG_HW_RANDOM_VIRTIO=y
-    CONFIG_HYPERVISOR_GUEST=y
-    CONFIG_IKCONFIG=y
-    CONFIG_IKCONFIG_PROC=y
-    CONFIG_NET_9P=y
-    CONFIG_NET_9P_DEBUG=n
-    CONFIG_NET_9P_VIRTIO=y
-    CONFIG_PARAVIRT=y
-    CONFIG_PCI=y
-    CONFIG_PCI_HOST_GENERIC=y
-    CONFIG_USER_NS=y
-    CONFIG_VIRTIO_BALLOON=y
-    CONFIG_VIRTIO_BLK=y
-    CONFIG_VIRTIO_BLK_SCSI=y
-    CONFIG_VIRTIO_CONSOLE=y
-    CONFIG_VIRTIO_INPUT=y
-    CONFIG_VIRTIO_NET=y
-    CONFIG_VIRTIO_PCI=y
-    CONFIG_VIRTIO_PCI_LEGACY=y
-EOF
-
-RUN <<EOF
-    cd /opt/linux/linux-5.4
-    make -j$(nproc) bzImage
-    ln -sf $PWD/arch/x86/boot/bzImage ../bzImage
-    ln -sf $PWD/vmlinux ../vmlinux
-EOF
-
-FROM builder-kernel-${INSTALL_KERNEL} as builder-kernel
-
-################################################################################
-
-FROM scratch as builder-gdb-no
-FROM builder as builder-gdb-yes
-
-RUN <<EOF
-    git clone --depth 1 --recurse-submodules --branch 2024.02.14 https://github.com/pwndbg/pwndbg /opt/pwndbg
-    cd /opt/pwndbg
-    ./setup.sh
-
-    git clone --depth 1 https://github.com/hugsy/gef /opt/gef
-
-    git clone --depth 1 https://github.com/jerdna-regeiz/splitmind /opt/splitmind
-
-    git clone --depth 1 https://github.com/nccgroup/libslub /opt/libslub
-    cd /opt/libslub
-    pip install -r requirements.txt
-
-    git clone --depth 1 --recurse-submodules https://github.com/zolutal/gdb-pt-dump /opt/pt-dump
-
-    git clone --depth 1 --recurse-submodules https://github.com/zolutal/kropr /opt/kropr
-    cd /opt/kropr
-    cargo install --path . --root /tmp
-    mv /tmp/bin/ropr /usr/bin/kropr
-    chmod +x /usr/bin/kropr
-    ln -sf /home/hacker/.gdbinit /root/.gdbinit
-EOF
-
-FROM builder-gdb-${INSTALL_GDB} as builder-gdb
-
-################################################################################
-
-
-FROM scratch as builder-tcpdump-no
-FROM builder as builder-tcpdump-yes
-RUN <<EOF
-    git clone --depth 1 https://github.com/the-tcpdump-group/tcpdump /opt/tcpdump
-    cd /opt/tcpdump
-    ./autogen.sh
-    ./configure
-    make install
-EOF
-FROM builder-tcpdump-${INSTALL_TCPDUMP} as builder-tcpdump
-
-FROM scratch as builder-capstone-no
-FROM builder as builder-capstone-yes
-RUN <<EOF
-    git clone --depth 1 https://github.com/capstone-engine/capstone /opt/capstone
-    cd /opt/capstone
-    make
-    make install
-EOF
-FROM builder-capstone-${INSTALL_CAPSTONE} as builder-capstone
-
-FROM scratch as builder-radare2-no
-FROM builder as builder-radare2-yes
-RUN <<EOF
-    git clone --depth 1 https://github.com/radareorg/radare2 /opt/radare2
-    cd /opt/radare2
-    sys/install.sh
-EOF
-FROM builder-radare2-${INSTALL_RADARE2} as builder-radare2
-
-FROM scratch as builder-aflplusplus-no
-FROM builder as builder-aflplusplus-yes
-RUN <<EOF
-    git clone --depth 1 https://github.com/aflplusplus/aflplusplus /opt/aflplusplus
-    cd /opt/aflplusplus
-    make distrib
-    make install
-EOF
-FROM builder-aflplusplus-${INSTALL_AFL} as builder-aflplusplus
-
-FROM scratch as builder-rappel-no
-FROM builder as builder-rappel-yes
-RUN <<EOF
-    git clone --depth 1 https://github.com/yrp604/rappel /opt/rappel
-    cd /opt/rappel
-    make
-    cp bin/rappel /usr/bin/rappel
-EOF
-FROM builder-rappel-${INSTALL_RAPPEL} as builder-rappel
-
-FROM scratch as builder-rp-no
-FROM builder as builder-rp-yes
-RUN <<EOF
-    wget https://github.com/0vercl0k/rp/releases/download/v2.0.2/rp-lin-x64 -O /usr/bin/rp++
-    chmod +x /usr/bin/rp++
-EOF
-FROM builder-rp-${INSTALL_RP} as builder-rp
-
-FROM scratch as builder-geckodriver-no
-FROM builder as builder-geckodriver-yes
-RUN <<EOF
-    wget -q -O - https://github.com/mozilla/geckodriver/releases/download/v0.35.0/geckodriver-v0.35.0-linux64.tar.gz | tar xvz -C /usr/local/bin
-EOF
-FROM builder-geckodriver-${INSTALL_GECKODRIVER} as builder-geckodriver
-
-FROM scratch as builder-burpsuite-no
-FROM builder as builder-burpsuite-yes
-RUN <<EOF
-    wget -q -O /tmp/burpsuite.sh https://portswigger.net/burp/releases/download?product=community\&version=2023.11.1.4\&type=Linux
-    sh /tmp/burpsuite.sh -q
-    rm /tmp/burpsuite.sh
-EOF
-FROM builder-burpsuite-${INSTALL_BURPSUITE} as builder-burpsuite
-
-FROM scratch as builder-busybox-no
-FROM builder as builder-busybox-yes
-RUN <<EOF
-    VERSION="busybox-1.33.2"
-    mkdir /opt/busybox && cd "$_"
-    wget -q -O - "https://busybox.net/downloads/${VERSION}.tar.bz2" | tar xvj
-    pushd "${VERSION}"
-    make defconfig
-    sed -e 's/.*CONFIG_STATIC .*/CONFIG_STATIC=y/' -i .config
-    make -j$(nproc) install
-    popd
-    ln -s "${VERSION}/_install" /opt/busybox/fs
-EOF
-FROM builder-busybox-${INSTALL_BUSYBOX} as builder-busybox
-
-FROM scratch as builder-glow-no
-FROM builder as builder-glow-yes
-RUN <<EOF
-    VERSION="1.5.1"
-    DEB_NAME="glow_${VERSION}_amd64.deb"
-    pushd /tmp
-    wget -q "https://github.com/charmbracelet/glow/releases/download/v${VERSION}/${DEB_NAME}"
-    apt install "./${DEB_NAME}"
-    rm "${DEB_NAME}"
-    popd
-EOF
-FROM builder-glow-${INSTALL_GLOW} as builder-glow
-
-FROM scratch as builder-virtiofsd-no
-WORKDIR /opt/virtiofsd
-FROM builder as builder-virtiofsd-yes
-RUN <<EOF
-    mkdir /opt/virtiofsd && cd "$_"
-    wget -q -O ./build.zip "https://gitlab.com/virtio-fs/virtiofsd/-/jobs/artifacts/main/download?job=publish"
-    unzip -p ./build.zip "$(zipinfo -1 ./build.zip | head -n1)" > ./virtiofsd
-    rm -f ./build.zip
-    chmod +x ./virtiofsd
-EOF
-FROM builder-virtiofsd-${INSTALL_VIRTIOFSD} as builder-virtiofsd
-
-################################################################################
-
-FROM scratch as builder-desktop-angr-management-no
-FROM essentials as builder-desktop-angr-management-yes
-ARG UBUNTU_VERSION=20.04
-
-COPY desktop/angr-management.desktop /usr/share/applications/
-RUN <<EOF
-    wget -q -O - https://github.com/angr/angr-management/releases/download/nightly/angr-management-ubuntu-${UBUNTU_VERSION}.tar.gz | tar xvz -C /opt
-EOF
-
-FROM builder-desktop-angr-management-${INSTALL_ANGR_MANAGEMENT} as builder-desktop-angr-management
-
-################################################################################
-
-FROM scratch as builder-desktop-ghidra-no
-FROM essentials as builder-desktop-ghidra-yes
-
-COPY desktop/Ghidra.desktop /usr/share/applications/
-RUN <<EOF
-    wget -q -O /tmp/ghidra.zip https://github.com/NationalSecurityAgency/ghidra/releases/download/Ghidra_10.3_build/ghidra_10.3_PUBLIC_20230510.zip
-    unzip /tmp/ghidra.zip -d /tmp
-    mv /tmp/ghidra_10.3_PUBLIC /opt/ghidra
-    rm /tmp/ghidra.zip
-EOF
-
-FROM builder-desktop-ghidra-${INSTALL_GHIDRA} as builder-desktop-ghidra
-
-################################################################################
-
-FROM scratch as builder-desktop-ida-free-no
-FROM essentials as builder-desktop-ida-free-yes
-
-# IDA Freeware: only permissible for free and open deployments of the dojo!
-COPY desktop/ida64.desktop /usr/share/applications/
-COPY desktop/ida.opt /opt/ida/ida.opt
-RUN <<EOF
-    wget -O /tmp/idafree80_linux.run https://out7.hex-rays.com/files/idafree80_linux.run
-    chmod 755 /tmp/idafree80_linux.run
-    /tmp/idafree80_linux.run --optionfile /opt/ida/ida.opt
-    rm /tmp/idafree80_linux.run /tmp/installbuilder_installer.log
-EOF
-
-FROM builder-desktop-ida-free-${INSTALL_IDA_FREE} as builder-desktop-ida-free
-
-################################################################################
-
-FROM scratch as builder-desktop-binja-free-no
-FROM essentials as builder-desktop-binja-free-yes
-
-COPY desktop/binary-ninja.desktop /usr/share/applications/
-RUN <<EOF
-    wget -O /tmp/BinaryNinja-free.zip https://cdn.binary.ninja/installers/BinaryNinja-free.zip
-    unzip -d /opt /tmp/BinaryNinja-free.zip
-    wget -O /opt/binaryninja/icon.png  https://binary.ninja/icons/android-chrome-192x192.png
-    rm /tmp/BinaryNinja-free.zip
-EOF
-
-FROM builder-desktop-binja-free-${INSTALL_BINJA_FREE} as builder-desktop-binja-free
-
-################################################################################
-
-FROM scratch as builder-tools-apt-no
-FROM essentials as builder-tools-apt-yes
-
-RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
-    --mount=type=cache,target=/var/lib/apt,sharing=locked \
-    apt-get update && xargs apt-get install --no-install-recommends -yqq <<EOF && \
-    apt-get clean && rm -rf /var/lib/apt/lists/*
-        apache2
-        arping
-        bash-builtins
-        bat
-        binutils
-        binutils-aarch64-linux-gnu
-        binwalk
-        bsdmainutils
-        bsdutils
-        debianutils
-        diffutils
-        ed
-        elfutils
-        emacs
-        ethtool
-        exiftool
-        expect
-        findutils
-        finger
-        firefox
-        fish
-        fortune
-        fortunes
-        gcc-aarch64-linux-gnu
-        gdb
-        gdb-multiarch
-        gedit
-        genisoimage
-        gnupg-utils
-        gprolog
-        hexedit
-        icdiff
-        iproute2
-        iptables
-        iputils-ping
-        ipython3
-        john
-        jq
-        keyutils
-        kmod
-        less
-        libapache2-mod-php
-        libc6-arm64-cross
-        libc6-dev-arm64-cross
-        ltrace
-        mysql-server
-        nano
-        neovim
-        net-tools
-        netcat-openbsd
-        nmap
-        openssh-server
-        p7zip-full
-        parallel
-        patchelf
-        pcaputils
-        pcre2-utils
-        php-cgi
-        php-mysql
-        psutils
-        python3-ipdb
-        python3-magic
-        sagemath
-        qemu-system-x86
-        qemu-user
-        qemu-utils
-        racket
-        rsync
-        screen
-        silversearcher-ag
-        socat
-        sqlite3
-        strace
-        tmux
-        valgrind
-        vim
-        wamerican
-        whiptail
-        wireshark
-        zip
-        zsh
-EOF
-
-FROM builder-tools-apt-${INSTALL_TOOLS_APT} as builder-tools-apt
-
-################################################################################
-
-FROM scratch as builder-tools-pip-no
-FROM builder as builder-tools-pip-yes
-
-RUN xargs pip install --force-reinstall <<EOF
-    angr
-    asteval
-    dojjail>=0.1.2
-    flask
-    git+https://github.com/Gallopsled/pwntools#egg=pwntools
-    git+https://github.com/secdev/scapy#egg=scapy
-    jupyter
-    psutil
-    pycryptodome
-    r2pipe
-    requests
-    selenium
-EOF
-
-RUN ln -sf /usr/bin/ipython3 /usr/bin/ipython
-
-FROM builder-tools-pip-${INSTALL_TOOLS_PIP} as builder-tools-pip
-
-################################################################################
-
-FROM ubuntu:${UBUNTU_VERSION} as challenge
-
-SHELL ["/bin/bash", "-ceov", "pipefail"]
-
-ENV LC_CTYPE=C.UTF-8
-
-COPY --link --from=essentials / /
-COPY --link --from=builder-pwn.college / /
-
-COPY --link --from=builder-kernel /opt/linux /opt/linux
-COPY --link --from=builder-tcpdump / /
-COPY --link --from=builder-capstone / /
-COPY --link --from=builder-radare2 / /
-COPY --link --from=builder-aflplusplus / /
-COPY --link --from=builder-rappel / /
-COPY --link --from=builder-rp / /
-COPY --link --from=builder-geckodriver / /
-COPY --link --from=builder-burpsuite / /
-COPY --link --from=builder-busybox / /
-COPY --link --from=builder-glow / /
-COPY --link --from=builder-virtiofsd /opt/virtiofsd /opt/virtiofsd
-COPY --link --from=builder-desktop-ida-free / /
-COPY --link --from=builder-desktop-binja-free / /
-COPY --link --from=builder-desktop-ghidra / /
-COPY --link --from=builder-desktop-angr-management / /
-COPY --link --from=builder-tools-pip / /
-COPY --link --from=builder-tools-apt / /
-COPY --link --from=builder-gdb / /
-
-RUN <<EOF
-    if [ -f /etc/ssh/ssh_config ]
-    then
-        echo "StrictHostKeyChecking no" >> /etc/ssh/ssh_config
-        echo "UserKnownHostsFile=/dev/null" >> /etc/ssh/ssh_config
-        echo "LogLevel ERROR" >> /etc/ssh/ssh_config
-    fi
-
-    if [ -f /etc/ssh/sshd_config ]
-    then
-        sed -i 's/#PasswordAuthentication yes/PasswordAuthentication yes/g' /etc/ssh/sshd_config
-        sed -i 's/#PermitEmptyPasswords no/PermitEmptyPasswords yes/g' /etc/ssh/sshd_config
-        sed -i 's/#PermitRootLogin prohibit-password/PermitRootLogin yes/g' /etc/ssh/sshd_config
-    fi
-
-    if id ubuntu; then userdel -f -r ubuntu; fi
-    useradd -s /bin/bash -m hacker
+RUN userdel -f -r ubuntu && \
+    useradd -m hacker -s /bin/bash && \
     passwd -d hacker
 
-    echo -e '\n[ "$UID" -eq 1000 ] && . /opt/pwn.college/bash.bashrc' >> /etc/bash.bashrc
-    ln -s /etc/bash.bashrc /etc/bashrc
-
-    find / -xdev -type f -perm -4000 -exec chmod u-s {} \;
-
-    chmod u+s /opt/pwn.college/vm/vm
-
-    date > /opt/pwn.college/build
-EOF
-
 USER hacker
 WORKDIR /home/hacker