diff --git a/example/internal/mock/storage.go b/example/internal/mock/storage.go
index fc21e4c..d5c0682 100644
--- a/example/internal/mock/storage.go
+++ b/example/internal/mock/storage.go
@@ -174,21 +174,9 @@ func (s *AuthStorage) GetKeySet(_ context.Context) (*jose.JSONWebKeySet, error)
 		},
 	}, nil
 }
-func (s *AuthStorage) GetKeyByID(_ context.Context, _ string) (*jose.JSONWebKeySet, error) {
+func (s *AuthStorage) GetKeyByIDAndUserID(_ context.Context, _, _ string) (*jose.JSONWebKey, error) {
 	pubkey := s.key.Public()
-	return &jose.JSONWebKeySet{
-		Keys: []jose.JSONWebKey{
-			{Key: pubkey, Use: "sig", Algorithm: "RS256", KeyID: "1"},
-		},
-	}, nil
-}
-func (s *AuthStorage) GetKeysByServiceAccount(_ context.Context, _ string) (*jose.JSONWebKeySet, error) {
-	pubkey := s.key.Public()
-	return &jose.JSONWebKeySet{
-		Keys: []jose.JSONWebKey{
-			{Key: pubkey, Use: "sig", Algorithm: "RS256", KeyID: "1"},
-		},
-	}, nil
+	return &jose.JSONWebKey{Key: pubkey, Use: "sig", Algorithm: "RS256", KeyID: "1"}, nil
 }
 
 func (s *AuthStorage) GetClientByClientID(_ context.Context, id string) (op.Client, error) {
diff --git a/pkg/op/mock/storage.mock.go b/pkg/op/mock/storage.mock.go
index f71a996..a7ca4cb 100644
--- a/pkg/op/mock/storage.mock.go
+++ b/pkg/op/mock/storage.mock.go
@@ -141,19 +141,19 @@ func (mr *MockStorageMockRecorder) GetClientByClientID(arg0, arg1 interface{}) *
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetClientByClientID", reflect.TypeOf((*MockStorage)(nil).GetClientByClientID), arg0, arg1)
 }
 
-// GetKeyByID mocks base method
-func (m *MockStorage) GetKeyByID(arg0 context.Context, arg1 string) (*jose.JSONWebKeySet, error) {
+// GetKeyByIDAndUserID mocks base method
+func (m *MockStorage) GetKeyByIDAndUserID(arg0 context.Context, arg1, arg2 string) (*jose.JSONWebKey, error) {
 	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "GetKeyByID", arg0, arg1)
-	ret0, _ := ret[0].(*jose.JSONWebKeySet)
+	ret := m.ctrl.Call(m, "GetKeyByIDAndUserID", arg0, arg1, arg2)
+	ret0, _ := ret[0].(*jose.JSONWebKey)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
-// GetKeyByID indicates an expected call of GetKeyByID
-func (mr *MockStorageMockRecorder) GetKeyByID(arg0, arg1 interface{}) *gomock.Call {
+// GetKeyByIDAndUserID indicates an expected call of GetKeyByIDAndUserID
+func (mr *MockStorageMockRecorder) GetKeyByIDAndUserID(arg0, arg1, arg2 interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetKeyByID", reflect.TypeOf((*MockStorage)(nil).GetKeyByID), arg0, arg1)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetKeyByIDAndUserID", reflect.TypeOf((*MockStorage)(nil).GetKeyByIDAndUserID), arg0, arg1, arg2)
 }
 
 // GetKeySet mocks base method