diff --git a/Dockerfile b/Dockerfile
index 43f9eaa..5e34bad 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,19 +1,18 @@
 # Builder image
-FROM maven:3.5-jdk-8 as builder
-ENV MAVEN_OPTS=-Dmaven.repo.local=/srv/.m2/
+FROM maven:3.5-jdk-8-alpine as builder
 WORKDIR /srv/app/
 COPY pom.xml .
 RUN mvn -B -C -T 1C org.apache.maven.plugins:maven-dependency-plugin:3.0.2:go-offline
 COPY . .
 RUN mvn -B -o -T 1C package -DskipTests
 
 # Executor image
 FROM openjdk:8-jre-alpine
 ARG SERVICE_PORT
 COPY --from=builder /srv/app/target/*.jar \
 /srv/app/app.jar
 COPY ./src/main/resources/app-keystore.jks /srv/app/app-keystore.jks
 COPY ./src/main/resources/app-truststore.jks /srv/app/app-truststore.jks
 WORKDIR /srv/app/
 EXPOSE $SERVICE_PORT
 ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"]
diff --git a/pom.xml b/pom.xml
index 4e09e0d..c18914b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,75 +1,79 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.wikitolearn.gateway</groupId>
   <artifactId>pwa</artifactId>
-  <version>0.0.1-SNAPSHOT</version>
+  <version>0.0.2-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>PWAGateway</name>
   <description>Progressive Web App Gateway</description>
 
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>1.5.9.RELEASE</version>
-    <relativePath/> <!-- lookup parent from repository -->
+    <version>2.0.0.RELEASE</version>
+    <relativePath /> <!-- lookup parent from repository -->
   </parent>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <java.version>1.8</java.version>
-    <spring-cloud.version>Edgware.RELEASE</spring-cloud.version>
+    <spring-cloud.version>Finchley.M9</spring-cloud.version>
   </properties>
 
   <dependencies>
     <dependency>
       <groupId>org.springframework.cloud</groupId>
       <artifactId>spring-cloud-starter-security</artifactId>
     </dependency>
     <dependency>
       <groupId>org.springframework.cloud</groupId>
       <artifactId>spring-cloud-starter-oauth2</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.security.oauth.boot</groupId>
+      <artifactId>spring-security-oauth2-autoconfigure</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.springframework.cloud</groupId>
-      <artifactId>spring-cloud-starter-zuul</artifactId>
+      <artifactId>spring-cloud-starter-netflix-zuul</artifactId>
     </dependency>
-    
+
     <dependency>
       <groupId>org.projectlombok</groupId>
       <artifactId>lombok</artifactId>
+      <optional>true</optional>
     </dependency>
-
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-test</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>
 
   <dependencyManagement>
     <dependencies>
       <dependency>
         <groupId>org.springframework.cloud</groupId>
         <artifactId>spring-cloud-dependencies</artifactId>
         <version>${spring-cloud.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
     </dependencies>
   </dependencyManagement>
 
   <build>
     <plugins>
       <plugin>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-maven-plugin</artifactId>
       </plugin>
     </plugins>
   </build>
 
 </project>
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 7582096..b038b08 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,52 +1,49 @@
 # Spring properties
 spring:
   application:
     name: PWAGateway
   output:
     ansi:
       enabled: DETECT
 
 # Zuul properties
 zuul:
   sslHostnameValidationEnabled: false
   prefix: /api/v1
   sensitive-headers: Cookie,Set-Cookie
   routes:
     courses:
       url: ${COURSE_MIDTIER_URI}/courses
       path: /courses/**
     pages:
       url: ${COURSE_MIDTIER_URI}/pages
       path: /pages/**
 
 # Security properties
 security:
-    basic:
-        enabled: false
     oauth2:
         resource:
-            filter-order: 3
             user-info-uri: ${KEYCLOAK_URI}/auth/realms/${KEYCLOAK_AUTH_REALM}/protocol/openid-connect/userinfo
             token-info-uri: ${KEYCLOAK_URI}/auth/realms/${KEYCLOAK_AUTH_REALM}/protocol/openid-connect/token/introspect
             prefer-token-info: false
             jwt:
                 key-uri: ${KEYCLOAK_URI}/auth/realms/${KEYCLOAK_AUTH_REALM}
 
 # Loggin properties
 logging:
   pattern:
      file: '%d{"yyyy-MM-dd HH:mm:ss,SSS"} %-5level [%c] \(%thread\) : %msg%n'
      console: '%d{"yyyy-MM-dd HH:mm:ss,SSS"} %-5level [%c] \(%thread\) : %msg%n'
 
 # Server properties
 server:
   port: ${SERVICE_PORT}
   ssl:
     enabled: ${SSL_ENABLED}
     key-store: file:./app-keystore.jks
     key-store-password: changeme
     key-alias: client
     key-password: changeme
     trust-store: file:./app-truststore.jks
     trust-store-password: changeme
     client-auth: ${MTLS_STATUS}
\ No newline at end of file