diff --git a/gateway/build.gradle b/gateway/build.gradle
index 684b40e..49f68da 100644
--- a/gateway/build.gradle
+++ b/gateway/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
 	ext {
-		springBootVersion = '2.1.1.RELEASE'
+		springBootVersion = '2.2.5.RELEASE'
 	}
 	repositories {
 		mavenCentral()
@@ -29,7 +29,7 @@ repositories {
 
 dependencyManagement {
 	imports {
-		mavenBom 'org.springframework.cloud:spring-cloud-dependencies:Greenwich.SR1'
+		mavenBom 'org.springframework.cloud:spring-cloud-dependencies:Hoxton.SR3'
 	}
 }
 
diff --git a/gateway/src/main/resources/application.yml b/gateway/src/main/resources/application.yml
index 1f967d1..d07b7a5 100644
--- a/gateway/src/main/resources/application.yml
+++ b/gateway/src/main/resources/application.yml
@@ -20,17 +20,16 @@ spring:
     oauth2:
       client:
         registration:
-          login-client:
-            provider: uaa
+          uaa:
             client-id: login-client
             client-secret: secret
             authorization-grant-type: authorization_code
-            redirect-uri-template: "{baseUrl}/login/oauth2/code/{registrationId}"
+            redirect-uri: "{baseUrl}/login/oauth2/code/login-client"
             scope: openid,profile,email,resource.read
         provider:
           uaa:
             authorization-uri: http://localhost:8090/uaa/oauth/authorize
             token-uri: http://localhost:8090/uaa/oauth/token
             user-info-uri: http://localhost:8090/uaa/userinfo
-            user-name-attribute: sub
+            userNameAttribute: sub
             jwk-set-uri: http://localhost:8090/uaa/token_keys
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 1498dd7..8ef0669 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.2-all.zip
diff --git a/resource-server/build.gradle b/resource-server/build.gradle
index f7b859d..515eb85 100644
--- a/resource-server/build.gradle
+++ b/resource-server/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
 	ext {
-		springBootVersion = '2.1.1.RELEASE'
+		springBootVersion = '2.2.5.RELEASE'
 	}
 	repositories {
 		mavenCentral()
diff --git a/uaa-server/build.gradle b/uaa-server/build.gradle
index 8b349b6..54ff29d 100644
--- a/uaa-server/build.gradle
+++ b/uaa-server/build.gradle
@@ -1,9 +1,12 @@
 buildscript {
     repositories {
         mavenCentral()
+        maven {
+            url "https://plugins.gradle.org/m2/"
+        }
     }
     dependencies {
-        classpath 'com.bmuschko:gradle-cargo-plugin:2.3'
+        classpath 'com.bmuschko:gradle-cargo-plugin:2.7.1'
     }
 }
 
@@ -39,7 +42,7 @@ cargoRunLocal.dependsOn downloadUAA
 task uaa(dependsOn: cargoRunLocal) {}
 
 cargo {
-    containerId = 'tomcat8x'
+    containerId = 'tomcat9x'
     port = 8090
 
     deployable {
@@ -50,8 +53,7 @@ cargo {
     local {
         outputFile = file("$buildDir/uaa-server.log")
         installer {
-            installUrl = 'https://www-us.apache.org/dist/tomcat/tomcat-8/v8.5.43/bin/apache-tomcat-8.5.43.zip'
-
+            installUrl = 'https://www-us.apache.org/dist/tomcat/tomcat-9/v9.0.33/bin/apache-tomcat-9.0.33.zip'
             downloadDir = file("$buildDir/download")
             extractDir = file("$buildDir/extract")
         }