diff --git a/Dockerfile b/Dockerfile
index bb13114..43e668f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,9 @@
-FROM --platform=linux/amd64 registry.fedoraproject.org/fedora-minimal:36-x86_64
+FROM --platform=linux/amd64 registry.fedoraproject.org/fedora-minimal:38-x86_64
 
 LABEL org.opencontainers.image.source https://github.com/OliveTin/OliveTin
 LABEL org.opencontainers.image.title=OliveTin
 
-RUN mkdir -p /config /var/www/olivetin \
+RUN mkdir -p /config /config/entities/ /var/www/olivetin \
     && microdnf install -y --nodocs --noplugins --setopt=keepcache=0 --setopt=install_weak_deps=0 \
 		iputils \
 		openssh-clients \
@@ -15,6 +15,8 @@ RUN useradd --system --create-home olivetin -u 1000
 
 EXPOSE 1337/tcp
 
+COPY config.yaml /config
+COPY var/entities/* /config/entities/
 VOLUME /config
 
 COPY OliveTin /usr/bin/OliveTin
diff --git a/Dockerfile.arm64 b/Dockerfile.arm64
index 089b221..e5c354e 100644
--- a/Dockerfile.arm64
+++ b/Dockerfile.arm64
@@ -1,9 +1,9 @@
-FROM --platform=linux/arm64 registry.fedoraproject.org/fedora-minimal:36-aarch64
+FROM --platform=linux/arm64 registry.fedoraproject.org/fedora-minimal:38-aarch64
 
 LABEL org.opencontainers.image.source https://github.com/OliveTin/OliveTin
 LABEL org.opencontainers.image.title=OliveTin
 
-RUN mkdir -p /config /var/www/olivetin \
+RUN mkdir -p /config /config/entities /var/www/olivetin \
     && \
     microdnf install -y --nodocs --noplugins --setopt=keepcache=0 --setopt=install_weak_deps=0 \
 		iputils \
@@ -14,6 +14,8 @@ RUN useradd --system --create-home olivetin -u 1000
 
 EXPOSE 1337/tcp
 
+COPY config.yaml /config
+COPY var/entities/* /config/entities/
 VOLUME /config
 
 COPY OliveTin /usr/bin/OliveTin
diff --git a/Dockerfile.armv7 b/Dockerfile.armv7
index ae004e7..537e67f 100644
--- a/Dockerfile.armv7
+++ b/Dockerfile.armv7
@@ -3,7 +3,7 @@ FROM --platform=linux/armhfp registry.fedoraproject.org/fedora-minimal:36-armhfp
 LABEL org.opencontainers.image.source https://github.com/OliveTin/OliveTin
 LABEL org.opencontainers.image.title=OliveTin
 
-RUN mkdir -p /config /var/www/olivetin \
+RUN mkdir -p /config /config/entities /var/www/olivetin \
     && \
     microdnf install -y --nodocs --noplugins --setopt=keepcache=0 --setopt=install_weak_deps=0 \
 		iputils \
@@ -14,6 +14,8 @@ RUN useradd --system --create-home olivetin -u 1000
 
 EXPOSE 1337/tcp
 
+COPY config.yaml /config
+COPY var/entities/* /config/entities/
 VOLUME /config
 
 COPY OliveTin /usr/bin/OliveTin