diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/KeystoneApi.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/KeystoneApi.java
index 0085f34c39..125b9ec155 100644
--- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/KeystoneApi.java
+++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/KeystoneApi.java
@@ -68,17 +68,17 @@ public interface KeystoneApi {
     * Provides synchronous access to Token features 
     */
    @Delegate
-   Optional<TokenApi> getTokenApi();
+   Optional<? extends TokenApi> getTokenApi();
 
    /** 
     * Provides synchronous access to User features 
     */
    @Delegate
-   Optional<UserApi> getUserApi();
+   Optional<? extends UserApi> getUserApi();
    
    /** 
     * Provides synchronous access to Tenant features 
     */
    @Delegate
-   Optional<TenantApi> getTenantApi();
+   Optional<? extends TenantApi> getTenantApi();
 }
diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/KeystoneAsyncApi.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/KeystoneAsyncApi.java
index 52ac90d88d..e751a40a70 100644
--- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/KeystoneAsyncApi.java
+++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/KeystoneAsyncApi.java
@@ -71,17 +71,17 @@ public interface KeystoneAsyncApi {
     * @see KeystoneApi#getTokenApi()
     */
    @Delegate
-   Optional<TokenAsyncApi> getTokenApi();
+   Optional<? extends TokenAsyncApi> getTokenApi();
 
    /**
     * @see KeystoneApi#getUserApi()
     */
    @Delegate
-   Optional<UserAsyncApi> getUserApi();
+   Optional<? extends UserAsyncApi> getUserApi();
 
    /**
     * @see KeystoneApi#getTenantApi()
     */
    @Delegate
-   Optional<TenantAsyncApi> getTenantApi();
+   Optional<? extends TenantAsyncApi> getTenantApi();
 }