diff --git a/icedreammusic/liquidsoap/Dockerfile b/icedreammusic/liquidsoap/Dockerfile
index 85251c4..38623f7 100644
--- a/icedreammusic/liquidsoap/Dockerfile
+++ b/icedreammusic/liquidsoap/Dockerfile
@@ -2,6 +2,33 @@ ARG IMAGE=savonet/liquidsoap-ci-build:v2.2.2_amd64
 
 FROM $IMAGE
 
+USER root
+
+ENV DEBIAN_FRONTEND=noninteractive
+# RUN sed -e 's,^deb\s\+,deb-src ,g' /etc/apt/sources.list > /etc/apt/sources.list.d/sources.list
+RUN apt-get update
+
+RUN mkdir -p /packages/
+RUN chown _apt /packages/
+WORKDIR /packages/
+
+RUN apt-get download \
+    -o Dir::Cache="/packages/" \
+    -o Dir::Cache::archives="/packages/" \
+    $(apt-cache depends --recurse --no-recommends --no-suggests \
+    --no-conflicts --no-breaks --no-replaces --no-enhances \
+    --no-pre-depends lame | grep "^\w")
+
+###
+
+FROM $IMAGE
+
+COPY --from=0 /packages/ /packages/
+USER root
+RUN DEBIAN_FRONTEND=noninteractive dpkg -i /packages/*.deb \
+    && rm -r /packages/
+USER liquidsoap
+
 WORKDIR /liq/
 COPY . .
 RUN liquidsoap -c metadata_api.liq
diff --git a/icedreammusic/liquidsoap/stream.liq b/icedreammusic/liquidsoap/stream.liq
index 8e4e0a9..850e55b 100644
--- a/icedreammusic/liquidsoap/stream.liq
+++ b/icedreammusic/liquidsoap/stream.liq
@@ -119,6 +119,21 @@ setup_harbor_stream_api(internal_icecast(
     ),
     a,
 ))
+setup_harbor_stream_api(internal_icecast(
+    id="out_a_int_mp3_640",
+    mount="/outa/mp3_640",
+    start=false,
+    format="audio/mpeg",
+    encoding="ISO-8859-1",
+    %external(
+        channels=2,
+        samplerate=44100,
+        header=true,
+        restart_on_crash=true,
+        restart_after_delay=0,
+        process="lame --silent --noreplaygain --flush -t --freeformat -b640 - -"),
+    a,
+))
 setup_harbor_stream_api(internal_icecast(
     id="out_a_int_mp3_128",
     mount="/outa/mp3_128",
@@ -149,8 +164,23 @@ if null.defined(rektfm_username) and null.defined(rektfm_password) then
         description=null.get(stream_description),
         password=null.get(rektfm_password),
         start=false,
-        format="audio/flac",
-        %flac,
+        # NOTE - can't use OGG/FLAC here as OGG metadata changes cause dropouts
+        #format="application/ogg",
+        #%ogg(%flac),
+        # NOTE - liquidsoap can't be trusted to detect bare FLAC either unfortunately
+        #send_icy_metadata=true,
+        #format="audio/x-flac",
+        #%flac,
+        # NOTE - let's just use good old mp3 until Z updates the liquidsoap version...
+        send_icy_metadata=true,
+        format="audio/mpeg",
+        %external(
+            channels=2,
+            samplerate=44100,
+            header=true,
+            restart_on_crash=true,
+            restart_after_delay=0,
+            process="lame --silent --noreplaygain --flush -t --freeformat -b640 - -"),
         a,
     ))
 end