diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/oauth2ClientProperties.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/oauth2ClientProperties.mustache
index 8e9f54d1fd4..792b3b279fe 100644
--- a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/oauth2ClientProperties.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/oauth2ClientProperties.mustache
@@ -2,7 +2,7 @@
 {{#isOAuth}}
 spring.security.oauth2.client.registration.{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}.enabled=false
 spring.security.oauth2.client.registration.{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}.client-id=set-{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}-client-id
-{{#scopes}}{{#-first}}spring.security.oauth2.client.registration.{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}.scopes={{/-first}}{{scope}}{{^-last}},{{/-last}}{{/scopes}}
+{{#scopes}}{{#-first}}spring.security.oauth2.client.registration.{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}.scope={{/-first}}{{scope}}{{^-last}},{{/-last}}{{/scopes}}
     {{#isCode}}
 spring.security.oauth2.client.registration.{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}.authorization-grant-type=authorization_code
 spring.security.oauth2.client.registration.{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}.redirect-uri=set-{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}-redirect-uri
diff --git a/samples/client/petstore/spring-cloud-feign-without-url/src/main/resources/oauth2-client.properties b/samples/client/petstore/spring-cloud-feign-without-url/src/main/resources/oauth2-client.properties
index 64716bf45f4..c0968e5d458 100644
--- a/samples/client/petstore/spring-cloud-feign-without-url/src/main/resources/oauth2-client.properties
+++ b/samples/client/petstore/spring-cloud-feign-without-url/src/main/resources/oauth2-client.properties
@@ -1,5 +1,5 @@
 spring.security.oauth2.client.registration.petstoreAuthImplicit.enabled=false
 spring.security.oauth2.client.registration.petstoreAuthImplicit.client-id=set-petstoreAuthImplicit-client-id
-spring.security.oauth2.client.registration.petstoreAuthImplicit.scopes=write:pets,read:pets
+spring.security.oauth2.client.registration.petstoreAuthImplicit.scope=write:pets,read:pets
 spring.security.oauth2.client.registration.petstoreAuthImplicit.authorization-grant-type=implicit
 spring.security.oauth2.client.provider.petstoreAuthImplicit.authorization-uri=http://petstore.swagger.io/api/oauth/dialog
diff --git a/samples/client/petstore/spring-cloud/src/main/resources/oauth2-client.properties b/samples/client/petstore/spring-cloud/src/main/resources/oauth2-client.properties
index 64716bf45f4..c0968e5d458 100644
--- a/samples/client/petstore/spring-cloud/src/main/resources/oauth2-client.properties
+++ b/samples/client/petstore/spring-cloud/src/main/resources/oauth2-client.properties
@@ -1,5 +1,5 @@
 spring.security.oauth2.client.registration.petstoreAuthImplicit.enabled=false
 spring.security.oauth2.client.registration.petstoreAuthImplicit.client-id=set-petstoreAuthImplicit-client-id
-spring.security.oauth2.client.registration.petstoreAuthImplicit.scopes=write:pets,read:pets
+spring.security.oauth2.client.registration.petstoreAuthImplicit.scope=write:pets,read:pets
 spring.security.oauth2.client.registration.petstoreAuthImplicit.authorization-grant-type=implicit
 spring.security.oauth2.client.provider.petstoreAuthImplicit.authorization-uri=http://petstore.swagger.io/api/oauth/dialog
diff --git a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/resources/oauth2-client.properties b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/resources/oauth2-client.properties
index 64716bf45f4..c0968e5d458 100644
--- a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/resources/oauth2-client.properties
+++ b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/resources/oauth2-client.properties
@@ -1,5 +1,5 @@
 spring.security.oauth2.client.registration.petstoreAuthImplicit.enabled=false
 spring.security.oauth2.client.registration.petstoreAuthImplicit.client-id=set-petstoreAuthImplicit-client-id
-spring.security.oauth2.client.registration.petstoreAuthImplicit.scopes=write:pets,read:pets
+spring.security.oauth2.client.registration.petstoreAuthImplicit.scope=write:pets,read:pets
 spring.security.oauth2.client.registration.petstoreAuthImplicit.authorization-grant-type=implicit
 spring.security.oauth2.client.provider.petstoreAuthImplicit.authorization-uri=http://petstore.swagger.io/api/oauth/dialog
diff --git a/samples/openapi3/client/petstore/spring-cloud-3/src/main/resources/oauth2-client.properties b/samples/openapi3/client/petstore/spring-cloud-3/src/main/resources/oauth2-client.properties
index 64716bf45f4..c0968e5d458 100644
--- a/samples/openapi3/client/petstore/spring-cloud-3/src/main/resources/oauth2-client.properties
+++ b/samples/openapi3/client/petstore/spring-cloud-3/src/main/resources/oauth2-client.properties
@@ -1,5 +1,5 @@
 spring.security.oauth2.client.registration.petstoreAuthImplicit.enabled=false
 spring.security.oauth2.client.registration.petstoreAuthImplicit.client-id=set-petstoreAuthImplicit-client-id
-spring.security.oauth2.client.registration.petstoreAuthImplicit.scopes=write:pets,read:pets
+spring.security.oauth2.client.registration.petstoreAuthImplicit.scope=write:pets,read:pets
 spring.security.oauth2.client.registration.petstoreAuthImplicit.authorization-grant-type=implicit
 spring.security.oauth2.client.provider.petstoreAuthImplicit.authorization-uri=http://petstore.swagger.io/api/oauth/dialog
diff --git a/samples/openapi3/client/petstore/spring-cloud-async/src/main/resources/oauth2-client.properties b/samples/openapi3/client/petstore/spring-cloud-async/src/main/resources/oauth2-client.properties
index 64716bf45f4..c0968e5d458 100644
--- a/samples/openapi3/client/petstore/spring-cloud-async/src/main/resources/oauth2-client.properties
+++ b/samples/openapi3/client/petstore/spring-cloud-async/src/main/resources/oauth2-client.properties
@@ -1,5 +1,5 @@
 spring.security.oauth2.client.registration.petstoreAuthImplicit.enabled=false
 spring.security.oauth2.client.registration.petstoreAuthImplicit.client-id=set-petstoreAuthImplicit-client-id
-spring.security.oauth2.client.registration.petstoreAuthImplicit.scopes=write:pets,read:pets
+spring.security.oauth2.client.registration.petstoreAuthImplicit.scope=write:pets,read:pets
 spring.security.oauth2.client.registration.petstoreAuthImplicit.authorization-grant-type=implicit
 spring.security.oauth2.client.provider.petstoreAuthImplicit.authorization-uri=http://petstore.swagger.io/api/oauth/dialog
diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/resources/oauth2-client.properties b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/resources/oauth2-client.properties
index 64716bf45f4..c0968e5d458 100644
--- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/resources/oauth2-client.properties
+++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/resources/oauth2-client.properties
@@ -1,5 +1,5 @@
 spring.security.oauth2.client.registration.petstoreAuthImplicit.enabled=false
 spring.security.oauth2.client.registration.petstoreAuthImplicit.client-id=set-petstoreAuthImplicit-client-id
-spring.security.oauth2.client.registration.petstoreAuthImplicit.scopes=write:pets,read:pets
+spring.security.oauth2.client.registration.petstoreAuthImplicit.scope=write:pets,read:pets
 spring.security.oauth2.client.registration.petstoreAuthImplicit.authorization-grant-type=implicit
 spring.security.oauth2.client.provider.petstoreAuthImplicit.authorization-uri=http://petstore.swagger.io/api/oauth/dialog