diff --git a/freqtrade/Dockerfile b/freqtrade/Dockerfile
index e1edd7047..ebf121636 100644
--- a/freqtrade/Dockerfile
+++ b/freqtrade/Dockerfile
@@ -3,6 +3,24 @@ ARG BUILD_VERSION
 FROM freqtradeorg/freqtrade:latest
 ARG BASHIO_VERSION=0.13.1
 
+# Add FreqUI
+FROM node:16.11.1-alpine as ui-builder
+RUN mkdir /app
+WORKDIR /app
+COPY package.json /app/package.json
+COPY yarn.lock /app/yarn.lock
+RUN apk add --update --no-cache python3 g++ make\
+    && yarn \
+    && apk del python3 g++ make
+RUN yarn global add @vue/cli
+COPY . /app
+RUN yarn build
+FROM nginx:1.21.3-alpine
+COPY  --from=ui-builder /app/dist /etc/nginx/html
+COPY  --from=ui-builder /app/nginx.conf /etc/nginx/nginx.conf
+EXPOSE 80
+CMD ["nginx"]
+
 RUN \
     ###################
     # Install bashio #