diff --git a/Dockerfile.j2 b/Dockerfile.j2
index c61f190..5fb31df 100644
--- a/Dockerfile.j2
+++ b/Dockerfile.j2
@@ -55,6 +55,14 @@ RUN apt update \
     && apt autoremove -y \
     && rm -rf /var/lib/apt/lists/*
 {%endif%} 
+{%if desktop == "xfce4" %}
+RUN apt update \
+    && apt install -y --no-install-recommends --allow-unauthenticated \
+        xubuntu-desktop \
+    && apt autoclean -y \
+    && apt autoremove -y \
+    && rm -rf /var/lib/apt/lists/*
+{%endif%} 
 # Additional packages require ~600MB
 # libreoffice  pinta language-pack-zh-hant language-pack-gnome-zh-hant firefox-locale-zh-hant libreoffice-l10n-zh-tw
 
diff --git a/flavors/xfce4.yml b/flavors/xfce4.yml
new file mode 100644
index 0000000..6eb386b
--- /dev/null
+++ b/flavors/xfce4.yml
@@ -0,0 +1,6 @@
+---
+addon_packages:
+  - vim-tiny
+  - firefox
+  - xfce4-terminal
+desktop: xfce4
diff --git a/image/etc/supervisor/conf.d/supervisord.conf.j2 b/image/etc/supervisor/conf.d/supervisord.conf.j2
index faca832..186f787 100644
--- a/image/etc/supervisor/conf.d/supervisord.conf.j2
+++ b/image/etc/supervisor/conf.d/supervisord.conf.j2
@@ -58,6 +58,18 @@ user=%USER%
 environment=DISPLAY=":1",HOME="%HOME%",USER="%USER%"
 {% endif %}
 
+{% if desktop == "xfce4" %}
+[group:x]
+programs=xvfb,lxpanel,x11vnc,novnc
+
+[program:lxpanel]
+priority=15
+directory=%HOME%
+command=/usr/bin/startxfce4
+user=%USER%
+environment=DISPLAY=":1",HOME="%HOME%",USER="%USER%"
+{% endif %}
+
 [program:xvfb]
 priority=10
 command=/usr/local/bin/xvfb.sh