diff --git a/ee/lib/gitlab/ci/reports/security/locations/container_scanning.rb b/ee/lib/gitlab/ci/reports/security/locations/container_scanning.rb
index f8aff9b5431ea9386ae4b311b4ac0d55f3daf294..021734ce877dd4edc7f7e3d85df283d4f79f5664 100644
--- a/ee/lib/gitlab/ci/reports/security/locations/container_scanning.rb
+++ b/ee/lib/gitlab/ci/reports/security/locations/container_scanning.rb
@@ -41,10 +41,11 @@ def image_with_package_name
 
             def docker_image_name_without_tag(image_name = prepare_image_name)
               base_name, _, version = image_name.rpartition(':')
-
-              return image_name if version_semver_like?(version)
-
-              base_name
+              if base_name.empty? || version_semver_like?(version)
+                image_name
+              else
+                base_name
+              end
             end
 
             def prepare_image_name
diff --git a/ee/spec/lib/gitlab/ci/reports/security/locations/container_scanning_spec.rb b/ee/spec/lib/gitlab/ci/reports/security/locations/container_scanning_spec.rb
index faf9e51a9fddb240c10b9cf017dfb5b4eec348f2..a02054ba13db42f8b7bc12964128c7afab9940fe 100644
--- a/ee/spec/lib/gitlab/ci/reports/security/locations/container_scanning_spec.rb
+++ b/ee/spec/lib/gitlab/ci/reports/security/locations/container_scanning_spec.rb
@@ -137,7 +137,10 @@
         [
           'registry.gitlab.com/group/project/feature:latest',
           'registry.gitlab.com/group/project/feature:glibc'
-        ]
+        ],
+        ['alpine', 'alpine:glibc'],
+        ['myregistry.com/myimage', 'myregistry.com/myimage:glibc'],
+        ['alpine.tar', 'alpine.tar:glibc']
       ]
     end