diff --git a/Dockerfile b/Dockerfile
index b5cadc2..7ac5a8d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,17 +1,7 @@
-#FROM centos:7
-#RUN yum install -y epel-release 
-#RUN yum install -y sqlite-devel
-#RUN yum install -y gcc gcc-c++ meson
-#COPY ci/arrow-centos.repo /etc/yum.repos.d/Apache-Arrow.repo
-#RUN yum install -y parquet-devel
-FROM ubuntu:16.04
+FROM ubuntu:18.04
 RUN apt-get update && apt-get install -y apt-transport-https curl gnupg lsb-release pkg-config libsqlite3-dev libicu-dev gcc g++ meson
-COPY ci/arrow-ubuntu16.04.list /etc/apt/sources.list.d/apache-arrow.list
-RUN curl https://dist.apache.org/repos/dist/dev/arrow/KEYS | apt-key add - && apt-get update && apt-get install -y libparquet-dev
-
-#https://apache.bintray.com/arrow/centos/7/x86_64/Packages/parquet-devel-0.14.1-1.el7.x86_64.rpm https://apache.bintray.com/arrow/centos/7/x86_64/Packages/parquet-libs-0.14.1-1.el7.x86_64.rpm https://apache.bintray.com/arrow/centos/7/x86_64/Packages/arrow-libs-0.14.1-1.el7.x86_64.rpm https://apache.bintray.com/arrow/centos/7/x86_64/Packages/arrow-glib-libs-0.14.1-1.el7.x86_64.rpm https://apache.bintray.com/arrow/centos/7/x86_64/Packages/arrow-glib-devel-0.14.1-1.el7.x86_64.rpm https://apache.bintray.com/arrow/centos/7/x86_64/Packages/arrow-devel-0.14.1-1.el7.x86_64.rpm 
-#COPY ci/arrow-centos.repo //yum.repos.d/Apache-Arrow.repo
-#RUN yum install -y epel-release && yum install -y --enablerepo=epel parquet-devel
+COPY ci/arrow-ubuntu18.04.list /etc/apt/sources.list.d/apache-arrow.list
+RUN curl -L -o /usr/share/keyrings/apache-arrow-keyring.gpg https://dl.bintray.com/apache/arrow/$(lsb_release --id --short | tr 'A-Z' 'a-z')/apache-arrow-keyring.gpg && apt-get update && apt-get install -y libparquet-dev
 WORKDIR /src/
 VOLUME /src
 CMD mkdir builddir && meson builddir && cd builddir && ninja
diff --git a/ci/arrow-ubuntu18.04.list b/ci/arrow-ubuntu18.04.list
new file mode 100644
index 0000000..01b142e
--- /dev/null
+++ b/ci/arrow-ubuntu18.04.list
@@ -0,0 +1 @@
+deb [arch=amd64 signed-by=/usr/share/keyrings/apache-arrow-keyring.gpg] https://dl.bintray.com/apache/arrow/ubuntu/ bionic main                                                             deb-src [signed-by=/usr/share/keyrings/apache-arrow-keyring.gpg] https://dl.bintray.com/apache/arrow/ubuntu/ bionic main