diff --git a/app/models/container_repository.rb b/app/models/container_repository.rb
index b128069ca0e2045a4941d4e3ff3ef92209c00de8..98acf49c939ef1d5cd704edb523b7b2a8ce21043 100644
--- a/app/models/container_repository.rb
+++ b/app/models/container_repository.rb
@@ -58,11 +58,4 @@ class ContainerRepository < ActiveRecord::Base
       client.delete_repository_tag(self.path, digest)
     end
   end
-
-  # TODO, we will return a new ContainerRepository object here
-  #
-  def self.project_from_path(repository_path)
-    ContainerRegistry::Path.new(repository_path)
-      .repository_project
-  end
 end
diff --git a/app/services/auth/container_registry_authentication_service.rb b/app/services/auth/container_registry_authentication_service.rb
index 3d151c6a357681109b83c78704f0fe865232c33b..7a2ec9664c1ae409f9e2eafdb73bf8c987eeed24 100644
--- a/app/services/auth/container_registry_authentication_service.rb
+++ b/app/services/auth/container_registry_authentication_service.rb
@@ -56,13 +56,15 @@ module Auth
     def process_scope(scope)
       type, name, actions = scope.split(':', 3)
       actions = actions.split(',')
+      path = ContainerRegistry::Path.new(name)
+
       return unless type == 'repository'
 
-      process_repository_access(type, name, actions)
+      process_repository_access(type, path, actions)
     end
 
-    def process_repository_access(type, name, actions)
-      requested_project = ContainerRepository.project_from_path(name)
+    def process_repository_access(type, path, actions)
+      requested_project = path.repository_project
 
       return unless requested_project
 
@@ -70,7 +72,9 @@ module Auth
         can_access?(requested_project, action)
       end
 
-      { type: type, name: name, actions: actions } if actions.present?
+      return unless actions.present?
+
+      { type: type, name: path.to_s, actions: actions }
     end
 
     def can_access?(requested_project, requested_action)
diff --git a/spec/lib/container_registry/path_spec.rb b/spec/lib/container_registry/path_spec.rb
index a680a0adcb23d2cf65adfcdc3516bf0ffa70435a..6384850eb1907a570ae66fdbf082b1ff7bee739f 100644
--- a/spec/lib/container_registry/path_spec.rb
+++ b/spec/lib/container_registry/path_spec.rb
@@ -9,8 +9,8 @@ describe ContainerRegistry::Path do
 
       it 'return all project-like components in reverse order' do
         expect(subject.components).to eq %w[path/to/some/project
-                                         path/to/some
-                                         path/to]
+                                            path/to/some
+                                            path/to]
       end
     end