diff --git a/tests/containers/Containerfile.alpine b/tests/containers/Containerfile.alpine
index d00149a..784f3c3 100644
--- a/tests/containers/Containerfile.alpine
+++ b/tests/containers/Containerfile.alpine
@@ -1,14 +1,23 @@
 FROM alpine:latest
 MAINTAINER Juno Takano juno@jutty.dev
-USER root
+ENV DEBUG=debug
+ENV TAG=${TAG:-latest}
 
 # Setup tooling
-RUN apk add curl clang
+RUN apk add curl clang git file
 RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
 
 # Install
-RUN echo "root_node = 'test'" > /root/graph.toml
-RUN $HOME/.cargo/bin/cargo install --git https://codeberg.org/jutty/en
+RUN git clone -b "$TAG" --single-branch https://codeberg.org/jutty/en /build
+RUN <<EOF
+    cd /build && /root/.cargo/bin/cargo build --locked --release
+    mv /build/target/release/en /usr/local/bin/en
+    rm -rf /build
+EOF
+
+# Describe
+RUN file $(which en) && sha256sum $(which en)
 
 # Launch
-CMD ["/root/.cargo/bin/en", "-p", "3008", "-g", "/root/graph.toml"]
+WORKDIR /root
+CMD ["en", "-p", "80"]
diff --git a/tests/containers/Containerfile.debian b/tests/containers/Containerfile.debian
index 0622617..41753c4 100644
--- a/tests/containers/Containerfile.debian
+++ b/tests/containers/Containerfile.debian
@@ -1,15 +1,24 @@
 FROM debian:stable-slim
 MAINTAINER Juno Takano juno@jutty.dev
-USER root
+ENV DEBUG=debug
+ENV TAG=${TAG:-latest}
 
 # Setup tooling
 RUN apt-get -y --update install --no-install-recommends \
-    curl ca-certificates gcc libc6-dev
+    curl ca-certificates gcc libc6-dev git file
 RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
 
 # Install
-RUN echo "root_node = 'test'" > /root/graph.toml
-RUN $HOME/.cargo/bin/cargo install --git https://codeberg.org/jutty/en
+RUN git clone -b "$TAG" --single-branch https://codeberg.org/jutty/en /build
+RUN <<EOF
+    cd /build && /root/.cargo/bin/cargo build --locked --release
+    mv /build/target/release/en /usr/local/bin/en
+    rm -rf /build
+EOF
+
+# Describe
+RUN file $(which en) && sha256sum $(which en)
 
 # Launch
-CMD ["/root/.cargo/bin/en", "-p", "3008", "-g", "/root/graph.toml"]
+WORKDIR /root
+CMD ["en", "-p", "80"]
diff --git a/tests/containers/README.md b/tests/containers/README.md
new file mode 100644
index 0000000..2cd5d74
--- /dev/null
+++ b/tests/containers/README.md
@@ -0,0 +1,2 @@
+## Known issues
+- Containers will halt and fail to respond to requests with `ERR_CONNECTION_RESET` if the working directory is `/`
diff --git a/tests/containers/build.sh b/tests/containers/build.sh
index a59edfb..df4aa02 100755
--- a/tests/containers/build.sh
+++ b/tests/containers/build.sh
@@ -1,7 +1,9 @@
 #!/usr/bin/env sh
 
 set -eu
-
 distro="$1"
 
-podman build --tag "en-$distro" -f "Containerfile.$distro"
+podman stop --time 3 "en-$distro"
+podman build \
+    --tag "en-$distro" \
+    -f "Containerfile.$distro"
diff --git a/tests/containers/run.sh b/tests/containers/run.sh
index ff636a1..5a3efd5 100755
--- a/tests/containers/run.sh
+++ b/tests/containers/run.sh
@@ -1,7 +1,10 @@
 #!/usr/bin/env sh
 
 set -eu
-
 distro="$1"
 
-podman run --replace --name "en-$distro" --publish 3008:3008 "en-$distro"
+podman run \
+    --replace \
+    --name "en-$distro" \
+    --publish 3008:80 \
+    "en-$distro"