diff --git a/Dockerfile b/Dockerfile
index 9b27651..6f3c987 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,7 @@
 ARG HIBISCUS_VERSION=2.10.17 \
     HIBISCUS_DOWNLOAD_PATH=/opt/hibiscus-server.zip \
-    HIBISCUS_SERVER_PATH=/opt
+    HIBISCUS_INSTALL_PATH=/opt \
+    HIBISCUS_SERVER_PATH=/opt/hibiscus-server
 
 FROM ubuntu
 ARG HIBISCUS_VERSION \
@@ -12,7 +13,7 @@ RUN apt update \
     && apt install -qqy --no-install-recommends unzip
 
 ADD https://www.willuhn.de/products/hibiscus-server/releases/hibiscus-server-${HIBISCUS_VERSION}.zip $HIBISCUS_DOWNLOAD_PATH
-RUN unzip $HIBISCUS_DOWNLOAD_PATH -d $HIBISCUS_SERVER_PATH \
+RUN unzip $HIBISCUS_DOWNLOAD_PATH -d $HIBISCUS_INSTALL_PATH \
     && rm ${HIBISCUS_DOWNLOAD_PATH}
 
 FROM eclipse-temurin:11 as hibiscus-server
@@ -20,7 +21,6 @@ ARG HIBISCUS_VERSION \
     HIBISCUS_SERVER_PATH
 ENV HIBISCUS_PASSWORD=password
 
-#RUN mkdir -p $HIBISCUS_SERVER_PATH
 COPY --chmod=775 --from=0 $HIBISCUS_SERVER_PATH $HIBISCUS_SERVER_PATH
 WORKDIR $HIBISCUS_SERVER_PATH