diff --git a/pom.xml b/pom.xml
index fab53fb..30336c6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.1.1.RELEASE</version>
+		<version>2.3.2.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.example</groupId>
@@ -15,7 +15,7 @@
 
 	<properties>
 		<java.version>1.8</java.version>
-		<spring-cloud.version>Greenwich.SR2</spring-cloud.version>
+		<spring-cloud.version>Hoxton.SR6</spring-cloud.version>
 	</properties>
 
 	<dependencies>
diff --git a/src/main/java/com/example/template/JwkSetEndpointConfiguration.java b/src/main/java/com/example/template/JwkSetEndpointConfiguration.java
deleted file mode 100644
index b2d7e88..0000000
--- a/src/main/java/com/example/template/JwkSetEndpointConfiguration.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.example.template;
-
-import com.nimbusds.jose.jwk.JWKSet;
-import com.nimbusds.jose.jwk.RSAKey;
-import org.springframework.security.oauth2.provider.endpoint.FrameworkEndpoint;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.security.KeyPair;
-import java.security.Principal;
-import java.security.interfaces.RSAPublicKey;
-import java.util.Map;
-
-@FrameworkEndpoint
-@RestController
-public class JwkSetEndpointConfiguration {
-    KeyPair keyPair;
-
-    public JwkSetEndpointConfiguration(KeyPair keyPair) {
-        this.keyPair = keyPair;
-    }
-
-    @GetMapping("/.well-known/jwks.json")
-    @ResponseBody
-    public Map<String, Object> getKey(Principal principal) {
-        RSAPublicKey publicKey = (RSAPublicKey) this.keyPair.getPublic();
-        RSAKey key = new RSAKey.Builder(publicKey).build();
-        return new JWKSet(key).toJSONObject();
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/com/example/template/ResourceServerConfiguration.java b/src/main/java/com/example/template/ResourceServerConfiguration.java
index a79b23e..7548fdc 100644
--- a/src/main/java/com/example/template/ResourceServerConfiguration.java
+++ b/src/main/java/com/example/template/ResourceServerConfiguration.java
@@ -1,17 +1,14 @@
 package com.example.template;
+
 import org.springframework.cloud.gateway.config.GlobalCorsProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.core.io.ClassPathResource;
 import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity;
 import org.springframework.security.config.web.server.ServerHttpSecurity;
-import org.springframework.security.oauth2.provider.token.store.KeyStoreKeyFactory;
 import org.springframework.security.web.server.SecurityWebFilterChain;
 import org.springframework.web.cors.reactive.CorsConfigurationSource;
 import org.springframework.web.cors.reactive.UrlBasedCorsConfigurationSource;
 
-import java.security.KeyPair;
-
 @Configuration
 @EnableWebFluxSecurity
 public class ResourceServerConfiguration {
@@ -41,14 +38,4 @@ public class ResourceServerConfiguration {
                 .forEach(source::registerCorsConfiguration);
         return source;
     }
-
-    @Bean
-    public KeyPair makeKeyPair(){
-        KeyPair keyPair = new KeyStoreKeyFactory(
-                new ClassPathResource("server.jks"), "qweqwe".toCharArray())
-                .getKeyPair("uengine", "qweqwe".toCharArray());
-        return keyPair;
-    }
-
-
 }
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index b14fd20..2294a7d 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -9,7 +9,7 @@ spring:
     oauth2:
       resourceserver:
         jwt:
-          jwk-set-uri: http://localhost:8088/.well-known/jwks.json
+          jwk-set-uri: http://localhost:8090/.well-known/jwks.json
   cloud:
     gateway:
       routes:
@@ -56,7 +56,7 @@ spring:
     oauth2:
       resourceserver:
         jwt:
-          jwk-set-uri: http://localhost:8080/.well-known/jwks.json
+          jwk-set-uri: http://oauth:8080/.well-known/jwks.json
   cloud:
     gateway:
       routes:
diff --git a/src/main/resources/server.jks b/src/main/resources/server.jks
deleted file mode 100644
index ad255a9..0000000
Binary files a/src/main/resources/server.jks and /dev/null differ