diff --git a/Dockerfile b/Dockerfile
index 1f5389c..aa73d8a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,8 +7,17 @@ ENV POLLFREQ 5
 ENV DESC UPS
 ENV USERSSTRING #
 
+#Installing default packages
 RUN apt-get update 
-RUN apt-get -y install nut-server
+RUN apt-get install -y  \
+nut-server
+
+#Apply configuration
+RUN sed -i 's/MODE=none/MODE=netserver/g' /etc/nut/nut.conf \
+&& echo "LISTEN 0.0.0.0 3493" >> /etc/nut/upsd.conf \
+&& echo -e "[$NAME] \n  driver = $DRIVER \n  port = $PORT \n  pollfreq = $POLLFREQ \n  desc = $DESC" >> /etc/nut/ups.conf \
+&& echo -e "$USERSSTRING" >> /etc/nut/upsd.users \
+&& chgrp nut /etc/nut/*
 
 COPY entrypoint.sh /
 ENTRYPOINT ["/entrypoint.sh"]
diff --git a/entrypoint.sh b/entrypoint.sh
index 9c3f65e..c6520c9 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -1,13 +1,5 @@
 #!/bin/bash
 
-sed -i 's/MODE=none/MODE=netserver/g' /etc/nut/nut.conf
-echo "LISTEN 0.0.0.0 3493" >> /etc/nut/upsd.conf
-echo -e "[$NAME] \n  driver = $DRIVER \n  port = $PORT \n  pollfreq = $POLLFREQ \n  desc = $DESC" >> /etc/nut/ups.conf
-echo -e "$USERSSTRING" >> /etc/nut/upsd.users
-
-chgrp nut /etc/nut/*
 chgrp nut /dev/bus/usb/*/*
-
 upsdrvctl start
-
 exec upsd -D
\ No newline at end of file