diff --git a/Dockerfile b/Dockerfile
index baa41fddd0ff20f38c82bfe54a98944924e656d5..243fb8204cd5a8339e451d6bfd787ceb3de1b728 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,69 +1,33 @@
 
-FROM ocaml/opam2:debian-10
+FROM savonet/liquidsoap:v1.4.3
 
 LABEL maintainer="David Trattnig <david.trattnig@subsquare.at>"
 
 # Engine System Dependencies
 
-RUN sudo apt-get update && sudo apt-get -y install \
+RUN apt-get update && apt-get -y install \
       apt-utils \
       redis-server \
       ffmpeg \
-      quelcom \
-      python3 \
-      python3-pip \      
+      quelcom \    
       build-essential \
       libmariadbclient-dev \
-      default-libmysqlclient-dev
-
-# Liquidsoap System Dependencies
-
-RUN sudo apt-get install -qq -yy \
-    libasound2-dev \
-    libflac-dev \
-    libjack-dev \
-    libmad0-dev \
-    libmp3lame-dev \
-    libogg-dev \
-    libopus-dev \
-    libpcre3-dev \
-    libpulse-dev \
-    libsamplerate0-dev \
-    libssl-dev \
-    libtag1-dev \
-    libvorbis-dev \
-    m4 \
-    pkg-config
-
-# Update OPAM
-
-RUN opam init --disable-sandboxing -y
-RUN opam switch create 4.08.0
-RUN opam update -y
-RUN opam install depext -y
-
-# Liquidsoap Dependencies
-
-RUN opam depext taglib mad lame vorbis flac opus cry samplerate pulseaudio bjack alsa ssl liquidsoap -y 
-RUN opam install taglib mad lame vorbis flac opus cry samplerate pulseaudio bjack alsa ssl liquidsoap -y
+      default-libmysqlclient-dev \
+      python3.8 python3-pip
 
 # Print Debug Information
 
-RUN echo $(python3 -V)
-RUN echo $(python3.7 -V)
-RUN echo $(ls /home/opam/.opam/4.08.0/bin/liquidsoap)
+RUN echo $(python3.8 -V)
 
 # Setup Engine
 
+RUN whoami
 RUN mkdir -p /srv
-RUN mkdir -p /home/opam/audio
-RUN mkdir -p /home/opam/audio/source
+RUN mkdir -p /var/audio
+RUN mkdir -p /var/audio/source
 COPY . /srv
 WORKDIR /srv
-ENV PATH="/home/opam/.local/bin:${PATH}"
-RUN sudo usermod -a -G audio opam
-RUN python3.7 $(which pip3) install -r requirements.txt
-COPY configuration/sample-docker.engine.ini /srv/configuration/engine.ini
+RUN python3.8 $(which pip3) install -r requirements.txt
 
 # Start the Engine