diff --git a/Dockerfile b/Dockerfile
index 945a804d..340d73bf 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,6 +5,7 @@ FROM build-base AS rtl_fm
 RUN git clone --depth 1 https://gitea.osmocom.org/sdr/rtl-sdr.git /opt/rtl_sdr
 WORKDIR /opt/rtl_sdr/build
 RUN cmake .. && make
+RUN make install
 
 FROM build-base AS multimon
 RUN git clone --depth 1 https://github.com/EliasOenal/multimon-ng.git /opt/multimon
@@ -17,22 +18,24 @@ RUN apk add git && \
     git clone --depth 1 --branch ${BW_VERSION} https://github.com/BOSWatch/BW3-Core.git /opt/boswatch
 
 
-FROM python:alpine AS boswatch-base
+FROM python:alpine AS client
 LABEL maintainer="bastian@schroll-software.de"
 
 #           for RTL    for MM
-RUN apk add libusb-dev libpulse && \
-    pip3 install pyyaml
+RUN apk add libusb-dev libpulse
+RUN pip3 install pyyaml
 
 COPY --from=boswatch /opt/boswatch/ /opt/boswatch/
-RUN mkdir /opt/boswatch/log
 COPY --from=multimon /opt/multimon/build/multimon-ng /opt/multimon/multimon-ng
-COPY --from=rtl_fm /opt/rtl_sdr/build/src/ /opt/rtl_sdr/
-WORKDIR /opt/boswatch
+COPY --from=rtl_fm /usr/local/bin/rtl_fm /opt/rtl_sdr/rtl_fm
+COPY --from=rtl_fm /usr/local/lib/librtlsdr.so.0 /usr/local/lib/librtlsdr.so.0
 
-FROM boswatch-base AS client
+WORKDIR /opt/boswatch
 CMD python3 /opt/boswatch/bw_client.py -c client.yaml
 
-FROM boswatch-base AS server
+FROM python:alpine AS server
+RUN pip3 install pyyaml
+COPY --from=boswatch /opt/boswatch/ /opt/boswatch/
+WORKDIR /opt/boswatch
 CMD python3 /opt/boswatch/bw_server.py -c server.yaml
 EXPOSE 8080
diff --git a/config/client.yaml b/config/client.yaml
index 8398d5b4..2c852ed0 100644
--- a/config/client.yaml
+++ b/config/client.yaml
@@ -27,7 +27,7 @@ inputSource:
     squelch: 1
     gain: 100
     #fir_size: 0
-    rtlPath: /usr/local/bin/rtl_fm
+    rtlPath: /opt/rtl_sdr/rtl_fm
   lineIn:
     card: 1
     device: 0
@@ -38,5 +38,5 @@ decoder:
   poc512: yes
   poc1200: yes
   poc2400: yes
-  Path: /opt/multimon/multimon-ng
+  path: /opt/multimon/multimon-ng
   char: DE
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 4e7e07d2..fc30d89f 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -2,7 +2,11 @@ version: '3'
 services:
   client:
     image: docker.pkg.github.com/janspeller/bw3-core/client:latest
+    volumes:
+      - ./config:/opt/boswatch/config
     devices:
       - "/dev/bus/usb"
   server:
     image: docker.pkg.github.com/janspeller/bw3-core/server:latest
+    volumes:
+      - ./config:/opt/boswatch/config