diff --git a/mapserver/README.md b/mapserver/README.md
index bd270ea..71c9e44 100644
--- a/mapserver/README.md
+++ b/mapserver/README.md
@@ -27,3 +27,7 @@ Umgebungsvariablen:
 
 * keine
 
+### meshviewer
+
+Der Meshviewer-Container stellt die Meshviewer-Anwendung aus https://git.dezentrale.cloud/Freifunk-Leipzig/meshviewer/src/branch/ffle sowie die zugehörigen Meshviewer-Daten bereit.
+
diff --git a/mapserver/docker-compose.yaml b/mapserver/docker-compose.yaml
index 42bfff1..c170436 100644
--- a/mapserver/docker-compose.yaml
+++ b/mapserver/docker-compose.yaml
@@ -13,6 +13,14 @@ services:
     yanic:
         build: ./yanic
         network_mode: "service:fastd"
-        stop_grace_period: 0s
+        stop_grace_period: 10s
         volumes:
             - ./data/yanic:/data
+    meshviewer:
+        build: ./meshviewer
+        ports:
+            - 80:80
+        volumes:
+            - ./data/yanic/meshviewer:/usr/share/nginx/html/data
+
+    
\ No newline at end of file
diff --git a/mapserver/meshviewer/Dockerfile b/mapserver/meshviewer/Dockerfile
new file mode 100644
index 0000000..c46f6f1
--- /dev/null
+++ b/mapserver/meshviewer/Dockerfile
@@ -0,0 +1,17 @@
+FROM node:14-alpine as builder
+
+RUN apk add --update --no-cache git
+
+RUN yarn global add gulp@4.0.2
+
+RUN git clone --branch ffle https://git.dezentrale.cloud/Freifunk-Leipzig/meshviewer.git /meshviewer
+
+RUN cd /meshviewer && yarn
+
+RUN cd /meshviewer && gulp
+
+FROM nginx:1-alpine
+
+RUN rm -rf /usr/share/nginx/html/*
+
+COPY --from=builder /meshviewer/build /usr/share/nginx/html/
diff --git a/mapserver/yanic/Dockerfile b/mapserver/yanic/Dockerfile
index 754c7ba..1b1da94 100644
--- a/mapserver/yanic/Dockerfile
+++ b/mapserver/yanic/Dockerfile
@@ -1,6 +1,6 @@
 FROM golang:1.16-alpine as builder
 
-RUN go get -v -u github.com/FreifunkBremen/yanic
+RUN go get -v -u github.com/FreifunkBremen/yanic@2c0b3c74fc42efb3e91a88939d341ed73c65d31a
 
 FROM alpine:3.14
 
diff --git a/mapserver/yanic/entrypoint.sh b/mapserver/yanic/entrypoint.sh
index e257b19..3f4190d 100755
--- a/mapserver/yanic/entrypoint.sh
+++ b/mapserver/yanic/entrypoint.sh
@@ -21,6 +21,11 @@ domains = ["meshkit"]
 
 [[respondd.interfaces]]
 ifname = "bat0"
+multicast_address = "ff02::2:1001"
+
+[[respondd.interfaces]]
+ifname = "bat0"
+multicast_address = "ff05::2:1001"
 
 [webserver]
 enable  = false