diff --git a/auth/permissions.py b/auth/permissions.py
index 5412bc7b7..c967aa046 100644
--- a/auth/permissions.py
+++ b/auth/permissions.py
@@ -66,6 +66,10 @@ def repository_write_grant(namespace, repository):
   return _RepositoryNeed(namespace, repository, 'write')
 
 
+def repository_admin_grant(namespace, repository):
+  return _RepositoryNeed(namespace, repository, 'admin')
+
+
 class QuayDeferredPermissionUser(Identity):
   def __init__(self, uuid, auth_type, auth_scopes, user=None):
     super(QuayDeferredPermissionUser, self).__init__(uuid, auth_type)
diff --git a/auth/registry_jwt_auth.py b/auth/registry_jwt_auth.py
index d49a7cbcf..a9e912e8b 100644
--- a/auth/registry_jwt_auth.py
+++ b/auth/registry_jwt_auth.py
@@ -8,7 +8,7 @@ from flask_principal import identity_changed, Identity
 
 from app import app, get_app_url, instance_keys
 from .auth_context import set_grant_context, get_grant_context
-from .permissions import repository_read_grant, repository_write_grant
+from .permissions import repository_read_grant, repository_write_grant, repository_admin_grant
 from util.names import parse_namespace_repository
 from util.http import abort
 from util.security.registry_jwt import (ANONYMOUS_SUB, decode_bearer_header,
@@ -50,6 +50,7 @@ ACCESS_SCHEMA = {
           'enum': [
             'push',
             'pull',
+            '*',
           ],
         },
       },
@@ -165,7 +166,9 @@ def identity_from_bearer_token(bearer_header):
     for grant in payload['access']:
       namespace, repo_name = parse_namespace_repository(grant['name'], lib_namespace)
 
-      if 'push' in grant['actions']:
+      if '*' in grant['actions']:
+        loaded_identity.provides.add(repository_admin_grant(namespace, repo_name))
+      elif 'push' in grant['actions']:
         loaded_identity.provides.add(repository_write_grant(namespace, repo_name))
       elif 'pull' in grant['actions']:
         loaded_identity.provides.add(repository_read_grant(namespace, repo_name))
diff --git a/test/test_registry_v2_auth.py b/test/test_registry_v2_auth.py
index 2e8779a81..bc5046463 100644
--- a/test/test_registry_v2_auth.py
+++ b/test/test_registry_v2_auth.py
@@ -71,37 +71,62 @@ class TestRegistryV2Auth(unittest.TestCase):
     self.assertEqual(0, len(identity.provides))
 
   def test_token_with_access(self):
-    access = [
-      {
-        'type': 'repository',
-        'name': 'somens/somerepo',
-        'actions': ['pull', 'push'],
-      }
+    valid_access = [
+      [
+        {
+          'type': 'repository',
+          'name': 'somens/somerepo',
+          'actions': ['pull', 'push'],
+        }
+      ],
+      [
+        {
+          'type': 'repository',
+          'name': 'somens/somerepo',
+          'actions': ['pull', '*'],
+        }
+      ],
+      [
+        {
+          'type': 'repository',
+          'name': 'somens/somerepo',
+          'actions': ['*', 'push'],
+        }
+      ],
+      [
+        {
+          'type': 'repository',
+          'name': 'somens/somerepo',
+          'actions': ['*'],
+        }
+      ],
+      [
+        {
+          'type': 'repository',
+          'name': 'somens/somerepo',
+          'actions': ['pull', '*', 'push'],
+        }
+      ],
     ]
-    token = self._generate_token(self._generate_token_data(access=access))
-    identity = self._parse_token(token)
-    self.assertEqual(identity.id, TEST_USER.username)
-    self.assertEqual(1, len(identity.provides))
-    
-  def test_token_with_admin_access(self):
-    access = [
-      {
-        'type': 'repository',
-        'name': 'somens/somerepo',
-        'actions': ['*'],
-      }
-    ]
-    token = self._generate_token(self._generate_token_data(access=access))
-    identity = self._parse_token(token)
-    self.assertEqual(identity.id, TEST_USER.username)
-    self.assertEqual(1, len(identity.provides))
+    for access in valid_access:
+      token = self._generate_token(self._generate_token_data(access=access))
+      identity = self._parse_token(token)
+      self.assertEqual(identity.id, TEST_USER.username)
+      self.assertEqual(1, len(identity.provides))
+      role = list(identity.provides)[0][3]
+      if "*" in access[0]['actions']:
+        self.assertEqual(role, 'admin')
+      elif "push" in access[0]['actions']:
+        self.assertEqual(role, 'write')
+      elif "pull" in access[0]['actions']:
+        self.assertEqual(role, 'read')
     
   def test_malformed_access(self):
     access = [
       {
         'toipe': 'repository',
         'namesies': 'somens/somerepo',
-        'akshuns': ['pull', 'push'],
+        'akshuns': ['pull', 'push', '*'],
       }
     ]
     token = self._generate_token(self._generate_token_data(access=access))