diff --git a/ci/Dockerfile/ubuntu1604.ppc64le b/ci/Dockerfile/ubuntu1604.ppc64le
deleted file mode 120000
index 174b820..0000000
--- a/ci/Dockerfile/ubuntu1604.ppc64le
+++ /dev/null
@@ -1 +0,0 @@
-ubuntu1604
\ No newline at end of file
diff --git a/ci/Dockerfile/ubuntu1604.x86_64 b/ci/Dockerfile/ubuntu1604.x86_64
deleted file mode 120000
index 174b820..0000000
--- a/ci/Dockerfile/ubuntu1604.x86_64
+++ /dev/null
@@ -1 +0,0 @@
-ubuntu1604
\ No newline at end of file
diff --git a/ci/Dockerfile/ubuntu1604 b/ci/Dockerfile/ubuntu1804
similarity index 91%
rename from ci/Dockerfile/ubuntu1604
rename to ci/Dockerfile/ubuntu1804
index 5c05411..a4a9f30 100644
--- a/ci/Dockerfile/ubuntu1604
+++ b/ci/Dockerfile/ubuntu1804
@@ -1,4 +1,4 @@
-FROM ubuntu:16.04
+FROM ubuntu:18.04
 # Don't ask. Ubuntu is awful.
 RUN sed -e 's/main$/main universe/' --in-place=orig /etc/apt/sources.list
 RUN DEBIAN_FRONTEND=noninteractive apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -yy cscope ctags \
@@ -7,4 +7,4 @@
   build-essential g++ git bison flex unzip \
   cpio vim-common lsb-release \
   libxml-simple-perl libxml-sax-perl libxml2-dev libxml2-utils xsltproc \
-  wget bc libssl-dev python-matplotlib python-numpy graphviz eatmydata bsdmainutils
+  wget bc libssl-dev python-matplotlib python-numpy graphviz eatmydata bsdmainutils rsync
diff --git a/ci/Dockerfile/ubuntu1804.ppc64le b/ci/Dockerfile/ubuntu1804.ppc64le
new file mode 120000
index 0000000..967c573
--- /dev/null
+++ b/ci/Dockerfile/ubuntu1804.ppc64le
@@ -0,0 +1 @@
+ubuntu1804
\ No newline at end of file
diff --git a/ci/Dockerfile/ubuntu1804.x86_64 b/ci/Dockerfile/ubuntu1804.x86_64
new file mode 120000
index 0000000..967c573
--- /dev/null
+++ b/ci/Dockerfile/ubuntu1804.x86_64
@@ -0,0 +1 @@
+ubuntu1804
\ No newline at end of file
diff --git a/ci/build.sh b/ci/build.sh
index 9359ca6..8a275f3 100755
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-CONTAINERS="ubuntu1604 fedora27"
+CONTAINERS="ubuntu1804 fedora27"
 
 
 SDK_ONLY=0
@@ -104,7 +104,7 @@
 	  if [[ "$distro" == fedora27 ]]; then
 	    PROXY="RUN echo \"proxy=${http_proxy}\" >> /etc/dnf/dnf.conf"
 	  fi
-	  if [[ "$distro" == ubuntu1604 ]]; then
+	  if [[ "$distro" == ubuntu1804 ]]; then
 	    PROXY="RUN echo \"Acquire::http::Proxy \\"\"${http_proxy}/\\"\";\" > /etc/apt/apt.conf.d/000apt-cacher-ng-proxy"
 	  fi
         fi