diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 7aae3cc..6344e4a 100644
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -22,13 +22,10 @@ function initialise_devpi {
     devpi-server --status
 }
 
+defaults
 
 if [ "$1" = 'devpi' ]; then
-    [[ -f $DEVPI_SERVERDIR/.serverversion ]] || initialize=yes
-
-    defaults
-
-    if [[ $initialize = yes ]]; then
+    if [ ! -f  $DEVPI_SERVERDIR/.serverversion ]; then
         initialise_devpi
     fi