diff --git a/.gitmodules b/.gitmodules
index b76dad5..a458dd9 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "themes/cloud.autonomic.zone/assets/scss/bulma"]
 	path = themes/cloud.autonomic.zone/assets/scss/bulma
-	url = git@github.com:jgthms/bulma.git
+	url = https://github.com/jgthms/bulma.git
diff --git a/Dockerfile b/Dockerfile
index 430bcc3..fe5799d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,13 @@
-FROM klakegg/hugo:latest-ext
+FROM klakegg/hugo:ext-debian
 
-EXPOSE 1313
+RUN apt update && apt install -y curl git python3
+
+EXPOSE 8000
 
 COPY . /src/
 
-CMD ["server", "--bind", "0.0.0.0", "--environment", "production", "--disableLiveReload", "--baseURL", "https://cloud.autonomic.zone"]
+RUN git submodule update --init --recursive
+
+ENTRYPOINT ["/bin/bash"]
+
+CMD ["-c", "hugo && python3 -m http.server --bind 0.0.0.0 --directory public 8000"]
diff --git a/compose.yml b/compose.yml
index f1c2379..7f7e3f8 100644
--- a/compose.yml
+++ b/compose.yml
@@ -6,6 +6,12 @@ services:
     image: "decentral1se/cloud.autonomic.zone:latest"
     networks:
       - proxy
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:8000"]
+      interval: 10s
+      timeout: 10s
+      retries: 10
+      start_period: 15s
     deploy:
       update_config:
         failure_action: rollback
@@ -14,7 +20,7 @@ services:
         - "traefik.enable=true"
         - "traefik.http.routers.cloud-autonomic-zone.rule=Host(`${DOMAIN}`)"
         - "traefik.http.routers.cloud-autonomic-zone.entrypoints=web-secure"
-        - "traefik.http.services.cloud-autonomic-zone.loadbalancer.server.port=1313"
+        - "traefik.http.services.cloud-autonomic-zone.loadbalancer.server.port=8000"
         - "traefik.http.routers.cloud-autonomic-zone.tls.certresolver=${LETS_ENCRYPT_ENV}"
 
 networks: