diff --git a/.dockerignore b/.dockerignore
index 6aa34829fc8656bed0f728fd6f875c233b805705..ab14ee09bb427bb4c9319b9c7a81d59d70150dd5 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,4 +1,4 @@
 *
 !target/nginxWebUI-*.jar
 !Dockerfile
-!s6-overlay
+!entrypoint.sh
diff --git a/Dockerfile b/Dockerfile
index c931447c0c8e7db6acf0c28ecae734974ffa3416..1e0655b291773f29a6388a9c313fbd6d04b764ba 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,27 +1,31 @@
-FROM alpine:3.14
+FROM ubuntu
+ARG DEBIAN_FRONTEND=noninteractive
 ENV LANG=zh_CN.UTF-8 \
     TZ=Asia/Shanghai \
     PS1="\u@\h:\w \$ "
-RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories \
-    && apk add --update --no-cache \
+RUN apt update \
+    && apt install -y --no-install-recommends \
        nginx \
-       nginx-mod-stream \
-       openjdk8-jre \
+       libnginx-mod-stream \
+       openjdk-11-jre \
        net-tools \
        curl \
        wget \
        ttf-dejavu \
        fontconfig \
        tzdata \
-       s6-overlay \
-       acme.sh \
-       sqlite \
+       tini \
+       sqlite3 \
     && fc-cache -f -v \
     && ln -sf /usr/share/zoneinfo/${TZ} /etc/localtime \
     && echo "${TZ}" > /etc/timezone \
-    && rm -rf /var/cache/apk/* /tmp/*
+    && apt autoclean -y \
+    && rm -rf \
+       /tmp/* \
+       /var/lib/apt/lists/* \
+       /var/tmp/*
 COPY target/nginxWebUI-*.jar /home/nginxWebUI.jar
-COPY s6-overlay /
+COPY entrypoint.sh /usr/local/bin/entrypoint.sh
 VOLUME ["/home/nginxWebUI"]
-ENTRYPOINT ["/init"]
+ENTRYPOINT ["tini", "entrypoint.sh"]
        
diff --git a/buildx.sh b/buildx.sh
index f14e479eaf068301b957546d7c6c6bc60b2b6501..c8128f926938d2fb571304960f885dcf446db4a2 100755
--- a/buildx.sh
+++ b/buildx.sh
@@ -7,7 +7,7 @@
 
 ## 基本信息
 repo="${1:-cym1102}/nginxwebui"
-arch="linux/386,linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6,linux/ppc64le,linux/s390x"
+arch="linux/amd64,linux/arm64,linux/arm/v7,linux/ppc64le,linux/riscv64,linux/s390x"
 ver=$(cat pom.xml | grep -A1 nginxWebUI | grep version | grep -oP "\d+\.\d+\.\d+")
 echo "构建镜像：$repo"
 echo "构建架构：$arch"
diff --git a/s6-overlay/etc/services.d/nginxwebui/run b/entrypoint.sh
similarity index 75%
rename from s6-overlay/etc/services.d/nginxwebui/run
rename to entrypoint.sh
index 8280b02965cd75778874d649851ae4d029e0a04f..49d25e58eccff2e248ca6f4df3ea1077b5c345a3 100755
--- a/s6-overlay/etc/services.d/nginxwebui/run
+++ b/entrypoint.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv sh
+#!/bin/bash
 
 cd /home
 exec java -jar -Xmx64m nginxWebUI.jar "${BOOT_OPTIONS}" 2>&1 >/dev/null