diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 64e7290..438ff42 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -8,15 +8,15 @@ on:
 
 env:
   REGISTRY: ghcr.io
-  SERVER_IMAGE_NAME: "f42-server"
-  SERVER_IMAGE_DIR: "f42-server"
+  SERVER_IMAGE_NAME: "supermicro-x10drh"
+  SERVER_IMAGE_DIR: "supermicro-x10drh"
   IMAGE_REGISTRY: ghcr.io/${{ github.repository_owner }}
   REGISTRY_USER: ${{ github.actor }}
   REGISTRY_PASSWORD: ${{ github.token }}
 
 
 jobs:
-  f42-server:
+  supermicro-x10drh:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repo
diff --git a/lenovo-16arh7h/Containerfile b/lenovo-16arh7h/Containerfile
new file mode 100644
index 0000000..2755b5d
--- /dev/null
+++ b/lenovo-16arh7h/Containerfile
@@ -0,0 +1,35 @@
+FROM quay.io/fedora/fedora-silverblue:42
+
+# TODO: Remove the following line once this bug is fixed: https://github.com/coreos/rpm-ostree/issues/4201
+#RUN test -f /usr/bin/ld || ln -s /usr/bin/ld.bfd /usr/bin/ld
+
+# TODO: Remove the following line once this bug is fixed: https://github.com/coreos/rpm-ostree/issues/4201
+#RUN test -h /usr/bin/ld && rm -v /usr/bin/ld
+
+RUN dnf5 install -y https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm \
+      https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm && \
+    dnf install -y \
+      akmods \
+      ansible \
+      distrobox \
+      fuse-sshfs \
+      htop \
+      iftop \
+      iotop \
+      vim && \
+    dnf5 install -y akmod-nvidia nvtop && \
+    dnf5 clean all
+
+RUN /usr/sbin/akmods --force --kernels "$(rpm -qa kernel --queryformat '%{VERSION}-%{RELEASE}.%{ARCH}')"
+
+
+# Cleanup image for linting
+RUN test -f /usr/lib/sysusers.d/libvirt.conf || echo -e 'g libvirt 963' > /usr/lib/sysusers.d/libvirt.conf && \
+    test -f /usr/lib/sysusers.d/qat.conf || echo -e 'g qat 995' > /usr/lib/sysusers.d/qat.conf
+
+# Cleanup image for linting
+RUN rm -rf /var && mkdir /var && \
+    rm -rf /boot && mkdir /boot
+
+# Verify image is good
+RUN bootc container lint --fatal-warnings --skip baseimage-composefs
diff --git a/f42-server/Containerfile b/supermicro-x10drh/Containerfile
similarity index 100%
rename from f42-server/Containerfile
rename to supermicro-x10drh/Containerfile
diff --git a/f42-server/smallstep.repo b/supermicro-x10drh/smallstep.repo
similarity index 100%
rename from f42-server/smallstep.repo
rename to supermicro-x10drh/smallstep.repo
diff --git a/f42-server/zrepl.asc b/supermicro-x10drh/zrepl.asc
similarity index 100%
rename from f42-server/zrepl.asc
rename to supermicro-x10drh/zrepl.asc
diff --git a/f42-server/zrepl.repo b/supermicro-x10drh/zrepl.repo
similarity index 100%
rename from f42-server/zrepl.repo
rename to supermicro-x10drh/zrepl.repo