diff --git a/alpine_ci/Dockerfile b/alpine_ci/Dockerfile
index 2082275..f4ccf1e 100644
--- a/alpine_ci/Dockerfile
+++ b/alpine_ci/Dockerfile
@@ -2,5 +2,5 @@ FROM alpine
 
 RUN apk update && apk add --no-cache binutils cmake make libgcc \
         musl-dev gcc libarchive-static libarchive-dev acl-static xz-dev lz4-static \
-        zstd-static zlib-static openssl-libs-static 
+        zstd-static zlib-static openssl-libs-static bzip2-static bzip2-dev expat-static
 
diff --git a/ubuntu18_ci/Dockerfile b/ubuntu18_ci/Dockerfile
new file mode 100644
index 0000000..15963d3
--- /dev/null
+++ b/ubuntu18_ci/Dockerfile
@@ -0,0 +1,18 @@
+FROM ubuntu:18.04
+
+MAINTAINER simon987 <me@simon987.net>
+
+RUN apt update
+RUN apt install -y git pkg-config libglib2.0-dev\
+        libssl-dev uuid-dev python3 libmagic-dev \
+		libfreetype6-dev libcurl4-gnutls-dev \
+        libbz2-dev yasm libharfbuzz-dev ragel libarchive-dev \
+		automake autotools-dev libopenjp2-7-dev wget libtool \
+		libxml2-dev python3 python3-dev libtiff-dev \
+		libpango1.0-dev libasan4 && apt clean
+
+RUN wget https://github.com/Kitware/CMake/releases/download/v3.16.2/cmake-3.16.2.tar.gz && \
+	tar -xzf cmake-*.tar.gz && cd cmake-* && ./bootstrap && make -j 4 && make install
+RUN git clone "https://github.com/danbloomberg/leptonica" && mkdir leptonica/build && cd leptonica/build && cmake -DCMAKE_C_FLAGS="-fPIC" .. && make -j 4 && make install && rm -rf /cmake-* /leptonica
+
+RUN git clone "https://github.com/glennrp/libpng" && cd libpng && CFLAGS="-fPIC" ./configure --enable-static && make -j 4 && make install
diff --git a/ubuntu_ci/Dockerfile b/ubuntu_ci/Dockerfile
index 55b9943..9b7a7b0 100644
--- a/ubuntu_ci/Dockerfile
+++ b/ubuntu_ci/Dockerfile
@@ -5,13 +5,17 @@ MAINTAINER simon987 <me@simon987.net>
 RUN apt update
 RUN apt install -y git pkg-config libglib2.0-dev\
         libssl-dev uuid-dev python3 libmagic-dev \
-		libfreetype6-dev libcurl4-openssl-dev \
+		libfreetype6-dev libcurl4-gnutls-dev \
         libbz2-dev yasm libharfbuzz-dev ragel libarchive-dev \
 		automake autotools-dev libopenjp2-7-dev wget libtool \
-		libxml2-dev python3 python3-dev
+		libxml2-dev python3 python3-dev libtiff-dev \
+		libpango1.0-dev && apt clean
 
 RUN wget https://github.com/gohugoio/hugo/releases/download/v0.62.1/hugo_0.62.1_Linux-64bit.deb &&\
 	dpkg -i hugo*.deb && rm hugo*.deb
 
 RUN wget https://github.com/Kitware/CMake/releases/download/v3.16.2/cmake-3.16.2.tar.gz && \
 	tar -xzf cmake-*.tar.gz && cd cmake-* && ./bootstrap && make -j 4 && make install
+RUN git clone "https://github.com/danbloomberg/leptonica" && mkdir leptonica/build && cd leptonica/build && cmake -DCMAKE_C_FLAGS="-fPIC" .. && make -j 4 && make install && rm -rf cmake-* leptonica
+
+RUN git clone "https://github.com/glennrp/libpng" && cd libpng && CFLAGS="-fPIC" ./configure --enable-static && make -j 4 && make install