diff --git a/Makefile b/Makefile
index fb7011da..3bde0452 100644
--- a/Makefile
+++ b/Makefile
@@ -9,13 +9,14 @@ ifeq ($(shell uname -s),Darwin)
 endif
 
 
-.PHONY: clean PDFs Noten
+.PHONY: clean clean_Noten PDFs Noten
 
 # Generic targets
 all: PfadiralalaIV.pdf PfadiralalaIVplus.pdf
-clean:
-	@rm -f *.lb .*.lb *.aux *.log *.sxc *.sxd *.sbx *.synctex.gz *.out *.fls Pfadiralala*.pdf
-	
+clean: clean_Noten
+	rm -f *.lb .*.lb *.aux *.log *.sxc *.sxd *.sbx *.synctex.gz *.out *.fls Pfadiralala*.pdf
+clean_Noten: 
+	rm -f $(patsubst ABC_Noten/%.abc,Noten/%.pdf,$(wildcard ABC_Noten/*.abc))
 
 # Target definitions for song PDFs
 PDFs/%.pdf: Lieder/%.tex Noten
diff --git a/Tools/Dockerfile b/Tools/Dockerfile
index 72d87407..7118b7bd 100644
--- a/Tools/Dockerfile
+++ b/Tools/Dockerfile
@@ -1,3 +1,21 @@
+FROM ubuntu:bionic as abcm2ps_builder
+
+RUN apt-get update \
+    && apt-get install --no-install-recommends -y \
+        make \
+        gcc \
+        libc6-dev \
+    && apt-get clean
+
+WORKDIR /tmp/
+ADD https://github.com/leesavide/abcm2ps/archive/v8.14.1.tar.gz abcm2ps-8.14.1.tar.gz
+RUN tar -xf abcm2ps-8.14.1.tar.gz
+
+WORKDIR /tmp/abcm2ps-8.14.1/
+RUN ./configure
+RUN make install
+
+
 FROM ubuntu:bionic
 LABEL maintainer="pfadfinder@jonashoechst.de"
 LABEL description="A docker image for build the Pfadiralala IV VCP Kurhessen (german scouts) songbook."
@@ -6,17 +24,18 @@ LABEL version="1.0"
 ENV DEBIAN_FRONTEND noninteractive
 
 RUN apt-get update \
-    && apt-get install -y \
+    && apt-get install --no-install-recommends -y \
         texlive-latex-base \
         texlive-latex-extra \
         texlive-fonts-recommended \
         texlive-extra-utils \
         texlive-lang-german \
         xzdec \
-        abcm2ps \
         ghostscript \
         make \
     && apt-get clean
 
 RUN mkdir /PfadiralalaIV
-WORKDIR /PfadiralalaIV
\ No newline at end of file
+WORKDIR /PfadiralalaIV
+
+COPY --from=abcm2ps_builder /usr/local/bin/abcm2ps /usr/local/bin/