diff --git a/f38-server/Containerfile b/f38-server/Containerfile
index 9d51ea4..a70c6cb 100644
--- a/f38-server/Containerfile
+++ b/f38-server/Containerfile
@@ -1,7 +1,21 @@
-FROM ghcr.io/cgwalters/fedora-silverblue:38
+# ====== Stage 1: Builder image ======
+FROM fedora:latest AS builder
+
+RUN dnf update -y && dnf install -y git golang
+
+RUN git clone https://github.com/rfjakob/gocryptfs.git
+
+WORKDIR /gocryptfs
+
+RUN ./build-without-openssl.bash
+
+# ====== Stage 2: Server image ======
+FROM quay.io/fedora/fedora-silverblue:39
+
+COPY --from=builder /gocryptfs/gocryptfs /usr/bin/gocryptfs
 
 # Install ZFS repository
-RUN rpm-ostree install https://zfsonlinux.org/fedora/zfs-release-2-3$(rpm --eval "%{dist}").noarch.rpm && \
+RUN rpm-ostree install https://github.com/zfsonlinux/zfsonlinux.github.com/raw/master/fedora/zfs-release-2-4$(rpm --eval "%{dist}").noarch.rpm && \
     # cleanup and verification stage
     rm -vrf /var /*.rpm && \
     ostree container commit