diff --git a/Dockerfile b/Dockerfile
index 4b77405..0a2c34d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,11 @@
 FROM golang:1.11 AS build
 
+ENV LD_LIBRARY_PATH /usr/lib/oracle/18.3/client64/lib
+
 RUN apt-get -qq update && apt-get install --no-install-recommends -qq libaio1 rpm
+COPY oci8.pc /usr/share/pkgconfig
 COPY *.rpm /
-RUN rpm -Uvh --nodeps /oracle-instantclient12.2-devel-12.2.0.1.0-1.x86_64.rpm /oracle-instantclient12.2-basic-12.2.0.1.0-1.x86_64.rpm && rm /*.rpm
+RUN rpm -Uvh --nodeps /oracle-instantclient*.x86_64.rpm && rm /*.rpm
 RUN echo $LD_LIBRARY_PATH >> /etc/ld.so.conf.d/oracle.conf && ldconfig
 
 WORKDIR /go/src/oracledb_exporter
@@ -14,7 +17,6 @@ ENV VERSION ${VERSION:-0.1.0}
 
 ENV PKG_CONFIG_PATH /go/src/oracledb_exporter
 ENV GOOS            linux
-ENV LD_LIBRARY_PATH /usr/lib/oracle/12.2/client64/lib
 
 RUN go build -v -ldflags "-X main.Version=${VERSION} -s -w"
 
@@ -24,13 +26,13 @@ LABEL maintainer="Yannig Perré <yannig.perre@gmail.com>"
 
 ENV VERSION ${VERSION:-0.1.0}
 
-COPY oracle-instantclient12.2-basic-12.2.0.1.0-1.x86_64.rpm /
+COPY oracle-instantclient*basic*.rpm /
 
 RUN apt-get -qq update && \
-    apt-get install --no-install-recommends -qq libaio1 rpm -y && rpm -Uvh --nodeps /oracle*rpm && \
+    apt-get -qq install --no-install-recommends -qq libaio1 rpm -y && rpm -Uvh --nodeps /oracle*rpm && \
     rm -f /oracle*rpm
 
-ENV LD_LIBRARY_PATH /usr/lib/oracle/12.2/client64/lib
+ENV LD_LIBRARY_PATH /usr/lib/oracle/18.3/client64/lib
 RUN echo $LD_LIBRARY_PATH >> /etc/ld.so.conf.d/oracle.conf && ldconfig
 
 COPY --from=build /go/src/oracledb_exporter/oracledb_exporter /oracledb_exporter
diff --git a/Makefile b/Makefile
index a608053..c66a5d9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,16 +1,13 @@
-VERSION := 0.2.0
+VERSION := 0.2.1
 LDFLAGS := -X main.Version=$(VERSION)
 GOFLAGS := -ldflags "$(LDFLAGS) -s -w"
 GOARCH ?= $(subst x86_64,amd64,$(patsubst i%86,386,$(shell uname -m)))
+ORA_RPM = oracle-instantclient18.3-devel-18.3.0.0.0-3.x86_64.rpm oracle-instantclient18.3-basic-18.3.0.0.0-3.x86_64.rpm
 
+%.rpm:
+	wget http://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/getPackage/$@
 
-oracle-instantclient12.2-basic-12.2.0.1.0-1.x86_64.rpm:
-	wget -q https://www.dropbox.com/s/f2ul3y0854y8oqw/oracle-instantclient12.2-basic-12.2.0.1.0-1.x86_64.rpm -O oracle-instantclient12.2-basic-12.2.0.1.0-1.x86_64.rpm
-
-oracle-instantclient12.2-devel-12.2.0.1.0-1.x86_64.rpm:
-	wget -q https://www.dropbox.com/s/qftd81ezcp8k9kd/oracle-instantclient12.2-devel-12.2.0.1.0-1.x86_64.rpm -O oracle-instantclient12.2-devel-12.2.0.1.0-1.x86_64.rpm
-
-prereq: oracle-instantclient12.2-basic-12.2.0.1.0-1.x86_64.rpm oracle-instantclient12.2-devel-12.2.0.1.0-1.x86_64.rpm
+prereq: $(ORA_RPM)
 	@echo deps
 	@sudo apt-get -qq update
 	@sudo apt-get install --no-install-recommends -qq libaio1 rpm
@@ -46,7 +43,7 @@ test:
 clean:
 	@rm -rf ./dist
 
-docker: oracle-instantclient12.2-basic-12.2.0.1.0-1.x86_64.rpm oracle-instantclient12.2-devel-12.2.0.1.0-1.x86_64.rpm
+docker:  $(ORA_RPM)
 	docker build --build-arg VERSION=$(VERSION) -t "iamseth/oracledb_exporter:$(VERSION)" .
 	docker tag iamseth/oracledb_exporter:$(VERSION) iamseth/oracledb_exporter:latest
 
diff --git a/oci8.pc b/oci8.pc
index 71a8f0d..b9234ab 100644
--- a/oci8.pc
+++ b/oci8.pc
@@ -1,7 +1,7 @@
-libdir=/usr/lib/oracle/12.2/client64/lib
-includedir=/usr/include/oracle/12.2/client64
+libdir=/usr/lib/oracle/18.3/client64/lib
+includedir=/usr/include/oracle/18.3/client64
 Name: oci8
 Description: oci8 library
-Version: 12.2
+Version: 18.3
 Cflags: -I${includedir}
 Libs: -L${libdir} -lclntsh