diff --git a/lib/gitlab/build/info/ci.rb b/lib/gitlab/build/info/ci.rb
index 732b6ee31..3ba930df9 100644
--- a/lib/gitlab/build/info/ci.rb
+++ b/lib/gitlab/build/info/ci.rb
@@ -56,13 +56,13 @@ module Build
             # In EL world, amd64 is called x86_64
             arch = 'x86_64' if arch == 'amd64'
             folder = 'el-8'
-            package_file_name = "#{Info::Package.name}-#{Info::Package.release_version.gsub('+', '%2B')}.el8.#{arch}.rpm"
+            package_file_name = "#{Info::Package.name(fips: fips)}-#{Info::Package.release_version(fips: fips).gsub('+', '%2B')}.el8.#{arch}.rpm"
           when /Ubuntu-20.04/
             folder = 'ubuntu-focal'
-            package_file_name = "#{Info::Package.name}_#{Info::Package.release_version.gsub('+', '%2B')}_#{arch}.deb"
+            package_file_name = "#{Info::Package.name(fips: fips)}_#{Info::Package.release_version(fips: fips).gsub('+', '%2B')}_#{arch}.deb"
           when /Ubuntu-22.04/
             folder = 'ubuntu-jammy'
-            package_file_name = "#{Info::Package.name}_#{Info::Package.release_version.gsub('+', '%2B')}_#{arch}.deb"
+            package_file_name = "#{Info::Package.name(fips: fips)}_#{Info::Package.release_version(fips: fips).gsub('+', '%2B')}_#{arch}.deb"
           end
 
           if arch == 'arm64'
@@ -70,7 +70,10 @@ module Build
             folder = "#{folder}_aarch64"
           end
 
-          job_name = "#{job_name}-fips" if fips
+          if fips
+            job_name = "#{job_name}-fips"
+            folder = "#{folder}_fips"
+          end
 
           job_name = "#{job_name}-branch" unless Build::Info::CI.tag_name