diff --git a/src/main/java/com/cloudbees/hudson/plugins/folder/properties/AuthorizationMatrixProperty.java b/src/main/java/com/cloudbees/hudson/plugins/folder/properties/AuthorizationMatrixProperty.java
index 38501021..4b7dba85 100644
--- a/src/main/java/com/cloudbees/hudson/plugins/folder/properties/AuthorizationMatrixProperty.java
+++ b/src/main/java/com/cloudbees/hudson/plugins/folder/properties/AuthorizationMatrixProperty.java
@@ -75,7 +75,7 @@
  * Holds ACL for {@link ProjectMatrixAuthorizationStrategy}.
  */
 public class AuthorizationMatrixProperty extends AbstractFolderProperty<AbstractFolder<?>>
-        implements AuthorizationProperty {
+        implements AuthorizationProperty<AbstractFolderProperty<?>> {
 
     private final transient SidACL acl = new AclImpl();
 
diff --git a/src/main/java/hudson/security/AuthorizationMatrixProperty.java b/src/main/java/hudson/security/AuthorizationMatrixProperty.java
index da88602f..90bd2887 100644
--- a/src/main/java/hudson/security/AuthorizationMatrixProperty.java
+++ b/src/main/java/hudson/security/AuthorizationMatrixProperty.java
@@ -78,7 +78,8 @@
  * Once created (and initialized), this object becomes immutable.
  */
 // TODO attempt to make this OptionalJobProperty
-public class AuthorizationMatrixProperty extends JobProperty<Job<?, ?>> implements AuthorizationProperty {
+public class AuthorizationMatrixProperty extends JobProperty<Job<?, ?>>
+        implements AuthorizationProperty<JobProperty<?>> {
 
     private final transient SidACL acl = new AclImpl();
 
diff --git a/src/main/java/hudson/security/GlobalMatrixAuthorizationStrategy.java b/src/main/java/hudson/security/GlobalMatrixAuthorizationStrategy.java
index 1bbc387b..de13161f 100644
--- a/src/main/java/hudson/security/GlobalMatrixAuthorizationStrategy.java
+++ b/src/main/java/hudson/security/GlobalMatrixAuthorizationStrategy.java
@@ -62,7 +62,8 @@
  * Role-based authorization via a matrix.
  */
 // TODO: think about the concurrency commitment of this class
-public class GlobalMatrixAuthorizationStrategy extends AuthorizationStrategy implements AuthorizationContainer {
+public class GlobalMatrixAuthorizationStrategy extends AuthorizationStrategy
+        implements AuthorizationContainer<AuthorizationStrategy> {
     private final transient SidACL acl = new AclImpl();
 
     /**
diff --git a/src/main/java/org/jenkinsci/plugins/matrixauth/AmbiguityMonitor.java b/src/main/java/org/jenkinsci/plugins/matrixauth/AmbiguityMonitor.java
index 5ce95801..1484b703 100644
--- a/src/main/java/org/jenkinsci/plugins/matrixauth/AmbiguityMonitor.java
+++ b/src/main/java/org/jenkinsci/plugins/matrixauth/AmbiguityMonitor.java
@@ -234,7 +234,7 @@ public void onDeleted(Item item) {
         }
     }
 
-    public static boolean hasAmbiguousEntries(final AuthorizationContainer container) {
+    public static boolean hasAmbiguousEntries(final AuthorizationContainer<?> container) {
         if (container == null) {
             return false;
         }
diff --git a/src/main/java/org/jenkinsci/plugins/matrixauth/AuthorizationContainer.java b/src/main/java/org/jenkinsci/plugins/matrixauth/AuthorizationContainer.java
index 287ea9fd..e96aa271 100644
--- a/src/main/java/org/jenkinsci/plugins/matrixauth/AuthorizationContainer.java
+++ b/src/main/java/org/jenkinsci/plugins/matrixauth/AuthorizationContainer.java
@@ -24,7 +24,7 @@
 package org.jenkinsci.plugins.matrixauth;
 
 import hudson.init.InitMilestone;
-import hudson.model.Descriptor;
+import hudson.model.Describable;
 import hudson.security.AuthorizationStrategy;
 import hudson.security.GlobalMatrixAuthorizationStrategy;
 import hudson.security.Permission;
@@ -48,7 +48,7 @@
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 
 @Restricted(NoExternalUse.class)
-public interface AuthorizationContainer {
+public interface AuthorizationContainer<T extends Describable<T>> extends Describable<T> {
 
     Logger LOGGER = Logger.getLogger(AuthorizationContainer.class.getName());
 
@@ -171,9 +171,6 @@ default Map<Permission, Set<String>> getGrantedPermissions() {
      */
     void recordGroup(String sid);
 
-    @SuppressWarnings("rawtypes")
-    Descriptor getDescriptor();
-
     /**
      * Works like {@link #add(Permission, PermissionEntry)} but takes both parameters
      * from a single string of the form <code>PERMISSION_ID:sid</code> (legacy format, implicit 'EITHER' type)
diff --git a/src/main/java/org/jenkinsci/plugins/matrixauth/AuthorizationContainerDescriptor.java b/src/main/java/org/jenkinsci/plugins/matrixauth/AuthorizationContainerDescriptor.java
index 4598fb2d..589b3129 100644
--- a/src/main/java/org/jenkinsci/plugins/matrixauth/AuthorizationContainerDescriptor.java
+++ b/src/main/java/org/jenkinsci/plugins/matrixauth/AuthorizationContainerDescriptor.java
@@ -112,7 +112,7 @@ default boolean showPermission(Permission p) {
     }
 
     @Restricted(DoNotUse.class) // Jelly only
-    default boolean hasAmbiguousEntries(AuthorizationContainer container) {
+    default boolean hasAmbiguousEntries(AuthorizationContainer<?> container) {
         if (container == null) {
             return false;
         }
diff --git a/src/main/java/org/jenkinsci/plugins/matrixauth/AuthorizationMatrixNodeProperty.java b/src/main/java/org/jenkinsci/plugins/matrixauth/AuthorizationMatrixNodeProperty.java
index 507d6f9c..67e2e51b 100644
--- a/src/main/java/org/jenkinsci/plugins/matrixauth/AuthorizationMatrixNodeProperty.java
+++ b/src/main/java/org/jenkinsci/plugins/matrixauth/AuthorizationMatrixNodeProperty.java
@@ -59,7 +59,8 @@
 import org.kohsuke.stapler.QueryParameter;
 import org.kohsuke.stapler.StaplerRequest2;
 
-public class AuthorizationMatrixNodeProperty extends NodeProperty<Node> implements AuthorizationProperty {
+public class AuthorizationMatrixNodeProperty extends NodeProperty<Node>
+        implements AuthorizationProperty<NodeProperty<?>> {
 
     private final transient SidACL acl = new AclImpl();
 
diff --git a/src/main/java/org/jenkinsci/plugins/matrixauth/AuthorizationProperty.java b/src/main/java/org/jenkinsci/plugins/matrixauth/AuthorizationProperty.java
index 2ad66bd9..53eefee5 100644
--- a/src/main/java/org/jenkinsci/plugins/matrixauth/AuthorizationProperty.java
+++ b/src/main/java/org/jenkinsci/plugins/matrixauth/AuthorizationProperty.java
@@ -48,7 +48,7 @@
 import org.kohsuke.stapler.DataBoundConstructor;
 
 @Restricted(NoExternalUse.class)
-public interface AuthorizationProperty extends AuthorizationContainer {
+public interface AuthorizationProperty<T extends Describable<T>> extends AuthorizationContainer<T> {
 
     void setInheritanceStrategy(InheritanceStrategy inheritanceStrategy);