diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
new file mode 100644
index 00000000..c6ef8b6b
--- /dev/null
+++ b/docker-compose/docker-compose.yml
@@ -0,0 +1,22 @@
+version: '3'
+services:
+   webone:
+    build: ./webone
+    restart: unless-stopped
+    stop_signal: SIGKILL
+    volumes:
+     - /home/zefie/docker/wtvminisrv/webone.conf:/etc/webone.conf:ro
+     - /home/zefie/docker/wtvminisrv/webone.conf.d/:/etc/webone.conf.d/:ro
+
+   minisrv:
+    build: ./minisrv
+    restart: unless-stopped
+    links:
+     - webone
+    ports:
+     - "1600-1699:1600-1699"
+    volumes:
+     - /home/zefie/docker/wtvminisrv/user_config.json:/opt/minisrv/zefie_wtvp_minisrv/user_config.json:ro
+     - /home/zefie/docker/wtvminisrv/UserServiceVault:/opt/minisrv/zefie_wtvp_minisrv/UserServiceVault
+
+
diff --git a/docker-compose/minisrv/Dockerfile b/docker-compose/minisrv/Dockerfile
new file mode 100644
index 00000000..57c7e1a4
--- /dev/null
+++ b/docker-compose/minisrv/Dockerfile
@@ -0,0 +1,11 @@
+FROM alpine:latest
+
+RUN apk add git nodejs npm
+RUN cd /opt && git clone --depth=1 https://github.com/zefie/zefie_wtvp_minisrv.git minisrv
+RUN cd /opt/minisrv/zefie_wtvp_minisrv && npm install
+
+COPY ./run.sh /opt/minisrv/zefie_wtvp_minisrv/run.sh
+RUN chmod +x /opt/minisrv/zefie_wtvp_minisrv/run.sh
+
+WORKDIR /opt/minisrv/zefie_wtvp_minisrv
+CMD ./run.sh
diff --git a/docker-compose/minisrv/run.sh b/docker-compose/minisrv/run.sh
new file mode 100644
index 00000000..a6849b7c
--- /dev/null
+++ b/docker-compose/minisrv/run.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+git pull
+node app.js
diff --git a/docker-compose/webone/Dockerfile b/docker-compose/webone/Dockerfile
new file mode 100644
index 00000000..1d41b009
--- /dev/null
+++ b/docker-compose/webone/Dockerfile
@@ -0,0 +1,13 @@
+FROM debian:latest
+
+RUN apt-get update && apt-get install --yes curl && \
+curl -L https://packages.microsoft.com/config/debian/10/packages-microsoft-prod.deb -o /tmp/packages-microsoft-prod.deb && \
+apt-get install --yes /tmp/packages-microsoft-prod.deb && \
+rm /tmp/packages-microsoft-prod.deb && \
+apt-get update && \
+apt-get install --yes curl imagemagick ffmpeg jpegoptim
+
+COPY ./setup.sh /tmp/setup.sh
+RUN bash /tmp/setup.sh
+
+CMD /usr/local/bin/webone
diff --git a/docker-compose/webone/setup.sh b/docker-compose/webone/setup.sh
new file mode 100644
index 00000000..3069c0b7
--- /dev/null
+++ b/docker-compose/webone/setup.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+get_latest_release() {
+  curl --silent "https://api.github.com/repos/$1/releases/latest"
+}
+
+debfile=$(get_latest_release atauenis/webone | \
+grep "browser_download_url" | \
+grep "amd64" | \
+grep "deb" | \
+sed -E 's/.*"([^"]+)".*/\1/')
+
+if [ ! -z "${debfile}" ]; then
+	curl --silent -L "${debfile}" -o /tmp/webone.deb
+	if [ ! -f /bin/systemctl ]; then
+		# Create dummy systemctl
+		touch /bin/systemctl
+		chmod +x /bin/systemctl
+	fi
+	apt-get install --yes /tmp/webone.deb
+	rm /tmp/webone.deb
+fi
diff --git a/webone.conf b/docker-compose/webone/webone.conf
similarity index 100%
rename from webone.conf
rename to docker-compose/webone/webone.conf
diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-home/home.js b/zefie_wtvp_minisrv/ServiceVault/wtv-home/home.js
index 6d4b1262..a005cf10 100644
--- a/zefie_wtvp_minisrv/ServiceVault/wtv-home/home.js
+++ b/zefie_wtvp_minisrv/ServiceVault/wtv-home/home.js
@@ -24,7 +24,7 @@ function go() {
 	location.href=document.access.url.value;
 }
 </script>
-<h2>Welcome to `+ z_title + `</h2>
+<h3>Welcome to `+ z_title + `</h3>
 <b>Encryption Status</b>: ${cryptstatus}<br>
 <b>Connection Speed</b>: &rate;
 <p>
diff --git a/zefie_wtvp_minisrv/package.json b/zefie_wtvp_minisrv/package.json
index 17144fb1..0d3f521b 100644
--- a/zefie_wtvp_minisrv/package.json
+++ b/zefie_wtvp_minisrv/package.json
@@ -1,6 +1,6 @@
 {
   "name": "zefie_wtvp_minisrv",
-  "version": "0.9.10",
+  "version": "0.9.11",
   "description": "WebTV Service (WTVP) Emulation Server",
   "main": "app.js",
   "homepage": "https://github.com/zefie/zefie_wtvp_minisrv",