diff --git a/core/none/Dockerfile b/core/none/Dockerfile
index f06cc31c..d605cb07 100644
--- a/core/none/Dockerfile
+++ b/core/none/Dockerfile
@@ -10,5 +10,5 @@ RUN echo $VERSION >/version
 
 HEALTHCHECK CMD true
 
-USER app
+USER mailu
 CMD ["/bin/bash", "-c", "sleep infinity"]
diff --git a/setup/Dockerfile b/setup/Dockerfile
index 85e5f55b..7be8f1b0 100644
--- a/setup/Dockerfile
+++ b/setup/Dockerfile
@@ -1,24 +1,20 @@
-ARG DISTRO=alpine:3.14.5
-FROM $DISTRO
-ARG VERSION
-ENV TZ Etc/UTC
+# syntax=docker/dockerfile-upstream:1.4.3
+
+# setup image
+FROM base
+
+ARG VERSION=local
 LABEL version=$VERSION
 
-
-RUN mkdir -p /app
-WORKDIR /app
-
-COPY requirements.txt requirements.txt
-RUN apk add --no-cache curl python3 py3-pip \
-    && pip3 install -r requirements.txt
-
-COPY server.py ./server.py
-COPY main.py ./main.py
 COPY flavors /data/flavors
 COPY templates /data/templates
 COPY static ./static
+COPY server.py ./server.py
+COPY main.py ./main.py
+
+RUN echo $VERSION >> /version
 
 EXPOSE 80/tcp
+HEALTHCHECK --start-period=350s CMD curl -skfLo /dev/null http://localhost/
 
 CMD gunicorn -w 4 -b :80 --access-logfile - --error-logfile - --preload main:app
-RUN echo $VERSION >> /version
diff --git a/setup/requirements.txt b/setup/requirements.txt
deleted file mode 100644
index b6f9f713..00000000
--- a/setup/requirements.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-Flask==1.0.2
-Flask-Bootstrap==3.3.7.1
-gunicorn==19.9.0
-redis==3.2.1
-Jinja2==3.0.3
-MarkupSafe==2.1.0
-Werkzeug==2.0.3
-click==8.0.3
-dominate==2.6.0
-itsdangerous==2.0.1
-redis==3.2.1
-visitor==0.1.3
diff --git a/tests/build.hcl b/tests/build.hcl
index 34955270..0f6226c8 100644
--- a/tests/build.hcl
+++ b/tests/build.hcl
@@ -107,6 +107,9 @@ target "docs" {
 target "setup" {
   inherits = ["defaults"]
   context = "setup/"
+  contexts = {
+    base = "target:base"
+  }
   tags = tag("setup")
 }