diff --git a/cloudfoundry-client/src/main/java/org/cloudfoundry/uaa/identityzones/_IdentityZoneConfiguration.java b/cloudfoundry-client/src/main/java/org/cloudfoundry/uaa/identityzones/_IdentityZoneConfiguration.java
index 0c98a54a24..87a7544c66 100644
--- a/cloudfoundry-client/src/main/java/org/cloudfoundry/uaa/identityzones/_IdentityZoneConfiguration.java
+++ b/cloudfoundry-client/src/main/java/org/cloudfoundry/uaa/identityzones/_IdentityZoneConfiguration.java
@@ -65,6 +65,13 @@ abstract class _IdentityZoneConfiguration {
     @Nullable
     abstract CorsPolicy getCorsPolicy();
 
+    /**
+     * The default identity provider
+     */
+    @JsonProperty("defaultIdentityProvider")
+    @Nullable
+    abstract String getDefaultIdentityProvider();
+
     /**
      * The issuer of this zone
      */
diff --git a/integration-test/src/test/java/org/cloudfoundry/IntegrationTestConfiguration.java b/integration-test/src/test/java/org/cloudfoundry/IntegrationTestConfiguration.java
index 78ad9d57d2..4727cef21a 100644
--- a/integration-test/src/test/java/org/cloudfoundry/IntegrationTestConfiguration.java
+++ b/integration-test/src/test/java/org/cloudfoundry/IntegrationTestConfiguration.java
@@ -197,7 +197,9 @@ ReactorUaaClient adminUaaClient(
     @Bean(initMethod = "block")
     @DependsOn("cloudFoundryCleaner")
     Mono<Tuple2<String, String>> client(
-            @Qualifier("admin") UaaClient uaaClient, String clientId, String clientSecret) {
+            @Qualifier("admin") UaaClient uaaClient,
+            @Qualifier("clientId") String clientId,
+            @Qualifier("clientSecret") String clientSecret) {
         return uaaClient
                 .clients()
                 .create(
@@ -235,7 +237,7 @@ CloudFoundryCleaner cloudFoundryCleaner(
             @Qualifier("admin") CloudFoundryClient cloudFoundryClient,
             NameFactory nameFactory,
             @Qualifier("admin") NetworkingClient networkingClient,
-            Version serverVersion,
+            @Qualifier("serverVersion") Version serverVersion,
             @Qualifier("admin") UaaClient uaaClient) {
 
         return new CloudFoundryCleaner(
@@ -243,6 +245,7 @@ CloudFoundryCleaner cloudFoundryCleaner(
     }
 
     @Bean
+    @Qualifier("nonAdmin")
     ReactorCloudFoundryClient cloudFoundryClient(
             ConnectionContext connectionContext, TokenProvider tokenProvider) {
         return ReactorCloudFoundryClient.builder()
@@ -253,14 +256,14 @@ ReactorCloudFoundryClient cloudFoundryClient(
 
     @Bean
     DefaultCloudFoundryOperations cloudFoundryOperations(
-            CloudFoundryClient cloudFoundryClient,
+            @Qualifier("nonAdmin") CloudFoundryClient cloudFoundryClient,
             DopplerClient dopplerClient,
             LogCacheClient logCacheClient,
-            NetworkingClient networkingClient,
+            @Qualifier("nonAdmin") NetworkingClient networkingClient,
             RoutingClient routingClient,
-            UaaClient uaaClient,
-            String organizationName,
-            String spaceName) {
+            @Qualifier("nonAdmin") UaaClient uaaClient,
+            @Qualifier("organizationName") String organizationName,
+            @Qualifier("spaceName") String spaceName) {
         return DefaultCloudFoundryOperations.builder()
                 .cloudFoundryClient(cloudFoundryClient)
                 .dopplerClient(dopplerClient)
@@ -335,7 +338,9 @@ RandomNameFactory nameFactory(Random random) {
     @Bean(initMethod = "block")
     @DependsOn("cloudFoundryCleaner")
     Mono<String> metricRegistrarServiceInstance(
-            CloudFoundryClient cloudFoundryClient, Mono<String> spaceId, NameFactory nameFactory) {
+            @Qualifier("nonAdmin") CloudFoundryClient cloudFoundryClient,
+            @Qualifier("spaceId") Mono<String> spaceId,
+            NameFactory nameFactory) {
         return spaceId.flatMap(
                         spaceIdValue ->
                                 cloudFoundryClient
@@ -351,6 +356,7 @@ Mono<String> metricRegistrarServiceInstance(
     }
 
     @Bean
+    @Qualifier("nonAdmin")
     NetworkingClient networkingClient(
             ConnectionContext connectionContext, TokenProvider tokenProvider) {
         return ReactorNetworkingClient.builder()
@@ -362,10 +368,10 @@ NetworkingClient networkingClient(
     @Bean(initMethod = "block")
     @DependsOn("cloudFoundryCleaner")
     Mono<String> organizationId(
-            CloudFoundryClient cloudFoundryClient,
-            String organizationName,
-            String organizationQuotaName,
-            Mono<String> userId) {
+            @Qualifier("nonAdmin") CloudFoundryClient cloudFoundryClient,
+            @Qualifier("organizationName") String organizationName,
+            @Qualifier("organizationQuotaName") String organizationQuotaName,
+            @Qualifier("userId") Mono<String> userId) {
         return userId.flatMap(
                         userId1 ->
                                 cloudFoundryClient
@@ -463,12 +469,12 @@ Version serverVersion(@Qualifier("admin") CloudFoundryClient cloudFoundryClient)
     @Bean(initMethod = "block")
     @DependsOn("cloudFoundryCleaner")
     Mono<String> serviceBrokerId(
-            CloudFoundryClient cloudFoundryClient,
+            @Qualifier("nonAdmin") CloudFoundryClient cloudFoundryClient,
             NameFactory nameFactory,
-            String planName,
-            String serviceBrokerName,
-            String serviceName,
-            Mono<String> spaceId) {
+            @Qualifier("planName") String planName,
+            @Qualifier("serviceBrokerName") String serviceBrokerName,
+            @Qualifier("serviceName") String serviceName,
+            @Qualifier("spaceId") Mono<String> spaceId) {
         return spaceId.flatMap(
                         spaceId1 ->
                                 ServiceBrokerUtils.createServiceBroker(
@@ -505,7 +511,9 @@ String serviceName(NameFactory nameFactory) {
     @Bean(initMethod = "block")
     @DependsOn("cloudFoundryCleaner")
     Mono<String> spaceId(
-            CloudFoundryClient cloudFoundryClient, Mono<String> organizationId, String spaceName) {
+            @Qualifier("nonAdmin") CloudFoundryClient cloudFoundryClient,
+            @Qualifier("organizationId") Mono<String> organizationId,
+            @Qualifier("spaceName") String spaceName) {
         return organizationId
                 .flatMap(
                         orgId ->
@@ -530,7 +538,9 @@ String spaceName(NameFactory nameFactory) {
 
     @Bean(initMethod = "block")
     @DependsOn("cloudFoundryCleaner")
-    Mono<String> stackId(CloudFoundryClient cloudFoundryClient, String stackName) {
+    Mono<String> stackId(
+            @Qualifier("nonAdmin") CloudFoundryClient cloudFoundryClient,
+            @Qualifier("stackName") String stackName) {
         return PaginationUtils.requestClientV2Resources(
                         page ->
                                 cloudFoundryClient
@@ -556,11 +566,12 @@ String stackName() {
     @Bean(initMethod = "block")
     @DependsOn("cloudFoundryCleaner")
     Mono<ApplicationUtils.ApplicationMetadata> testLogCacheApp(
-            CloudFoundryClient cloudFoundryClient,
-            Mono<String> spaceId,
-            Mono<String> metricRegistrarServiceInstance,
-            String testLogCacheAppName,
-            String testLogCacheHostName,
+            @Qualifier("nonAdmin") CloudFoundryClient cloudFoundryClient,
+            @Qualifier("spaceId") Mono<String> spaceId,
+            @Qualifier("metricRegistrarServiceInstance")
+                    Mono<String> metricRegistrarServiceInstance,
+            @Qualifier("testLogCacheAppName") String testLogCacheAppName,
+            @Qualifier("testLogCacheHostName") String testLogCacheHostName,
             Path testLogCacheAppbits) {
         return metricRegistrarServiceInstance
                 .zipWith(spaceId)
@@ -607,7 +618,10 @@ String testLogCacheHostName(NameFactory nameFactory) {
     @Bean
     @DependsOn({"client", "userId"})
     PasswordGrantTokenProvider tokenProvider(
-            String clientId, String clientSecret, String password, String username) {
+            @Qualifier("clientId") String clientId,
+            @Qualifier("clientSecret") String clientSecret,
+            @Qualifier("password") String password,
+            @Qualifier("username") String username) {
         return PasswordGrantTokenProvider.builder()
                 .clientId(clientId)
                 .clientSecret(clientSecret)
@@ -617,6 +631,7 @@ PasswordGrantTokenProvider tokenProvider(
     }
 
     @Bean
+    @Qualifier("nonAdmin")
     ReactorUaaClient uaaClient(ConnectionContext connectionContext, TokenProvider tokenProvider) {
         return ReactorUaaClient.builder()
                 .connectionContext(connectionContext)
@@ -626,7 +641,10 @@ ReactorUaaClient uaaClient(ConnectionContext connectionContext, TokenProvider to
 
     @Bean(initMethod = "block")
     @DependsOn("cloudFoundryCleaner")
-    Mono<String> userId(@Qualifier("admin") UaaClient uaaClient, String password, String username) {
+    Mono<String> userId(
+            @Qualifier("admin") UaaClient uaaClient,
+            @Qualifier("password") String password,
+            @Qualifier("username") String username) {
         return uaaClient
                 .users()
                 .create(