diff --git a/base/Dockerfile b/base/Dockerfile
index d50670d..08f66cc 100644
--- a/base/Dockerfile
+++ b/base/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:16.04
+FROM ubuntu:20.04
 ARG TZ="Etc/UTC"
 RUN sed -i 's/archive.ubuntu.com/au.archive.ubuntu.com/' /etc/apt/sources.list
 RUN apt-get update  && apt-get dist-upgrade -y &&\
diff --git a/wine/Dockerfile b/wine/Dockerfile
index 6aee112..f987276 100644
--- a/wine/Dockerfile
+++ b/wine/Dockerfile
@@ -2,4 +2,4 @@ FROM steamcmd
 USER root
 RUN apt-get install -y software-properties-common apt-transport-https && dpkg --add-architecture i386 && wget https://dl.winehq.org/wine-builds/winehq.key && apt-key add winehq.key && apt-add-repository 'https://dl.winehq.org/wine-builds/ubuntu/'
 RUN apt-get update && apt-get install -y --install-recommends winehq-staging xvfb
-
+RUN rm -rf /home/steam/.fontconfig
\ No newline at end of file
diff --git a/wine/README.md b/wine/README.md
index 2f24b04..c902a96 100644
--- a/wine/README.md
+++ b/wine/README.md
@@ -1,5 +1,5 @@
 
-This installs the wine-staging package and xfvb, a tool to make psueo-displays
+This installs the wine-staging package and xvfb, a tool to make psueo-displays
 so that apps which depend on X11 running can run without actual X displays,
 such as when running inside a docker container.
 
diff --git a/wreckfest/Dockerfile b/wreckfest/Dockerfile
index ea173ef..60bdc5a 100644
--- a/wreckfest/Dockerfile
+++ b/wreckfest/Dockerfile
@@ -1,9 +1,11 @@
 FROM wine
 
-USER root
+USER steam
+ENV DISPLAY :99
 
+WORKDIR /home/steam
+RUN winecfg
 
-USER steam
 WORKDIR /steam/steamcmd_linux
 RUN mkdir -p /steam/wreckfest
 
@@ -11,4 +13,4 @@ RUN ./steamcmd.sh +force_install_dir ../wreckfest +login anonymous +@sSteamCmdFo
 
 WORKDIR /steam/wreckfest
 ADD start*.sh /steam/wreckfest/
-CMD ["./start-wreckfest.sh"]
+CMD ["./start-wreckfest.sh"]
\ No newline at end of file
diff --git a/wreckfest/docker-compose.yml b/wreckfest/docker-compose.yml
new file mode 100644
index 0000000..444b0b9
--- /dev/null
+++ b/wreckfest/docker-compose.yml
@@ -0,0 +1,11 @@
+version: '3.0'
+services:
+  wreckfest:
+    image: wreckfest:latest
+    container_name: wreckfest
+    ports:
+      - 27015:27015/tcp
+      - 27015:27015/udp
+      - 27016:27016/udp
+      - 33540:33540/udp
+    restart: unless-stopped
\ No newline at end of file
diff --git a/wreckfest/start-wreckfest.sh b/wreckfest/start-wreckfest.sh
index b2c6a18..667f255 100755
--- a/wreckfest/start-wreckfest.sh
+++ b/wreckfest/start-wreckfest.sh
@@ -139,4 +139,5 @@ log=
 
 EOF
 
-exec wine Wreckfest.exe -s server_config=server_config.cfg
+sleep 5s
+xvfb-run exec wine Wreckfest.exe -s server_config=server_config.cfg
\ No newline at end of file