diff --git a/Dockerfile b/Dockerfile
index 08932ce..aa164b9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,9 @@
 FROM fedora
 
-USER 1001
-
-CMD mkdir -p /config /var/www/olivetin/
-
-CMD dnf install -y iputils && dnf clean all && rm -rf /var/cache/yum # install ping
+RUN mkdir -p /config /var/www/olivetin/ && \
+    dnf install -y iputils && \
+    dnf clean all && \
+    rm -rf /var/cache/yum # install ping
 
 EXPOSE 1337/tcp 
 
@@ -13,4 +12,6 @@ VOLUME /config
 COPY OliveTin /usr/bin/OliveTin
 COPY webui /var/www/olivetin/
 
+USER 1001
+
 ENTRYPOINT [ "/usr/bin/OliveTin" ]