diff --git a/Dockerfile.baseline b/Dockerfile.baseline
index 1fbb492..b3f666d 100644
--- a/Dockerfile.baseline
+++ b/Dockerfile.baseline
@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM fedora
 
 COPY jdk /jdk
 
diff --git a/Dockerfile.checkpoint b/Dockerfile.checkpoint
index ad5df68..f83d941 100644
--- a/Dockerfile.checkpoint
+++ b/Dockerfile.checkpoint
@@ -1,9 +1,8 @@
-FROM ubuntu:18.04 as builder
+FROM fedora as builder
 
-RUN apt update && \
-	DEBIAN_FRONTEND=noninteractive apt -y --no-install-recommends install liblz4-tool && \
-	apt clean && \
-	rm -rf /var/lib/apt /var/cache/apt
+RUN dnf -y update && \
+	dnf -y install lz4 && \
+	dnf clean all
 
 COPY jdk /jdk
 
@@ -13,12 +12,11 @@ RUN LIBJVM=/jdk/lib/server/libjvm.so; \
 	       ln -s /tmp/sub/$LIBJVM $LIBJVM
 
 
-FROM ubuntu:18.04
+FROM fedora
 
-RUN apt update && \
-	DEBIAN_FRONTEND=noninteractive apt -y --no-install-recommends install liblz4-tool && \
-	apt clean && \
-	rm -rf /var/lib/apt /var/cache/apt
+RUN dnf -y update && \
+	dnf -y install lz4 && \
+	dnf clean all
 
 COPY --from=builder /jdk /jdk
 COPY prepare-jdk.cmd.sh /
diff --git a/Dockerfile.restore b/Dockerfile.restore
index 16ec02a..63995e6 100644
--- a/Dockerfile.restore
+++ b/Dockerfile.restore
@@ -1,9 +1,8 @@
-FROM ubuntu:18.04 as builder
+FROM fedora as builder
 
-RUN apt update && \
-	DEBIAN_FRONTEND=noninteractive apt -y --no-install-recommends install liblz4-tool && \
-	apt clean && \
-	rm -rf /var/lib/apt /var/cache/apt
+RUN dnf -y update && \
+	dnf -y install lz4 && \
+	dnf clean all
 
 COPY cr /cr
 RUN tar -c /cr | lz4 -z -9 - /cr.tar.lz4