diff --git a/quartus/README.md b/quartus/README.md
index 01f1b84..bdf431f 100644
--- a/quartus/README.md
+++ b/quartus/README.md
@@ -11,11 +11,11 @@ Quartus is a part of [Intel Quartus Prime Lite](https://www.intel.de/content/www
 ## Tags
 | Tag | Quartus Version | Device Support | Note |
 |---|---|---|---|
-| `18.1-cycloneiv` | 18.1.0 | Cyclone IV | Quartus GUI non functional with WSLg (only window borders), use [`VcXsrv`](https://github.com/marchaesen/vcxsrv). |
-| `22.1-cycloneiv` | 22.1.2 | Cyclone IV | - |
-| `23.1-cycloneiv` | 23.1.1 | Cyclone IV | - |
-| `24.1-cycloneiv` | 24.1.0 | Cyclone IV | Very slow. ~2x slowdown compared to older versions. Regardless if GUI or scripts are used. |
-| `25.1-cycloneiv` | 25.1.0 | Cyclone IV | - |
+| `18.1` | 18.1.0 | Cyclone IV | Quartus GUI non functional with WSLg (only window borders), use [`VcXsrv`](https://github.com/marchaesen/vcxsrv). |
+| `22.1` | 22.1.2 | Cyclone IV | - |
+| `23.1` | 23.1.1 | Cyclone IV | - |
+| `24.1` | 24.1.0 | Cyclone IV | Very slow. ~2x slowdown compared to older versions. Regardless if GUI or scripts are used. |
+| `25.1` | 25.1.0 | Cyclone IV | - |
 
 Feel free to open an issue to request other versions or additional device support.
 
@@ -24,7 +24,7 @@ Feel free to open an issue to request other versions or additional device suppor
 
 The image has `quartus_sh` set as `ENTRYPOINT`. Simply running a container without arguments will invoke `quartus_sh` with the default `CMD` argument `-version` and print the Quartus version:
 ```
-$ docker run ghcr.io/nikleberg/quartus:24.1-cycloneiv
+$ docker run ghcr.io/nikleberg/quartus:24.1
 > Quartus Prime Shell
   Version 24.1std.0 Build 1077 03/04/2025 SC Lite Edition
   Copyright (C) 2025  Altera Corporation. All rights reserved.
@@ -32,7 +32,7 @@ $ docker run ghcr.io/nikleberg/quartus:24.1-cycloneiv
 
 For an actual usage you want to override the `CMD` by giving additional arguments to the `docker run` command. For example to run a tcl script you could run:
 ```
-$ docker run ghcr.io/nikleberg/quartus:24.1-cycloneiv -t <script>.tcl
+$ docker run ghcr.io/nikleberg/quartus:24.1 -t <script>.tcl
 > Info: *******************************************************************
   Info: Running Quartus Prime Shell
       Info: Version 24.1std.0 Build 1077 03/04/2025 SC Lite Edition
@@ -52,51 +52,46 @@ Quartus knows many CLI programs, `quartus_sh` is just the common entrypoint to r
 
 To use them you can simply set `--entrypoint quartus_<xxx>` to the desired program when starting the container with `docker run`.
 
+### Device Support
+To keep the base image lean, it does not ship with any deviceinfo files. To allow quartus to actually build a bitfile for your device you must use one (or multiple) of the provided _data-only_ device docker images. The device images are a bit special to handle but allow for a minimal setup while keeping everything well separeted.
+
+First, just _create_ a named container from the data-only image by running:
+```
+$ docker create --name quartus-devinfo -v <path to devinfo files> ghcr.io/nikleberg/quartus:<quartus version>-<device type>
+```
+
+For _quartus version_ choose one of the table above. For _path to devinfo files_ and _device type_ see the following table. Note that you can also just use one of the given _volume paths_ if there are multiple listed. E.g. if you only use Cyclone IV E (and not GX) products, you can omit the _cycloneivgx_ path.
+
+| Tag | Device Support | Volume Path(s) |
+|---|---|---|
+| `<quartus version>-cycloneiv` | Cyclone IV (E / GX) | `-v /opt/quartus_lite/quartus/common/devinfo/cycloneive` and `-v /opt/quartus_lite/quartus/common/devinfo/cycloneivgx` |
+| `<quartus version>-cyclonev` | Cyclone V (E / GX / GT / SX / SE / ST) | `-v /opt/quartus_lite/quartus/common/devinfo/cyclonev` |
+
+Now, you can start an actual quartus image and include the data from the listed volume paths of the other named container with:
+```
+$ docker run --volumes-from quartus-devinfo ghcr.io/nikleberg/quartus:24.1
+```
+
+To support multiple devices at the same time you may use multiple `--volumes-from` like so:
+```
+$ docker create --name devinfo-cycloneive -v /opt/quartus_lite/quartus/common/devinfo/cycloneive ghcr.io/nikleberg/quartus:24.1-cycloneiv
+$ docker create --name devinfo-cyclonev -v /opt/quartus_lite/quartus/common/devinfo/cyclonev ghcr.io/nikleberg/quartus:24.1-cyclonev
+$ docker run --volumes-from devinfo-cycloneive --volumes-from devinfo-cyclonev ghcr.io/nikleberg/quartus:24.1
+```
+
+### Software Add-Ons
+To use a image with a pre-installed version of optional software, see following table for available options:
+
+| Tag | Add-On | Note |
+|---|---|---|
+| `<quartus version>-riscfree` | Ashling RiscFree IDE for FPGAs | Currently only packaged for Quartus versions `23.1` through `25.1`. |
+
+Feel free to open an issue to request other add-ons or additional versions.
+
 ### Additional `docker run` Arguments
 For improved functionality and ease-of-use you may want to add some of these arguments to the `docker run` command stated above:
- - `--hostname quartus`: Make the shells in the container display a human readable machine name.
- - `--interactive --tty`: This makes the started container interactive and not run in the background.
- - `--rm`: Removes the container after the command is finished, your disk will thank you.
- - `--workdir $(pwd)`: Sets the working directory inside the container to the current shell path.
- - `--volumes-from $(cat /proc/self/cgroup | head -n 1 | cut -d '/' -f3)`: If the container is started in the DooD environment provided by [`dev-base`](../dev-base/README.md) in Devcontainers, then this forwards the required volumes from the base container to the _quartus_ tool container. This is required to access any path in `/workspaces`. 
+ - Anything mentioned in [`dev-base`](../dev-base/README.md)
  - `--volume=/dev:/dev --privileged`: Allows USB/JTAG access to FPGAs for programming.
- - `--env=DISPLAY=:0 --volume=/tmp/.X11-unix/:/tmp/.X11-unix/`: Forwards your X11 configuration (this works in WSLg!). With this, starting the GUI with the command `quartus` opens the GUI on your docker host.
-
-### Alias
-To release your fingers from the pain of entering these commands and arguments all the time, use an alias function.
-
-Put the below functions in a script and `source <script>` it in whatever shell you need the `quartus_*` commands. After this, having Quartus installed locally is almost identical as having it isolated in this self-contained docker image.
-
-```bash
-function get_common_args () {
-    common_vols="--volumes-from $(cat /proc/self/cgroup | head -n 1 | cut -d '/' -f3)"
-    common_disp="--env=DISPLAY=:0 --volume=/tmp/.X11-unix/:/tmp/.X11-unix/"
-    common_misc="--workdir $(pwd) --interactive --tty --rm"
-    common_args="$common_vols $common_disp $common_misc"
-    echo $common_args
-}
-export -f get_common_args
-
-function command_not_found_handle () {
-    if [[ $1 =~ ^quartus.*$ ]]; then
-        quartus_args="--hostname quartus --entrypoint $1 $(get_common_args)"
-        shift
-        docker run $quartus_args ghcr.io/nikleberg/quartus:24.1-cycloneiv $*
-        return
-    fi
-    return 127 # not a quartus command
-}
-export -f command_not_found_handle
-function quartus_bash () {
-    quartus_args="--hostname quartus --entrypoint bash $(get_common_args)"
-    docker run $quartus_args ghcr.io/nikleberg/quartus:24.1-cycloneiv $*
-}
-export -f quartus_bash
-```
-
-Note:
- - The `command_not_found_handle` is not a classical function-like alias but a general handler that gets called by BASH (versions >= 4) to look for unknown commands. With a regex compare we test if the unknown commands starts with `quartus` and will redirect all such commands to a freshly started docker container.
- - The additional `quartus_bash` alias is for debugging. It overwrites the entrypoint in the image and lets you more easily debug problems by dropping you into a bash shell inside the container.
 
 ## License
 [MIT](../LICENSE) © [NikLeberg](https://github.com/NikLeberg).
diff --git a/quartus/addon.dockerfile b/quartus/addon.dockerfile
new file mode 100644
index 0000000..9ce55ff
--- /dev/null
+++ b/quartus/addon.dockerfile
@@ -0,0 +1,19 @@
+# Extend base quartus image with optional add-ons.
+ARG QUARTUS_VERSION=25.1
+FROM ghcr.io/nikleberg/quartus:${QUARTUS_VERSION}-staging
+
+ARG QUARTUS_ROOTDIR="/opt/quartus_lite"
+ARG ADDON_URL=https://downloads.intel.com/akdlm/software/acdsinst/25.1std/1129/ib_installers/RiscFreeSetup-25.1std.0.1129-linux.run
+ARG ADDON_SHA=2d457bd18bfbf32f8f4037266b6c04853caed8e8
+ARG ADDON_FILE=RiscFreeSetup-25.1std.0.1129-linux.run
+
+# Install Add-On package.
+RUN <<EOF
+    set -e
+    wget --progress=dot:giga $ADDON_URL -O $ADDON_FILE
+    echo "$ADDON_SHA *${ADDON_FILE}" | sha1sum --check --strict -
+    chmod +x $ADDON_FILE
+    ./$ADDON_FILE \
+        --mode unattended --accept_eula 1 --installdir $QUARTUS_ROOTDIR
+    rm -r $ADDON_FILE $QUARTUS_ROOTDIR/uninstall $QUARTUS_ROOTDIR/logs
+EOF
diff --git a/quartus/base.dockerfile b/quartus/base.dockerfile
index dfcb1c1..f44faaa 100644
--- a/quartus/base.dockerfile
+++ b/quartus/base.dockerfile
@@ -9,16 +9,18 @@
 
 ARG UBUNTU_VERSION=24.04
 ARG QUARTUS_VERSION=25.1
-ARG QUARTUS_URL=https://downloads.intel.com/akdlm/software/acdsinst/24.1std/1129/ib_installers/QuartusLiteSetup-25.1std.0.1129-linux.run
+ARG QUARTUS_URL=https://downloads.intel.com/akdlm/software/acdsinst/25.1std/1129/ib_installers/QuartusLiteSetup-25.1std.0.1129-linux.run
 ARG QUARTUS_SHA=ce0773469eacab5b7035c175484625f4ec3737d1
 ARG SHIZZOLATOR_NAME=i3q6bSoc4a0
 ARG SHIZZOLATOR_DATA=e37e9f21a65ee0df
+ARG QUARTUS_ROOTDIR="/opt/quartus_lite"
 
 FROM ubuntu:$UBUNTU_VERSION AS builder
 
 ARG QUARTUS_VERSION
 ARG QUARTUS_URL
 ARG QUARTUS_SHA
+ARG QUARTUS_ROOTDIR
 
 ARG DEBIAN_FRONTEND=noninteractive
 ENV LANG=C.UTF-8 \
@@ -39,7 +41,6 @@ EOF
 # Install Quartus (without device support files) for Intel FPGAs from:
 # https://www.intel.de/content/www/de/de/products/details/fpga/development-tools/quartus-prime/resource.html
 # This also post-processes the install dir to remove duplicates.
-ENV QUARTUS_ROOTDIR="/opt/intelFPGA_lite/$QUARTUS_VERSION"
 RUN <<EOF
     set -e
     wget --progress=dot:giga $QUARTUS_URL -O QuartusLiteSetup-linux.run
@@ -99,6 +100,7 @@ FROM ubuntu:$UBUNTU_VERSION AS base
 ARG QUARTUS_VERSION
 ARG SHIZZOLATOR_NAME
 ARG SHIZZOLATOR_DATA
+ARG QUARTUS_ROOTDIR
 
 ARG DEBIAN_FRONTEND=noninteractive
 ENV LANG=C.UTF-8 \
@@ -126,7 +128,7 @@ RUN <<EOF
 EOF
 
 # Add Quartus to path
-ENV QUARTUS_ROOTDIR="/opt/intelFPGA_lite/$QUARTUS_VERSION"
+ENV QUARTUS_ROOTDIR=$QUARTUS_ROOTDIR
 ENV PATH="$QUARTUS_ROOTDIR/quartus/bin:${PATH}"
 
 # Fixup Quartus quirks in version 18.1 that prevent loading the executables
diff --git a/quartus/containers.json b/quartus/containers.json
index e3778cd..c8d46ae 100644
--- a/quartus/containers.json
+++ b/quartus/containers.json
@@ -11,10 +11,10 @@
             "SHIZZOLATOR_NAME=iV72V2fdjta",
             "SHIZZOLATOR_DATA=1c35b4094c56f765"
         ],
-        "intermediate": true,
         "maximizeBuildSpace": true,
         "testScript": "tests.sh",
         "testArtifact": "test/artifact.tar",
+        "trivySkip": true,
         "cache": false
     },
     {
@@ -28,7 +28,6 @@
             "SHIZZOLATOR_NAME=5NoREgoqh7Y",
             "SHIZZOLATOR_DATA=1c35b4094c56f765"
         ],
-        "intermediate": true,
         "maximizeBuildSpace": true,
         "testScript": "tests.sh",
         "testArtifact": "test/artifact.tar",
@@ -45,7 +44,6 @@
             "SHIZZOLATOR_NAME=hKDOGI1VsW1",
             "SHIZZOLATOR_DATA=97a0bdcdcd0d4604"
         ],
-        "intermediate": true,
         "maximizeBuildSpace": true,
         "testScript": "tests.sh",
         "testArtifact": "test/artifact.tar",
@@ -63,7 +61,6 @@
             "SHIZZOLATOR_DATA=7010d412b97a9deb"
 
         ],
-        "intermediate": true,
         "maximizeBuildSpace": true,
         "testScript": "tests.sh",
         "testArtifact": "test/artifact.tar",
@@ -80,7 +77,6 @@
             "SHIZZOLATOR_NAME=i3q6bSoc4a0",
             "SHIZZOLATOR_DATA=e37e9f21a65ee0df"
         ],
-        "intermediate": true,
         "maximizeBuildSpace": true,
         "testScript": "tests.sh",
         "testArtifact": "test/artifact.tar",
@@ -91,15 +87,14 @@
         "tags": "18.1-cycloneiv",
         "dockerfile": "device.dockerfile",
         "args": [
-            "BASE_IMAGE_TAG=18.1",
             "DEVICE_URL=https://downloads.intel.com/akdlm/software/acdsinst/18.1std/625/ib_installers/cyclone-18.1.0.625.qdz",
             "DEVICE_SHA=0063923ed4b3e12f706a5fb95ddce71fbb89d833",
             "DEVICE_FILE=cyclone-18.1.0.625.qdz"
         ],
-        "dependsOn": "quartus:18.1",
-        "maximizeBuildSpace": true,
         "testScript": "tests.sh",
         "testArtifact": "test/artifact.tar",
+        "trivySkip": true,
+        "dockleSkip": true,
         "cache": false
     },
     {
@@ -107,15 +102,14 @@
         "tags": "22.1-cycloneiv",
         "dockerfile": "device.dockerfile",
         "args": [
-            "BASE_IMAGE_TAG=22.1",
             "DEVICE_URL=https://downloads.intel.com/akdlm/software/acdsinst/22.1std.2/922/ib_installers/cyclone-22.1std.2.922.qdz",
             "DEVICE_SHA=97163542d8dd846703fc1912ea0c844bc9359a2e",
             "DEVICE_FILE=cyclone-22.1std.2.922.qdz"
         ],
-        "dependsOn": "quartus:22.1",
-        "maximizeBuildSpace": true,
         "testScript": "tests.sh",
         "testArtifact": "test/artifact.tar",
+        "trivySkip": true,
+        "dockleSkip": true,
         "cache": false
     },
     {
@@ -123,15 +117,14 @@
         "tags": "23.1-cycloneiv",
         "dockerfile": "device.dockerfile",
         "args": [
-            "BASE_IMAGE_TAG=23.1",
             "DEVICE_URL=https://downloads.intel.com/akdlm/software/acdsinst/23.1std.1/993/ib_installers/cyclone-23.1std.1.993.qdz",
             "DEVICE_SHA=4c260c32282032c477d5520a84ebd1200d01ecf0",
             "DEVICE_FILE=cyclone-23.1std.1.993.qdz"
         ],
-        "dependsOn": "quartus:23.1",
-        "maximizeBuildSpace": true,
         "testScript": "tests.sh",
         "testArtifact": "test/artifact.tar",
+        "trivySkip": true,
+        "dockleSkip": true,
         "cache": false
     },
     {
@@ -139,15 +132,14 @@
         "tags": "24.1-cycloneiv",
         "dockerfile": "device.dockerfile",
         "args": [
-            "BASE_IMAGE_TAG=24.1",
             "DEVICE_URL=https://downloads.intel.com/akdlm/software/acdsinst/24.1std/1077/ib_installers/cyclone-24.1std.0.1077.qdz",
             "DEVICE_SHA=176c1f54c7da0623555a02864d3eb144fe6c00d3",
             "DEVICE_FILE=cyclone-24.1std.0.1077.qdz"
         ],
-        "dependsOn": "quartus:24.1",
-        "maximizeBuildSpace": true,
         "testScript": "tests.sh",
         "testArtifact": "test/artifact.tar",
+        "trivySkip": true,
+        "dockleSkip": true,
         "cache": false
     },
     {
@@ -155,15 +147,104 @@
         "tags": "25.1-cycloneiv",
         "dockerfile": "device.dockerfile",
         "args": [
-            "BASE_IMAGE_TAG=25.1",
             "DEVICE_URL=https://downloads.intel.com/akdlm/software/acdsinst/25.1std/1129/ib_installers/cyclone-25.1std.0.1129.qdz",
             "DEVICE_SHA=835d2b1732549294eed625b692d044135499b5e8",
             "DEVICE_FILE=cyclone-25.1std.0.1129.qdz"
         ],
-        "dependsOn": "quartus:25.1",
-        "maximizeBuildSpace": true,
         "testScript": "tests.sh",
         "testArtifact": "test/artifact.tar",
+        "trivySkip": true,
+        "dockleSkip": true,
+        "cache": false
+    },
+    {
+        "name": "quartus",
+        "tags": "23.1-cyclonev",
+        "dockerfile": "device.dockerfile",
+        "args": [
+            "DEVICE_URL=https://downloads.intel.com/akdlm/software/acdsinst/23.1std.1/993/ib_installers/cyclonev-23.1std.1.993.qdz",
+            "DEVICE_SHA=4d849516eac750c95eaa5848d22573d60e5cca26",
+            "DEVICE_FILE=cyclonev-23.1std.1.993.qdz"
+        ],
+        "testScript": "tests.sh",
+        "testArtifact": "test/artifact.tar",
+        "trivySkip": true,
+        "dockleSkip": true,
+        "cache": false
+    },
+    {
+        "name": "quartus",
+        "tags": "24.1-cyclonev",
+        "dockerfile": "device.dockerfile",
+        "args": [
+            "DEVICE_URL=https://downloads.intel.com/akdlm/software/acdsinst/24.1std/1077/ib_installers/cyclonev-24.1std.0.1077.qdz",
+            "DEVICE_SHA=a361c6ab1aba00f6385fc8deb8b81045c3f9ad7c",
+            "DEVICE_FILE=cyclonev-24.1std.0.1077.qdz"
+        ],
+        "testScript": "tests.sh",
+        "testArtifact": "test/artifact.tar",
+        "trivySkip": true,
+        "dockleSkip": true,
+        "cache": false
+    },
+    {
+        "name": "quartus",
+        "tags": "25.1-cyclonev",
+        "dockerfile": "device.dockerfile",
+        "args": [
+            "DEVICE_URL=https://downloads.intel.com/akdlm/software/acdsinst/25.1std/1129/ib_installers/cyclonev-25.1std.0.1129.qdz",
+            "DEVICE_SHA=a7225ec1bd36ccfd6826ea6273df5d21dd95633b",
+            "DEVICE_FILE=cyclonev-25.1std.0.1129.qdz"
+        ],
+        "testScript": "tests.sh",
+        "testArtifact": "test/artifact.tar",
+        "trivySkip": true,
+        "dockleSkip": true,
+        "cache": false
+    },
+    {
+        "name": "quartus",
+        "tags": "23.1-riscfree",
+        "dockerfile": "addon.dockerfile",
+        "args": [
+            "QUARTUS_VERSION=23.1",
+            "ADDON_URL=https://downloads.intel.com/akdlm/software/acdsinst/23.1std.1/993/ib_installers/RiscFreeSetup-23.1std.1.993-linux.run",
+            "ADDON_SHA=8c8406ab25d9a8b5855c3a589413508b75515ab2",
+            "ADDON_FILE=RiscFreeSetup-23.1std.1.993-linux.run"
+        ],
+        "dependsOn": "quartus:23.1",
+        "maximizeBuildSpace": true,
+        "trivySkip": true,
+        "cache": false
+    },
+    {
+        "name": "quartus",
+        "tags": "24.1-riscfree",
+        "dockerfile": "addon.dockerfile",
+        "args": [
+            "QUARTUS_VERSION=24.1",
+            "ADDON_URL=https://downloads.intel.com/akdlm/software/acdsinst/24.1std/1077/ib_installers/RiscFreeSetup-24.1std.0.1077-linux.run",
+            "ADDON_SHA=60fb94c7d52fc4ca28166409210b32c2bd1c2ffd",
+            "ADDON_FILE=RiscFreeSetup-24.1std.0.1077-linux.run"
+        ],
+        "dependsOn": "quartus:24.1",
+        "maximizeBuildSpace": true,
+        "trivySkip": true,
+        "cache": false
+    },
+    {
+        "name": "quartus",
+        "tags": "25.1-riscfree",
+        "dockerfile": "addon.dockerfile",
+        "args": [
+            "QUARTUS_VERSION=25.1",
+            "ADDON_URL=https://downloads.intel.com/akdlm/software/acdsinst/25.1std/1129/ib_installers/RiscFreeSetup-25.1std.0.1129-linux.run",
+            "ADDON_SHA=2d457bd18bfbf32f8f4037266b6c04853caed8e8",
+            "ADDON_FILE=RiscFreeSetup-25.1std.0.1129-linux.run"
+        ],
+        "dependsOn": "quartus:25.1",
+        "maximizeBuildSpace": true,
+        "trivySkip": true,
         "cache": false
     }
 ]
\ No newline at end of file
diff --git a/quartus/device.dockerfile b/quartus/device.dockerfile
index a4cf3d1..96a8512 100644
--- a/quartus/device.dockerfile
+++ b/quartus/device.dockerfile
@@ -1,21 +1,42 @@
-ARG BASE_IMAGE_TAG=25.1
-FROM ghcr.io/nikleberg/quartus:${BASE_IMAGE_TAG}-staging
+ARG QUARTUS_ROOTDIR="/opt/quartus_lite"
+
+FROM ubuntu:24.04 AS installer
+
+ARG DEBIAN_FRONTEND=noninteractive
 
 ARG DEVICE_URL=https://downloads.intel.com/akdlm/software/acdsinst/25.1std/1129/ib_installers/cyclone-25.1std.0.1129.qdz
 ARG DEVICE_SHA=835d2b1732549294eed625b692d044135499b5e8
 ARG DEVICE_FILE=cyclone-25.1std.0.1129.qdz
 
-ARG DEBIAN_FRONTEND=noninteractive
+# Install required tools.
+RUN <<EOF
+    set -e
+    apt-get -q -y update
+    apt-get -q -y install --no-install-recommends \
+        ca-certificates wget unzip rdfind
+    apt-get clean
+    rm -rf /var/lib/apt/lists/*
+EOF
 
 # Install Quartus device support files for Intel FPGAs from:
 # https://www.intel.de/content/www/de/de/products/details/fpga/development-tools/quartus-prime/resource.html
 # The .qdz file is just a glorified zip archive. The device installer from:
 # $QUARTUS_ROOTDIR/quartus/common/devinfo/dev_install/dev_install.run is somehow
 # not able to correctly install the support files. So we do it manually.
+ARG QUARTUS_ROOTDIR
 RUN <<EOF
     set -e
     wget --progress=dot:giga $DEVICE_URL -O $DEVICE_FILE
     echo "$DEVICE_SHA *${DEVICE_FILE}" | sha1sum --check --strict -
-    $QUARTUS_ROOTDIR/quartus/linux64/unzip -q -d $QUARTUS_ROOTDIR $DEVICE_FILE
+    unzip -q -d $QUARTUS_ROOTDIR $DEVICE_FILE
     rm -r $DEVICE_FILE
+    rdfind -makehardlinks true $QUARTUS_ROOTDIR
 EOF
+
+
+# Package device files into data-only image.
+# Installed files live in $QUARTUS_ROOTDIR/quartus/common/devinfo/$DEVICE.
+FROM scratch
+ARG QUARTUS_ROOTDIR
+COPY --from=installer $QUARTUS_ROOTDIR $QUARTUS_ROOTDIR
+CMD ["invalid"]
diff --git a/quartus/test/expected23.1-cyclonev.png b/quartus/test/expected23.1-cyclonev.png
new file mode 100644
index 0000000..d75f3bd
Binary files /dev/null and b/quartus/test/expected23.1-cyclonev.png differ
diff --git a/quartus/test/expected24.1-cyclonev.png b/quartus/test/expected24.1-cyclonev.png
new file mode 100644
index 0000000..c1c25e1
Binary files /dev/null and b/quartus/test/expected24.1-cyclonev.png differ
diff --git a/quartus/test/expected25.1-cyclonev.png b/quartus/test/expected25.1-cyclonev.png
new file mode 100644
index 0000000..d2af843
Binary files /dev/null and b/quartus/test/expected25.1-cyclonev.png differ
diff --git a/quartus/tests.sh b/quartus/tests.sh
index 6fdbeda..d82c871 100755
--- a/quartus/tests.sh
+++ b/quartus/tests.sh
@@ -19,21 +19,75 @@ testQuartusBase () {
     fi
 }
 
+# Setup device info from data-only docker image.
+setupDevinfoCycloneIV () {
+    if docker ps -a --format '{{.Names}}' | grep -q '^quartus-devinfo$'; then
+        docker rm quartus-devinfo
+    fi
+    docker create --name quartus-devinfo \
+        -v /opt/quartus_lite/quartus/common/devinfo/cycloneive \
+        -v /opt/quartus_lite/quartus/common/devinfo/cycloneivgx \
+        ghcr.io/nikleberg/quartus:$1-staging
+}
+
 # Build a test design for the Cyclone IV device family.
-testQuartusCyclone () {
-    docker build -f - . <<EOF
-FROM ghcr.io/nikleberg/quartus:$1-staging
-ADD test/design.tar.bz2 /tmp/test_design
-RUN cd /tmp/test_design/geni/quartus \
-    && quartus_sh -t ../scripts/quartus_project.tcl \
-    && quartus_sh -t ../scripts/quartus_compile.tcl
-EOF
+testQuartusCycloneIV () {
+    local version="${1%%-*}" # "25.1" part of "25.1-cycloneiv"
+    docker run --rm \
+        --volumes-from quartus-devinfo \
+        -v "./test/design.tar.bz2:/tmp/design.tar.bz2:ro" \
+        --entrypoint bash \
+        ghcr.io/nikleberg/quartus:${version}-staging -c "\
+            set -e; \
+            export DEBIAN_FRONTEND=noninteractive; \
+            apt-get -q -y update; \
+            apt-get -q -y install --no-install-recommends bzip2; \
+            cd /tmp; \
+            tar -xjf design.tar.bz2; \
+            ls -la; \
+            cd geni/quartus; \
+            quartus_sh -t ../scripts/quartus_project.tcl; \
+            quartus_sh -t ../scripts/quartus_compile.tcl"
+}
+
+# Setup device info from data-only docker image.
+setupDevinfoCycloneV () {
+    if docker ps -a --format '{{.Names}}' | grep -q '^quartus-devinfo$'; then
+        docker rm quartus-devinfo
+    fi
+    docker create --name quartus-devinfo \
+        -v /opt/quartus_lite/quartus/common/devinfo/cyclonev \
+        ghcr.io/nikleberg/quartus:$1-staging
+}
+
+# Build a test design for the Cyclone V device family.
+# TODO: synthesize an actual design.
+testQuartusCycloneV () {
+    local version="${1%%-*}" # "25.1" part of "25.1-cyclonev"
+    docker run --rm \
+        --volumes-from quartus-devinfo \
+        --entrypoint bash \
+        ghcr.io/nikleberg/quartus:${version}-staging -c "\
+            set -e; \
+            if [ ! -d '/opt/quartus_lite/quartus/common/devinfo/cyclonev' ]; then \
+                echo 'Error: Devinfo of Cyclone V not found!' >&2; \
+                exit 1; \
+            fi"
 }
 
 # Run the quartus GUI and verify that it started.
 testQuartusGUI () {
-    docker run --rm -v "$(pwd)/test:/test" -w /test \
-        --entrypoint bash ghcr.io/nikleberg/quartus:$1-staging -c "\
+    local version="${1%%-*}"
+    # optionally mount device info files
+    local devinfo_volumes=""
+    if docker inspect quartus-devinfo >/dev/null 2>&1; then
+        devinfo_volumes="--volumes-from quartus-devinfo"
+    fi
+    docker run --rm \
+        $devinfo_volumes \
+        -v "$(pwd)/test:/test" -w /test \
+        --entrypoint bash \
+        ghcr.io/nikleberg/quartus:${version}-staging -c "\
             set -e; \
             export DEBIAN_FRONTEND=noninteractive; \
             apt-get -q -y update; \
@@ -67,8 +121,13 @@ case $1 in
         testQuartusBase "25.1" "25.1std.0 Build 1129 10/21/2025 SC"
         testQuartusGUI  "25.1";;
     18.1-cycloneiv | 22.1-cycloneiv | 23.1-cycloneiv | 24.1-cycloneiv | 25.1-cycloneiv)
-        testQuartusCyclone $1
-        testQuartusGUI     $1;;
+        setupDevinfoCycloneIV $1
+        testQuartusCycloneIV  $1
+        testQuartusGUI        $1;;
+    18.1-cyclonev | 22.1-cyclonev | 23.1-cyclonev | 24.1-cyclonev | 25.1-cyclonev)
+        setupDevinfoCycloneV $1
+        testQuartusCycloneV  $1
+        testQuartusGUI       $1;;
     *)
         echo "Unknown image tag to test against. Aborting."
         exit 1;;