diff --git a/build/ci/Dockerfile b/build/ci/Dockerfile
index 84815e8..a66747c 100644
--- a/build/ci/Dockerfile
+++ b/build/ci/Dockerfile
@@ -1,14 +1,14 @@
-FROM ubuntu:16.10
-MAINTAINER Antergos Developers <dev@antergos.com>
+FROM ubuntu:17.04
+MAINTAINER Antergos Linux Project <dev@antergos.com>
 
-RUN DEBIAN_FRONTEND=noninteractive apt-get update; \
-	apt-get install -y \
-		libgtk-3-dev \
+RUN DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& apt-get install -y \
 		liblightdm-gobject-1-dev \
-		libdbus-glib-1-dev \
-		libwebkit2gtk-4.0-dev \
-		ninja-build \
-		python3-pip; pip3 install https://github.com/mesonbuild/meson/archive/master.zip
+		libqt5webengine5 \
+		python3-gi \
+		python3-pyqt5 \
+		python3-pip \
+	&& pip3 install whither
 
 VOLUME /build
 WORKDIR /build
diff --git a/circle.yml b/circle.yml
index 6961271..43a07db 100644
--- a/circle.yml
+++ b/circle.yml
@@ -7,10 +7,10 @@ dependencies:
   cache_directories:
     - ~/docker
   override:
-    - '[[ -e ~/docker/image.tar ]] && docker load -i ~/docker/image.tar || true'
-    - '[[ -e ~/docker/image.tar ]] || docker build --rm=false -t antergos/ci-ubuntu build/ci'
-    - '[[ -e ~/docker/image.tar ]] || mkdir -p ~/docker; docker save antergos/ci-ubuntu > ~/docker/image.tar'
+    - '[[ -e ~/docker/image1.tar ]] && docker load -i ~/docker/image1.tar || true'
+    - '[[ -e ~/docker/image1.tar ]] || docker build --rm=false -t antergos/ci-ubuntu build/ci'
+    - '[[ -e ~/docker/image1.tar ]] || mkdir -p ~/docker; docker save antergos/ci-ubuntu > ~/docker/image1.tar'
 
 test:
   override:
-    - docker run -v ${PWD}:/build:rw antergos/ci-ubuntu /bin/bash -c "cd build && meson --prefix=/usr .. && ninja && ninja install"
+    - docker run -v ${PWD}:/build:rw antergos/ci-ubuntu /bin/bash -c "make -j1 install"