diff --git a/Dockerfile b/Dockerfile
index ea7653e..e1ba4de 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-FROM golang:1.23 as build
+FROM golang:1.23 AS build
 
 WORKDIR /kvctl
 
@@ -26,14 +26,23 @@ WORKDIR /kvctl
 COPY . .
 RUN make
 
+FROM node:22 AS webui-build
 
-FROM ubuntu:focal
+WORKDIR /kvctl/webui
+
+COPY ./webui .
+
+RUN npm install && npm run deploy
+
+FROM node:22
 
 WORKDIR /kvctl
 
 COPY --from=build /kvctl/_build/kvctl-server ./bin/
 COPY --from=build /kvctl/_build/kvctl ./bin/
 
+COPY --from=webui-build /kvctl/webui/.next/standalone ./webui
+
 VOLUME /var/lib/kvctl
 
 COPY ./LICENSE ./NOTICE ./licenses ./