diff --git a/Dockerfile b/Dockerfile
index 4d5a0ea91a71a5e8848c75dd060ecf8719dbb4ee..37dab164a7182099d5ac120257f1074e457fee79 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,12 +1,17 @@
-FROM python:3.7.7-buster
 
+###--- Python Stage ---###
+
+FROM python:3.7.7-buster
 
 LABEL maintainer="David Trattnig <david.trattnig@subsquare.at>"
 
+RUN sed -i "s#deb http://http.us.debian.org/debian buster main contrib non-free#deb http://http.us.debian.org/debian buster main contrib non-free#g" /etc/apt/sources.list
+
 RUN set -ex \
   && rm -f /usr/bin/python && ln -s /usr/local/bin/python /usr/bin/python \
   && rm -f /usr/bin/python3 && ln -s /usr/local/bin/python3 /usr/bin/python3
 
+# System Package Installation
 RUN set -ex \
 	&& apt-get update -q \
 	&& apt-get install -y -q --no-install-recommends \
@@ -30,7 +35,9 @@ RUN set -ex \
 COPY configuration/sample-docker.engine.ini configuration/engine.ini
 COPY configuration/sample-docker.gunicorn.conf.py configuration/gunicorn.conf.py
 
-# OPAM / Liquidsoap Installation
+
+###--- OPAM / Liquidsoap Stage ---###
+
 FROM ocaml/opam2:latest
 
 # Liquidsoap Dependencies
@@ -38,6 +45,6 @@ RUN opam init --disable-sandboxing -y
 RUN opam switch create 4.08.0
 RUN opam update -y
 RUN opam install depext -y
-RUN opam depext taglib mad lame vorbis fdkaac flac opus cry samplerate pulseaudio bjack alsa liquidsoap -y
-RUN opam install taglib mad lame vorbis fdkaac flac opus cry samplerate pulseaudio bjack alsa liquidsoap -y
+RUN opam depext taglib mad lame vorbis flac opus cry samplerate pulseaudio bjack alsa liquidsoap -y
+RUN opam install taglib mad lame vorbis flac opus cry samplerate pulseaudio bjack alsa liquidsoap -y
 RUN eval $(opam env)
\ No newline at end of file