diff --git a/src/ImageBuilder.Tests/AnnotateEolDigestsCommandTests.cs b/src/ImageBuilder.Tests/AnnotateEolDigestsCommandTests.cs
index 39701a638..add6963a1 100644
--- a/src/ImageBuilder.Tests/AnnotateEolDigestsCommandTests.cs
+++ b/src/ImageBuilder.Tests/AnnotateEolDigestsCommandTests.cs
@@ -145,11 +145,12 @@ private AnnotateEolDigestsCommand InitializeCommand(
             AnnotateEolDigestsCommand command = new(
                 loggerServiceMock.Object,
                 lifecycleMetadataServiceMock.Object,
-                Mock.Of<IRegistryCredentialsProvider>());
+                Mock.Of<IRegistryCredentialsProvider>(),
+                TestHelper.CreateArtifactService(tempFolderContext.Path));
             command.Options.RepoPrefix = RepoPrefix;
             command.Options.AcrName = AcrName;
             command.Options.EolDigestsListPath = eolDigestsListPath;
-            command.Options.AnnotationDigestsOutputPath = Path.Combine(tempFolderContext.Path, AnnotationsOutputPath);
+            command.Options.AnnotationDigestsOutputPath = AnnotationsOutputPath;
             return command;
         }
 
diff --git a/src/ImageBuilder.Tests/ArtifactServiceTests.cs b/src/ImageBuilder.Tests/ArtifactServiceTests.cs
new file mode 100644
index 000000000..632a61ae1
--- /dev/null
+++ b/src/ImageBuilder.Tests/ArtifactServiceTests.cs
@@ -0,0 +1,72 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.IO;
+using Microsoft.DotNet.ImageBuilder.Configuration;
+using Microsoft.DotNet.ImageBuilder.Tests.Helpers;
+using Microsoft.Extensions.Options;
+using Shouldly;
+
+namespace Microsoft.DotNet.ImageBuilder.Tests;
+
+[TestClass]
+public class ArtifactServiceTests
+{
+    private static readonly string s_outputRoot = Path.Combine(Path.GetTempPath(), "artifacts");
+
+    [TestMethod]
+    public void ResolvePath_RelativePath_ResolvesUnderArtifactStagingDirectory()
+    {
+        var service = CreateService(new InMemoryFileSystem());
+
+        string path = service.ResolvePath(Path.Combine("image-info", "input.json"));
+
+        path.ShouldBe(Path.Combine(s_outputRoot, "image-info", "input.json"));
+    }
+
+    [TestMethod]
+    public void WriteAllText_WritesUnderArtifactStagingDirectory()
+    {
+        var fileSystem = new InMemoryFileSystem();
+        var service = CreateService(fileSystem);
+        string expectedPath = Path.Combine(s_outputRoot, "image-info", "output.json");
+
+        service.WriteAllText(Path.Combine("image-info", "output.json"), "contents");
+
+        fileSystem.DirectoriesCreated.ShouldContain(Path.GetDirectoryName(expectedPath));
+        fileSystem.GetFileText(expectedPath).ShouldBe("contents");
+    }
+
+    [TestMethod]
+    public void WriteAllText_MissingArtifactStagingDirectory_Throws()
+    {
+        var service = new ArtifactService(
+            new InMemoryFileSystem(),
+            Options.Create(new BuildConfiguration()));
+
+        InvalidOperationException exception = Should.Throw<InvalidOperationException>(
+            () => service.WriteAllText("output.json", "contents"));
+
+        exception.Message.ShouldContain(nameof(BuildConfiguration.ArtifactStagingDirectory));
+    }
+
+    [TestMethod]
+    public void WriteAllText_PathOutsideArtifactStagingDirectory_Throws()
+    {
+        var service = CreateService(new InMemoryFileSystem());
+
+        Should.Throw<ArgumentException>(
+            () => service.WriteAllText(Path.Combine("..", "output.json"), "contents"));
+    }
+
+    private static ArtifactService CreateService(IFileSystem fileSystem) =>
+        new(
+            fileSystem,
+            Options.Create(
+                new BuildConfiguration
+                {
+                    ArtifactStagingDirectory = s_outputRoot
+                }));
+}
diff --git a/src/ImageBuilder.Tests/CopyAcrImagesCommandTests.cs b/src/ImageBuilder.Tests/CopyAcrImagesCommandTests.cs
index 529c5c195..a6eb250cb 100644
--- a/src/ImageBuilder.Tests/CopyAcrImagesCommandTests.cs
+++ b/src/ImageBuilder.Tests/CopyAcrImagesCommandTests.cs
@@ -37,11 +37,12 @@ public async Task CopyAcrImagesCommand_CustomDockerfileName()
                 CopyAcrImagesCommand command = new(
                     TestHelper.CreateManifestJsonService(),
                     copyImageServiceMock.Object,
-                    Mock.Of<ILogger<CopyAcrImagesCommand>>());
+                    Mock.Of<ILogger<CopyAcrImagesCommand>>(),
+                    TestHelper.CreateArtifactService(tempFolderContext.Path));
                 command.Options.Manifest = Path.Combine(tempFolderContext.Path, "manifest.json");
                 command.Options.SourceRepoPrefix = command.Options.RepoPrefix = "test/";
                 command.Options.SourceRegistry = SourceRegistry;
-                command.Options.ImageInfoPath = "image-info.json";
+                command.Options.ImageInfoPath = Path.Combine(tempFolderContext.Path, "image-info.json");
 
                 const string runtimeRelativeDir = "1.0/runtime/os";
                 Directory.CreateDirectory(Path.Combine(tempFolderContext.Path, runtimeRelativeDir));
@@ -127,11 +128,12 @@ public async Task CopyAcrImagesCommand_SharedDockerfile()
                 var command = new CopyAcrImagesCommand(
                     TestHelper.CreateManifestJsonService(),
                     copyImageServiceMock.Object,
-                    Mock.Of<ILogger<CopyAcrImagesCommand>>());
+                    Mock.Of<ILogger<CopyAcrImagesCommand>>(),
+                    TestHelper.CreateArtifactService(tempFolderContext.Path));
                 command.Options.Manifest = Path.Combine(tempFolderContext.Path, "manifest.json");
                 command.Options.SourceRepoPrefix = command.Options.RepoPrefix = "test/";
                 command.Options.SourceRegistry = SourceRegistry;
-                command.Options.ImageInfoPath = "image-info.json";
+                command.Options.ImageInfoPath = Path.Combine(tempFolderContext.Path, "image-info.json");
 
                 const string runtimeRelativeDir = "1.0/runtime/os";
                 Directory.CreateDirectory(Path.Combine(tempFolderContext.Path, runtimeRelativeDir));
@@ -229,11 +231,12 @@ public async Task CopyAcrImagesCommand_RuntimeDepsSharing()
             var command = new CopyAcrImagesCommand(
                 TestHelper.CreateManifestJsonService(),
                 copyImageServiceMock.Object,
-                Mock.Of<ILogger<CopyAcrImagesCommand>>());
+                Mock.Of<ILogger<CopyAcrImagesCommand>>(),
+                TestHelper.CreateArtifactService(tempFolderContext.Path));
             command.Options.Manifest = Path.Combine(tempFolderContext.Path, "manifest.json");
             command.Options.SourceRepoPrefix = command.Options.RepoPrefix = "test/";
             command.Options.SourceRegistry = SourceRegistry;
-            command.Options.ImageInfoPath = "image-info.json";
+            command.Options.ImageInfoPath = Path.Combine(tempFolderContext.Path, "image-info.json");
 
             string dockerfileRelativePath = DockerfileHelper.CreateDockerfile("3.1/runtime-deps/os", tempFolderContext);
 
@@ -342,11 +345,12 @@ public async Task SyndicatedTags()
             var command = new CopyAcrImagesCommand(
                 TestHelper.CreateManifestJsonService(),
                 copyImageServiceMock.Object,
-                Mock.Of<ILogger<CopyAcrImagesCommand>>());
+                Mock.Of<ILogger<CopyAcrImagesCommand>>(),
+                TestHelper.CreateArtifactService(tempFolderContext.Path));
             command.Options.Manifest = Path.Combine(tempFolderContext.Path, "manifest.json");
             command.Options.SourceRepoPrefix = command.Options.RepoPrefix = "test/";
             command.Options.SourceRegistry = SourceRegistry;
-            command.Options.ImageInfoPath = "image-info.json";
+            command.Options.ImageInfoPath = Path.Combine(tempFolderContext.Path, "image-info.json");
 
             const string runtimeRelativeDir = "1.0/runtime/os";
             Directory.CreateDirectory(Path.Combine(tempFolderContext.Path, runtimeRelativeDir));
@@ -456,11 +460,12 @@ public async Task CopyAcrImagesCommand_CopiesManifestListTags()
             CopyAcrImagesCommand command = new(
                 TestHelper.CreateManifestJsonService(),
                 copyImageServiceMock.Object,
-                Mock.Of<ILogger<CopyAcrImagesCommand>>());
+                Mock.Of<ILogger<CopyAcrImagesCommand>>(),
+                TestHelper.CreateArtifactService(tempFolderContext.Path));
             command.Options.Manifest = Path.Combine(tempFolderContext.Path, "manifest.json");
             command.Options.SourceRepoPrefix = command.Options.RepoPrefix = "test/";
             command.Options.SourceRegistry = SourceRegistry;
-            command.Options.ImageInfoPath = "image-info.json";
+            command.Options.ImageInfoPath = Path.Combine(tempFolderContext.Path, "image-info.json");
 
             string dockerfileRelativePath = DockerfileHelper.CreateDockerfile("1.0/runtime/os", tempFolderContext);
 
@@ -562,11 +567,12 @@ public async Task CopyAcrImagesCommand_CopiesSyndicatedManifestListTags()
             CopyAcrImagesCommand command = new(
                 TestHelper.CreateManifestJsonService(),
                 copyImageServiceMock.Object,
-                Mock.Of<ILogger<CopyAcrImagesCommand>>());
+                Mock.Of<ILogger<CopyAcrImagesCommand>>(),
+                TestHelper.CreateArtifactService(tempFolderContext.Path));
             command.Options.Manifest = Path.Combine(tempFolderContext.Path, "manifest.json");
             command.Options.SourceRepoPrefix = command.Options.RepoPrefix = "test/";
             command.Options.SourceRegistry = SourceRegistry;
-            command.Options.ImageInfoPath = "image-info.json";
+            command.Options.ImageInfoPath = Path.Combine(tempFolderContext.Path, "image-info.json");
 
             string dockerfileRelativePath = DockerfileHelper.CreateDockerfile("1.0/runtime/os", tempFolderContext);
 
@@ -678,11 +684,12 @@ public async Task CopyAcrImagesCommand_SkipsManifestListsWithNoManifestData()
             CopyAcrImagesCommand command = new(
                 TestHelper.CreateManifestJsonService(),
                 copyImageServiceMock.Object,
-                Mock.Of<ILogger<CopyAcrImagesCommand>>());
+                Mock.Of<ILogger<CopyAcrImagesCommand>>(),
+                TestHelper.CreateArtifactService(tempFolderContext.Path));
             command.Options.Manifest = Path.Combine(tempFolderContext.Path, "manifest.json");
             command.Options.SourceRepoPrefix = command.Options.RepoPrefix = "test/";
             command.Options.SourceRegistry = SourceRegistry;
-            command.Options.ImageInfoPath = "image-info.json";
+            command.Options.ImageInfoPath = Path.Combine(tempFolderContext.Path, "image-info.json");
 
             string dockerfileRelativePath = DockerfileHelper.CreateDockerfile("1.0/runtime/os", tempFolderContext);
 
diff --git a/src/ImageBuilder.Tests/CreateManifestListCommandTests.cs b/src/ImageBuilder.Tests/CreateManifestListCommandTests.cs
index 918525e4c..1d46cc39d 100644
--- a/src/ImageBuilder.Tests/CreateManifestListCommandTests.cs
+++ b/src/ImageBuilder.Tests/CreateManifestListCommandTests.cs
@@ -705,7 +705,8 @@ private static CreateManifestListCommand CreateCommand(
             copyImageServiceMock.Object,
             Mock.Of<ILogger<CreateManifestListCommand>>(),
             dateTimeService,
-            Mock.Of<IRegistryCredentialsProvider>());
+            Mock.Of<IRegistryCredentialsProvider>(),
+            TestHelper.CreateArtifactService(Path.GetTempPath()));
 
     private static void SetupCommand(
         CreateManifestListCommand command,
diff --git a/src/ImageBuilder.Tests/GenerateEolAnnotationDataForPublishCommandTests.cs b/src/ImageBuilder.Tests/GenerateEolAnnotationDataForPublishCommandTests.cs
index b59776879..d8c162f13 100644
--- a/src/ImageBuilder.Tests/GenerateEolAnnotationDataForPublishCommandTests.cs
+++ b/src/ImageBuilder.Tests/GenerateEolAnnotationDataForPublishCommandTests.cs
@@ -1148,10 +1148,11 @@ private static GenerateEolAnnotationDataForPublishCommand InitializeCommand(
                 acrClientFactory: registryClientFactory,
                 acrContentClientFactory: registryContentClientFactory,
                 lifecycleMetadataService: lifecycleMetadataService,
-                registryCredentialsProvider: Mock.Of<IRegistryCredentialsProvider>());
+                registryCredentialsProvider: Mock.Of<IRegistryCredentialsProvider>(),
+                artifactService: TestHelper.CreateArtifactService(Path.GetDirectoryName(newEolDigestsListPath)));
             command.Options.OldImageInfoPath = oldImageInfoPath;
             command.Options.NewImageInfoPath = newImageInfoPath;
-            command.Options.EolDigestsListPath = newEolDigestsListPath;
+            command.Options.EolDigestsListPath = Path.GetFileName(newEolDigestsListPath);
             command.Options.RegistryOptions = new() { RepoPrefix = repoPrefix, Registry = AcrName };
             return command;
         }
diff --git a/src/ImageBuilder.Tests/Helpers/TestHelper.cs b/src/ImageBuilder.Tests/Helpers/TestHelper.cs
index 7489caddd..15f64f687 100644
--- a/src/ImageBuilder.Tests/Helpers/TestHelper.cs
+++ b/src/ImageBuilder.Tests/Helpers/TestHelper.cs
@@ -6,6 +6,8 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using Microsoft.DotNet.ImageBuilder.Configuration;
+using Microsoft.Extensions.Options;
 
 namespace Microsoft.DotNet.ImageBuilder.Tests.Helpers
 {
@@ -20,6 +22,16 @@ public static IManifestJsonService CreateManifestJsonService() =>
                 fileSystem: new FileSystem(),
                 logger: new LoggerFactory().CreateLogger<ManifestJsonService>());
 
+        public static IArtifactService CreateArtifactService(string artifactStagingDirectory)
+        {
+            BuildConfiguration buildConfiguration = new()
+            {
+                ArtifactStagingDirectory = artifactStagingDirectory
+            };
+
+            return new ArtifactService(new FileSystem(), Options.Create(buildConfiguration));
+        }
+
         public static TempFolderContext UseTempFolder()
         {
             return new TempFolderContext();
diff --git a/src/ImageBuilder.Tests/IngestKustoImageInfoCommandTests.cs b/src/ImageBuilder.Tests/IngestKustoImageInfoCommandTests.cs
index e90a3d06c..70087c008 100644
--- a/src/ImageBuilder.Tests/IngestKustoImageInfoCommandTests.cs
+++ b/src/ImageBuilder.Tests/IngestKustoImageInfoCommandTests.cs
@@ -277,7 +277,11 @@ private async Task ValidateExecuteAsync(
                 .Callback<string, string, string, string, IServiceConnection>(
                     (csv, _, _, table, _) => ingestedData.Add(table, csv));
 
-            IngestKustoImageInfoCommand command = new(TestHelper.CreateManifestJsonService(), Mock.Of<ILogger<IngestKustoImageInfoCommand>>(), kustoClientMock.Object);
+            IngestKustoImageInfoCommand command = new(
+                TestHelper.CreateManifestJsonService(),
+                Mock.Of<ILogger<IngestKustoImageInfoCommand>>(),
+                kustoClientMock.Object,
+                TestHelper.CreateArtifactService(tempFolderContext.Path));
             command.Options.ImageInfoPath = imageInfoPath;
             command.Options.Manifest = manifestPath;
             command.Options.ImageTable = "ImageInfo";
diff --git a/src/ImageBuilder.Tests/MergeImageInfoFilesCommandTests.cs b/src/ImageBuilder.Tests/MergeImageInfoFilesCommandTests.cs
index 733247b4f..cd20822f6 100644
--- a/src/ImageBuilder.Tests/MergeImageInfoFilesCommandTests.cs
+++ b/src/ImageBuilder.Tests/MergeImageInfoFilesCommandTests.cs
@@ -181,9 +181,9 @@ public async Task MergeImageInfoFilesCommand_HappyPath()
                     }
                 };
 
-                MergeImageInfoCommand command = new MergeImageInfoCommand(TestHelper.CreateManifestJsonService());
+                MergeImageInfoCommand command = CreateCommand(context.Path);
                 command.Options.SourceImageInfoFolderPath = Path.Combine(context.Path, "image-infos");
-                command.Options.DestinationImageInfoPath = Path.Combine(context.Path, "output.json");
+                command.Options.DestinationImageInfoPath = "output.json";
                 command.Options.Manifest = Path.Combine(context.Path, "manifest.json");
 
                 Directory.CreateDirectory(command.Options.SourceImageInfoFolderPath);
@@ -228,7 +228,7 @@ public async Task MergeImageInfoFilesCommand_HappyPath()
                 command.LoadManifest();
                 await command.ExecuteAsync();
 
-                string resultsContent = File.ReadAllText(command.Options.DestinationImageInfoPath);
+                string resultsContent = File.ReadAllText(Path.Combine(context.Path, command.Options.DestinationImageInfoPath));
                 ImageArtifactDetails actual = JsonConvert.DeserializeObject<ImageArtifactDetails>(resultsContent);
 
                 PlatformData expectedPlatform = CreatePlatform(
@@ -485,9 +485,9 @@ public async Task MergeImageInfoFilesCommand_DuplicateDockerfilePaths()
                     }
                 };
 
-                MergeImageInfoCommand command = new MergeImageInfoCommand(TestHelper.CreateManifestJsonService());
+                MergeImageInfoCommand command = CreateCommand(context.Path);
                 command.Options.SourceImageInfoFolderPath = Path.Combine(context.Path, "image-infos");
-                command.Options.DestinationImageInfoPath = Path.Combine(context.Path, "output.json");
+                command.Options.DestinationImageInfoPath = "output.json";
                 command.Options.Manifest = Path.Combine(context.Path, "manifest.json");
 
                 Directory.CreateDirectory(command.Options.SourceImageInfoFolderPath);
@@ -524,7 +524,7 @@ public async Task MergeImageInfoFilesCommand_DuplicateDockerfilePaths()
                 command.LoadManifest();
                 await command.ExecuteAsync();
 
-                string resultsContent = File.ReadAllText(command.Options.DestinationImageInfoPath);
+                string resultsContent = File.ReadAllText(Path.Combine(context.Path, command.Options.DestinationImageInfoPath));
                 ImageArtifactDetails actual = JsonConvert.DeserializeObject<ImageArtifactDetails>(resultsContent);
 
                 ImageArtifactDetails expected = new ImageArtifactDetails
@@ -620,7 +620,7 @@ public async Task MergeImageInfoFilesCommand_DuplicateDockerfilePaths()
         [TestMethod]
         public async Task MergeImageInfoFilesCommand_SourceFolderPathNotFound()
         {
-            MergeImageInfoCommand command = new MergeImageInfoCommand(TestHelper.CreateManifestJsonService());
+            MergeImageInfoCommand command = CreateCommand(Path.GetTempPath());
             command.Options.SourceImageInfoFolderPath = "foo";
             command.Options.DestinationImageInfoPath = "output.json";
 
@@ -643,7 +643,7 @@ public async Task MergeImageInfoFilesCommand_SourceFolderEmpty()
                 // Store the content in a .txt file which the command should NOT be looking for.
                 File.WriteAllText("image-info.txt", JsonHelper.SerializeObject(imageArtifactDetails));
 
-                MergeImageInfoCommand command = new MergeImageInfoCommand(TestHelper.CreateManifestJsonService());
+                MergeImageInfoCommand command = CreateCommand(context.Path);
                 command.Options.SourceImageInfoFolderPath = context.Path;
                 command.Options.DestinationImageInfoPath = "output.json";
 
@@ -772,9 +772,9 @@ public async Task MergeImageInfoFilesCommand_Publish_ReplaceContent()
                 }
             };
 
-            MergeImageInfoCommand command = new(TestHelper.CreateManifestJsonService());
+            MergeImageInfoCommand command = CreateCommand(tempFolderContext.Path);
             command.Options.SourceImageInfoFolderPath = Path.Combine(tempFolderContext.Path, "image-infos");
-            command.Options.DestinationImageInfoPath = Path.Combine(tempFolderContext.Path, "output.json");
+            command.Options.DestinationImageInfoPath = "output.json";
             command.Options.Manifest = Path.Combine(tempFolderContext.Path, "manifest.json");
             command.Options.IsPublishScenario = true;
 
@@ -828,7 +828,8 @@ public async Task MergeImageInfoFilesCommand_Publish_ReplaceContent()
                 }
             };
 
-            string resultsContent = File.ReadAllText(command.Options.DestinationImageInfoPath);
+            string resultsContent = File.ReadAllText(
+                Path.Combine(tempFolderContext.Path, command.Options.DestinationImageInfoPath));
             ImageArtifactDetails actual = JsonConvert.DeserializeObject<ImageArtifactDetails>(resultsContent);
 
             CompareImageArtifactDetails(expectedImageArtifactDetails, actual);
@@ -939,9 +940,9 @@ public async Task MergeImageInfoFilesCommand_Publish_RemoveOutOfDateContent()
                 }
             };
 
-            MergeImageInfoCommand command = new(TestHelper.CreateManifestJsonService());
+            MergeImageInfoCommand command = CreateCommand(tempFolderContext.Path);
             command.Options.SourceImageInfoFolderPath = Path.Combine(tempFolderContext.Path, "image-infos");
-            command.Options.DestinationImageInfoPath = Path.Combine(tempFolderContext.Path, "output.json");
+            command.Options.DestinationImageInfoPath = "output.json";
             command.Options.Manifest = Path.Combine(tempFolderContext.Path, "manifest.json");
             command.Options.IsPublishScenario = true;
 
@@ -983,7 +984,8 @@ public async Task MergeImageInfoFilesCommand_Publish_RemoveOutOfDateContent()
                 }
             };
 
-            string resultsContent = File.ReadAllText(command.Options.DestinationImageInfoPath);
+            string resultsContent = File.ReadAllText(
+                Path.Combine(tempFolderContext.Path, command.Options.DestinationImageInfoPath));
             ImageArtifactDetails actual = JsonConvert.DeserializeObject<ImageArtifactDetails>(resultsContent);
 
             CompareImageArtifactDetails(expectedImageArtifactDetails, actual);
@@ -1116,9 +1118,9 @@ public async Task MergeImageInfoFilesCommand_CommitUrlOverride()
             File.WriteAllText(updatedImageInfoFile, JsonHelper.SerializeObject(updatedImageInfo));
             File.WriteAllText(manifestFile, JsonConvert.SerializeObject(manifest));
 
-            var outputImageInfoFile = Path.Combine(context.Path, "merged-image-info.json");
+            const string outputImageInfoFile = "merged-image-info.json";
 
-            MergeImageInfoCommand command = new MergeImageInfoCommand(TestHelper.CreateManifestJsonService());
+            MergeImageInfoCommand command = CreateCommand(context.Path);
             command.Options.SourceImageInfoFolderPath = sourceImageInfoDir;
             command.Options.DestinationImageInfoPath = outputImageInfoFile;
             command.Options.InitialImageInfoPath = initialImageInfoFile;
@@ -1128,7 +1130,7 @@ public async Task MergeImageInfoFilesCommand_CommitUrlOverride()
             await command.ExecuteAsync();
 
             // Verify the merged result
-            string resultContent = File.ReadAllText(outputImageInfoFile);
+            string resultContent = File.ReadAllText(Path.Combine(context.Path, outputImageInfoFile));
             ImageArtifactDetails mergedImageInfo = ImageArtifactDetails.FromJson(resultContent);
 
             mergedImageInfo.Repos.ShouldHaveSingleItem();
@@ -1154,5 +1156,10 @@ public async Task MergeImageInfoFilesCommand_CommitUrlOverride()
             var initialCommitResult = initialShaMatches[0].Value;
             initialCommitResult.ShouldBe(CommitOverride);
         }
+
+        private static MergeImageInfoCommand CreateCommand(string artifactStagingDirectory) =>
+            new(
+                TestHelper.CreateManifestJsonService(),
+                TestHelper.CreateArtifactService(artifactStagingDirectory));
     }
 }
diff --git a/src/ImageBuilder.Tests/PublishImageInfoCommandTests.cs b/src/ImageBuilder.Tests/PublishImageInfoCommandTests.cs
index 70fe61520..cb60800a2 100644
--- a/src/ImageBuilder.Tests/PublishImageInfoCommandTests.cs
+++ b/src/ImageBuilder.Tests/PublishImageInfoCommandTests.cs
@@ -152,7 +152,12 @@ public async Task PublishImageInfoCommand_HappyPath()
                         actualImageArtifactDetailsContents = File.ReadAllText(path);
                     });
 
-                PublishImageInfoCommand command = new(TestHelper.CreateManifestJsonService(), gitServiceMock.Object, Mock.Of<IOctokitClientFactory>(), Mock.Of<ILogger<PublishImageInfoCommand>>());
+                PublishImageInfoCommand command = new(
+                    TestHelper.CreateManifestJsonService(),
+                    gitServiceMock.Object,
+                    Mock.Of<IOctokitClientFactory>(),
+                    Mock.Of<ILogger<PublishImageInfoCommand>>(),
+                    TestHelper.CreateArtifactService(tempFolderContext.Path));
                 command.Options.ImageInfoPath = file;
                 command.Options.GitOptions = gitOptions;
                 command.Options.Manifest = Path.Combine(tempFolderContext.Path, "manifest.json");
diff --git a/src/ImageBuilder.Tests/TrimUnchangedPlatformsCommandTests.cs b/src/ImageBuilder.Tests/TrimUnchangedPlatformsCommandTests.cs
index 6fdd10cd1..0eea90fd1 100644
--- a/src/ImageBuilder.Tests/TrimUnchangedPlatformsCommandTests.cs
+++ b/src/ImageBuilder.Tests/TrimUnchangedPlatformsCommandTests.cs
@@ -240,7 +240,9 @@ private async Task RunTestAsync(ImageArtifactDetails input, ImageArtifactDetails
         {
             using TempFolderContext tempFolderContext = new TempFolderContext();
 
-            TrimUnchangedPlatformsCommand command = new TrimUnchangedPlatformsCommand(Mock.Of<ILogger<TrimUnchangedPlatformsCommand>>());
+            TrimUnchangedPlatformsCommand command = new(
+                Mock.Of<ILogger<TrimUnchangedPlatformsCommand>>(),
+                TestHelper.CreateArtifactService(tempFolderContext.Path));
             command.Options.ImageInfoPath = Path.Combine(tempFolderContext.Path, "imageinfo.json");
 
             File.WriteAllText(command.Options.ImageInfoPath, JsonHelper.SerializeObject(input));
diff --git a/src/ImageBuilder.Tests/WaitForMarAnnotationIngestionCommandTests.cs b/src/ImageBuilder.Tests/WaitForMarAnnotationIngestionCommandTests.cs
index 2f317a0f7..2a07757ee 100644
--- a/src/ImageBuilder.Tests/WaitForMarAnnotationIngestionCommandTests.cs
+++ b/src/ImageBuilder.Tests/WaitForMarAnnotationIngestionCommandTests.cs
@@ -31,7 +31,8 @@ public async Task WaitForMarAnnotationIngestionCommand()
         Mock<IMarImageIngestionReporter> ingestionReporter = new();
         WaitForMarAnnotationIngestionCommand cmd = new(
             Mock.Of<ILogger<WaitForMarAnnotationIngestionCommand>>(),
-            ingestionReporter.Object);
+            ingestionReporter.Object,
+            TestHelper.CreateArtifactService(tempFolderContext.Path));
         cmd.Options.AnnotationDigestsPath = annotationsDigestsPath;
 
         await cmd.ExecuteAsync();
diff --git a/src/ImageBuilder.Tests/WaitForMcrImageIngestionCommandTests.cs b/src/ImageBuilder.Tests/WaitForMcrImageIngestionCommandTests.cs
index 3d1133a7f..906f6afce 100644
--- a/src/ImageBuilder.Tests/WaitForMcrImageIngestionCommandTests.cs
+++ b/src/ImageBuilder.Tests/WaitForMcrImageIngestionCommandTests.cs
@@ -47,7 +47,8 @@ public async Task SuccessfulPublish(string repoPrefix)
             WaitForMcrImageIngestionCommand command = new(
                 TestHelper.CreateManifestJsonService(),
                 Mock.Of<ILogger<WaitForMcrImageIngestionCommand>>(),
-                imageIngestionReporterMock.Object);
+                imageIngestionReporterMock.Object,
+                TestHelper.CreateArtifactService(Path.GetTempPath()));
 
             using TempFolderContext tempFolderContext = TestHelper.UseTempFolder();
 
@@ -181,7 +182,8 @@ public async Task SyndicatedTags(string syndicatedManifestDigest)
             WaitForMcrImageIngestionCommand command = new(
                 TestHelper.CreateManifestJsonService(),
                 Mock.Of<ILogger<WaitForMcrImageIngestionCommand>>(),
-                imageIngestionReporterMock.Object);
+                imageIngestionReporterMock.Object,
+                TestHelper.CreateArtifactService(Path.GetTempPath()));
 
             using TempFolderContext tempFolderContext = TestHelper.UseTempFolder();
 
diff --git a/src/ImageBuilder/ArtifactService.cs b/src/ImageBuilder/ArtifactService.cs
new file mode 100644
index 000000000..62802493f
--- /dev/null
+++ b/src/ImageBuilder/ArtifactService.cs
@@ -0,0 +1,55 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.IO;
+using Microsoft.DotNet.ImageBuilder.Configuration;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.DotNet.ImageBuilder;
+
+/// <inheritdoc />
+public sealed class ArtifactService(IFileSystem fileSystem, IOptions<BuildConfiguration> buildConfigOptions)
+    : IArtifactService
+{
+    private readonly IFileSystem _fileSystem = fileSystem;
+    private readonly BuildConfiguration _buildConfig = buildConfigOptions.Value;
+
+    /// <inheritdoc />
+    public void WriteAllText(string artifactPath, string contents)
+    {
+        string outputPath = ResolvePath(artifactPath);
+        string outputDirectory = Path.GetDirectoryName(outputPath)
+            ?? throw new InvalidOperationException($"Output path '{outputPath}' has no directory.");
+        _fileSystem.CreateDirectory(outputDirectory);
+        _fileSystem.WriteAllText(outputPath, contents);
+    }
+
+    /// <inheritdoc />
+    public string ResolvePath(string artifactPath)
+    {
+        if (string.IsNullOrWhiteSpace(_buildConfig.ArtifactStagingDirectory))
+        {
+            throw new InvalidOperationException(
+                $"{nameof(BuildConfiguration.ArtifactStagingDirectory)} is not set. "
+                + "Configure it in appsettings.json or via environment variables.");
+        }
+
+        // Canonicalize both paths so traversal segments can be checked reliably.
+        string artifactRoot = Path.GetFullPath(_buildConfig.ArtifactStagingDirectory);
+        string resolvedArtifactPath = Path.GetFullPath(artifactPath, artifactRoot);
+        string relativeArtifactPath = Path.GetRelativePath(artifactRoot, resolvedArtifactPath);
+
+        // Reject relative paths that escape the configured artifact staging directory.
+        if (relativeArtifactPath == ".."
+            || relativeArtifactPath.StartsWith($"..{Path.DirectorySeparatorChar}", StringComparison.Ordinal))
+        {
+            throw new ArgumentException(
+                "Artifact paths must remain within the artifact staging directory.",
+                nameof(artifactPath));
+        }
+
+        return resolvedArtifactPath;
+    }
+}
diff --git a/src/ImageBuilder/Commands/AnnotateEolDigestsCommand.cs b/src/ImageBuilder/Commands/AnnotateEolDigestsCommand.cs
index 876fc4931..12d6d39bf 100644
--- a/src/ImageBuilder/Commands/AnnotateEolDigestsCommand.cs
+++ b/src/ImageBuilder/Commands/AnnotateEolDigestsCommand.cs
@@ -21,6 +21,7 @@ public class AnnotateEolDigestsCommand : Command<AnnotateEolDigestsOptions>
         private readonly ILogger<AnnotateEolDigestsCommand> _logger;
         private readonly ILifecycleMetadataService _lifecycleMetadataService;
         private readonly IRegistryCredentialsProvider _registryCredentialsProvider;
+        private readonly IArtifactService _artifactService;
         private readonly ConcurrentBag<EolDigestData> _failedAnnotationImageDigests = [];
         private readonly ConcurrentBag<EolDigestData> _skippedAnnotationImageDigests = [];
         private readonly ConcurrentBag<EolDigestData> _existingAnnotationImageDigests = [];
@@ -36,18 +37,21 @@ public class AnnotateEolDigestsCommand : Command<AnnotateEolDigestsOptions>
         public AnnotateEolDigestsCommand(
             ILogger<AnnotateEolDigestsCommand> logger,
             ILifecycleMetadataService lifecycleMetadataService,
-            IRegistryCredentialsProvider registryCredentialsProvider)
+            IRegistryCredentialsProvider registryCredentialsProvider,
+            IArtifactService artifactService)
         {
             _logger = logger ?? throw new ArgumentNullException(nameof(logger));
             _lifecycleMetadataService = lifecycleMetadataService ?? throw new ArgumentNullException(nameof(lifecycleMetadataService));
             _registryCredentialsProvider = registryCredentialsProvider ?? throw new ArgumentNullException(nameof(registryCredentialsProvider));
+            _artifactService = artifactService ?? throw new ArgumentNullException(nameof(artifactService));
         }
 
         protected override string Description => "Annotates EOL digests in Docker Registry";
 
         public override async Task ExecuteAsync()
         {
-            EolAnnotationsData eolAnnotations = LoadEolAnnotationsData(Options.EolDigestsListPath);
+            string eolDigestsListPath = _artifactService.ResolvePath(Options.EolDigestsListPath);
+            EolAnnotationsData eolAnnotations = LoadEolAnnotationsData(eolDigestsListPath);
             DateOnly? globalEolDate = eolAnnotations.EolDate;
 
             await _registryCredentialsProvider.ExecuteWithCredentialsAsync(
@@ -78,7 +82,13 @@ await Parallel.ForEachAsync(eolAnnotations.EolDigests, CancellationToken.None,
                     $"Some digest annotations failed or were skipped due to existing non-matching EOL date annotations (failed: {_failedAnnotationImageDigests.Count}, skipped: {_existingAnnotationImageDigests.Count}).");
             }
 
-            File.WriteAllLines(Options.AnnotationDigestsOutputPath, _createdAnnotationDigests.Order());
+            string annotationDigests = string.Join(Environment.NewLine, _createdAnnotationDigests.Order());
+            if (annotationDigests.Length > 0)
+            {
+                annotationDigests += Environment.NewLine;
+            }
+
+            _artifactService.WriteAllText(Options.AnnotationDigestsOutputPath, annotationDigests);
         }
 
         private void WriteNonEmptySummaryForAnnotationDigests(IEnumerable<string> annotationDigests, string message)
diff --git a/src/ImageBuilder/Commands/AnnotateEolDigestsOptions.cs b/src/ImageBuilder/Commands/AnnotateEolDigestsOptions.cs
index 4c92d1064..6275026b8 100644
--- a/src/ImageBuilder/Commands/AnnotateEolDigestsOptions.cs
+++ b/src/ImageBuilder/Commands/AnnotateEolDigestsOptions.cs
@@ -34,7 +34,7 @@ public class AnnotateEolDigestsOptions : Options
 
     private static readonly Argument<string> AnnotationDigestsOutputPathArgument = new(nameof(AnnotationDigestsOutputPath))
     {
-        Description = "Output path of file containing the list of annotation digests that were created"
+        Description = "Artifact-relative output path for the list of annotation digests that were created"
     };
 
     public override IEnumerable<Option> GetCliOptions() =>
diff --git a/src/ImageBuilder/Commands/CopyAcrImagesCommand.cs b/src/ImageBuilder/Commands/CopyAcrImagesCommand.cs
index cccf88c45..5c0259d95 100644
--- a/src/ImageBuilder/Commands/CopyAcrImagesCommand.cs
+++ b/src/ImageBuilder/Commands/CopyAcrImagesCommand.cs
@@ -16,24 +16,17 @@ namespace Microsoft.DotNet.ImageBuilder.Commands
     public class CopyAcrImagesCommand : CopyImagesCommand<CopyAcrImagesOptions>
     {
         private readonly ILogger _logger;
-        private readonly Lazy<ImageArtifactDetails> _imageArtifactDetails;
+        private readonly IArtifactService _artifactService;
 
         public CopyAcrImagesCommand(
             IManifestJsonService manifestJsonService,
             ICopyImageService copyImageService,
-            ILogger<CopyAcrImagesCommand> logger)
+            ILogger<CopyAcrImagesCommand> logger,
+            IArtifactService artifactService)
             : base(manifestJsonService, copyImageService, logger)
         {
             _logger = logger;
-            _imageArtifactDetails = new Lazy<ImageArtifactDetails>(() =>
-            {
-                if (!string.IsNullOrEmpty(Options.ImageInfoPath))
-                {
-                    return ImageInfoHelper.LoadFromFile(Options.ImageInfoPath, Manifest);
-                }
-
-                return null;
-            });
+            _artifactService = artifactService ?? throw new ArgumentNullException(nameof(artifactService));
         }
 
         protected override string Description => "Copies the platform images and manifest lists as specified in the manifest between repositories of an ACR";
@@ -42,18 +35,27 @@ public override async Task ExecuteAsync()
         {
             _logger.LogInformation("COPYING IMAGES");
 
-            if (string.IsNullOrEmpty(Options.ImageInfoPath) || !File.Exists(Options.ImageInfoPath))
+            if (string.IsNullOrEmpty(Options.ImageInfoPath))
+            {
+                _logger.LogInformation(PipelineHelper.FormatWarningCommand(
+                    "Image info file not found. Skipping image copy."));
+                return;
+            }
+
+            string imageInfoPath = _artifactService.ResolvePath(Options.ImageInfoPath);
+            if (!File.Exists(imageInfoPath))
             {
                 _logger.LogInformation(PipelineHelper.FormatWarningCommand(
                     "Image info file not found. Skipping image copy."));
                 return;
             }
 
+            ImageArtifactDetails imageArtifactDetails = ImageInfoHelper.LoadFromFile(imageInfoPath, Manifest);
             IEnumerable<Task> platformImportTasks = Manifest.FilteredRepos
                 .Select(repo =>
                     repo.FilteredImages
                         .SelectMany(image => image.FilteredPlatforms)
-                        .SelectMany(platform => GetPlatformTagInfos(repo, platform))
+                        .SelectMany(platform => GetPlatformTagInfos(repo, platform, imageArtifactDetails))
                         .Select(tagInfo =>
                             ImportImageAsync(
                                 DockerHelper.TrimRegistry(tagInfo.DestinationTag, Manifest.Registry),
@@ -63,7 +65,7 @@ public override async Task ExecuteAsync()
                                 srcRegistryName: Options.SourceRegistry)))
                 .SelectMany(tasks => tasks);
 
-            IEnumerable<Task> manifestListImportTasks = GetManifestListTagInfos()
+            IEnumerable<Task> manifestListImportTasks = GetManifestListTagInfos(imageArtifactDetails)
                 .Select(tagInfo =>
                     ImportImageAsync(
                         DockerHelper.TrimRegistry(tagInfo.DestinationTag, Manifest.Registry),
@@ -75,7 +77,10 @@ public override async Task ExecuteAsync()
             await Task.WhenAll(platformImportTasks.Concat(manifestListImportTasks));
         }
 
-        private IEnumerable<(string SourceTag, string DestinationTag)> GetPlatformTagInfos(RepoInfo repo, PlatformInfo platform)
+        private IEnumerable<(string SourceTag, string DestinationTag)> GetPlatformTagInfos(
+            RepoInfo repo,
+            PlatformInfo platform,
+            ImageArtifactDetails imageArtifactDetails)
         {
             var tags = new List<(string SourceTag, string DestinationTag)>();
 
@@ -83,67 +88,55 @@ public override async Task ExecuteAsync()
             // to handle scenarios where the tag's value is dynamic, such as a timestamp, and we need to know the value
             // of the tag for the image that was actually built rather than just generating new tag values when parsing
             // the manifest.
-            if (_imageArtifactDetails.Value != null)
+            RepoData repoData = imageArtifactDetails.Repos.FirstOrDefault(repoData => repoData.Repo == repo.Name);
+            if (repoData != null)
             {
-                RepoData repoData = _imageArtifactDetails.Value.Repos.FirstOrDefault(repoData => repoData.Repo == repo.Name);
-                if (repoData != null)
+                PlatformData platformData = repoData.Images
+                    .SelectMany(image => image.Platforms)
+                    .FirstOrDefault(platformData => platformData.PlatformInfo == platform);
+                if (platformData != null)
                 {
-                    PlatformData platformData = repoData.Images
-                        .SelectMany(image => image.Platforms)
-                        .FirstOrDefault(platformData => platformData.PlatformInfo == platform);
-                    if (platformData != null)
+                    foreach (string tag in platformData.SimpleTags)
                     {
-                        foreach (string tag in platformData.SimpleTags)
+                        string destinationTag = TagInfo.GetFullyQualifiedName(repo.QualifiedName, tag);
+                        string sourceTag = GetSourceTag(destinationTag);
+                        tags.Add((sourceTag, destinationTag));
+
+                        TagInfo tagInfo = platformData.PlatformInfo.Tags.FirstOrDefault(tagInfo => tagInfo.Name == tag);
+                        // There may not be a matching tag due to dynamic tag names. For now, we'll say that
+                        // syndication is not supported for dynamically named tags.
+                        // See https://github.com/dotnet/docker-tools/issues/686
+                        if (tagInfo?.SyndicatedRepo != null)
                         {
-                            string destinationTag = TagInfo.GetFullyQualifiedName(repo.QualifiedName, tag);
-                            string sourceTag = GetSourceTag(destinationTag);
-                            tags.Add((sourceTag, destinationTag));
-
-                            TagInfo tagInfo = platformData.PlatformInfo.Tags.FirstOrDefault(tagInfo => tagInfo.Name == tag);
-                            // There may not be a matching tag due to dynamic tag names. For now, we'll say that
-                            // syndication is not supported for dynamically named tags.
-                            // See https://github.com/dotnet/docker-tools/issues/686
-                            if (tagInfo?.SyndicatedRepo != null)
+                            foreach (string syndicatedDestinationTagName in tagInfo.SyndicatedDestinationTags)
                             {
-                                foreach (string syndicatedDestinationTagName in tagInfo.SyndicatedDestinationTags)
-                                {
-                                    destinationTag = TagInfo.GetFullyQualifiedName(
-                                        $"{Manifest.Registry}/{Options.RepoPrefix}{tagInfo.SyndicatedRepo}",
-                                        syndicatedDestinationTagName);
-                                    tags.Add((sourceTag, destinationTag));
-                                }
+                                destinationTag = TagInfo.GetFullyQualifiedName(
+                                    $"{Manifest.Registry}/{Options.RepoPrefix}{tagInfo.SyndicatedRepo}",
+                                    syndicatedDestinationTagName);
+                                tags.Add((sourceTag, destinationTag));
                             }
                         }
                     }
-                    else
-                    {
-                        _logger.LogInformation($"Unable to find image info data for path '{platform.DockerfilePath}'.");
-                    }
                 }
                 else
                 {
-                    _logger.LogInformation($"Unable to find image info data for repo '{repo.Name}'.");
+                    _logger.LogInformation($"Unable to find image info data for path '{platform.DockerfilePath}'.");
                 }
             }
             else
             {
-                tags.AddRange(platform.Tags
-                    .Select(tag => (GetSourceTag(tag.FullyQualifiedName), tag.FullyQualifiedName)));
+                _logger.LogInformation($"Unable to find image info data for repo '{repo.Name}'.");
             }
 
             return tags;
         }
 
-        private IEnumerable<(string SourceTag, string DestinationTag)> GetManifestListTagInfos()
+        private IEnumerable<(string SourceTag, string DestinationTag)> GetManifestListTagInfos(
+            ImageArtifactDetails imageArtifactDetails)
         {
-            if (_imageArtifactDetails.Value is null)
-            {
-                yield break;
-            }
-
             foreach (RepoInfo repo in Manifest.FilteredRepos)
             {
-                RepoData repoData = _imageArtifactDetails.Value.Repos
+                RepoData repoData = imageArtifactDetails.Repos
                     .FirstOrDefault(repoData => repoData.Repo == repo.Name);
 
                 if (repoData is null)
diff --git a/src/ImageBuilder/Commands/CreateManifestListCommand.cs b/src/ImageBuilder/Commands/CreateManifestListCommand.cs
index 67fb0fbee..4b3b7beec 100644
--- a/src/ImageBuilder/Commands/CreateManifestListCommand.cs
+++ b/src/ImageBuilder/Commands/CreateManifestListCommand.cs
@@ -24,6 +24,7 @@ public class CreateManifestListCommand : ManifestCommand<CreateManifestListOptio
     private readonly ILogger<CreateManifestListCommand> _logger;
     private readonly IDateTimeService _dateTimeService;
     private readonly IRegistryCredentialsProvider _registryCredentialsProvider;
+    private readonly IArtifactService _artifactService;
 
     public CreateManifestListCommand(
         IManifestJsonService manifestJsonService,
@@ -32,13 +33,15 @@ public CreateManifestListCommand(
         ICopyImageService copyImageService,
         ILogger<CreateManifestListCommand> logger,
         IDateTimeService dateTimeService,
-        IRegistryCredentialsProvider registryCredentialsProvider) : base(manifestJsonService)
+        IRegistryCredentialsProvider registryCredentialsProvider,
+        IArtifactService artifactService) : base(manifestJsonService)
     {
         _dockerService = dockerService ?? throw new ArgumentNullException(nameof(dockerService));
         _copyImageService = copyImageService ?? throw new ArgumentNullException(nameof(copyImageService));
         _logger = logger ?? throw new ArgumentNullException(nameof(logger));
         _dateTimeService = dateTimeService ?? throw new ArgumentNullException(nameof(dateTimeService));
         _registryCredentialsProvider = registryCredentialsProvider ?? throw new ArgumentNullException(nameof(registryCredentialsProvider));
+        _artifactService = artifactService ?? throw new ArgumentNullException(nameof(artifactService));
 
         ArgumentNullException.ThrowIfNull(manifestServiceFactory);
         _manifestService = new Lazy<IManifestService>(() =>
@@ -50,8 +53,9 @@ public CreateManifestListCommand(
     public override async Task ExecuteAsync()
     {
         _logger.LogInformation("CREATING MANIFEST LISTS");
+        string imageInfoPath = _artifactService.ResolvePath(Options.ImageInfoPath);
 
-        if (!File.Exists(Options.ImageInfoPath))
+        if (!File.Exists(imageInfoPath))
         {
             _logger.LogInformation(PipelineHelper.FormatWarningCommand(
                 "Image info file not found. Skipping manifest list creation."));
@@ -60,7 +64,7 @@ public override async Task ExecuteAsync()
 
         // The merged image-info file is the source of truth for which images were
         // built in this run and therefore which shared-tag manifest lists need updates.
-        ImageArtifactDetails imageArtifactDetails = ImageInfoHelper.LoadFromFile(Options.ImageInfoPath, Manifest);
+        ImageArtifactDetails imageArtifactDetails = ImageInfoHelper.LoadFromFile(imageInfoPath, Manifest);
 
         await _registryCredentialsProvider.ExecuteWithCredentialsAsync(
             Options.IsDryRun,
@@ -117,7 +121,7 @@ await _registryCredentialsProvider.ExecuteWithCredentialsAsync(
 
                 WriteManifestSummary(manifestLists);
 
-                await SaveTagInfoToImageInfoFileAsync(createdDate, imageArtifactDetails);
+                await SaveTagInfoToImageInfoFileAsync(createdDate, imageArtifactDetails, imageInfoPath);
             },
             Options.CredentialsOptions,
             registryName: Manifest.Registry);
@@ -270,7 +274,10 @@ private static void AddPlatformToImageInfo(PlatformImportData importedPlatform)
         importedPlatform.SiblingPlatforms.Add(platformData);
     }
 
-    private async Task SaveTagInfoToImageInfoFileAsync(DateTime createdDate, ImageArtifactDetails imageArtifactDetails)
+    private async Task SaveTagInfoToImageInfoFileAsync(
+        DateTime createdDate,
+        ImageArtifactDetails imageArtifactDetails,
+        string imageInfoPath)
     {
         _logger.LogInformation("SETTING TAG INFO");
 
@@ -313,7 +320,7 @@ await _manifestService.Value.GetManifestDigestShaAsync(
         }
 
         string imageInfoString = JsonHelper.SerializeObject(imageArtifactDetails);
-        File.WriteAllText(Options.ImageInfoPath, imageInfoString);
+        File.WriteAllText(imageInfoPath, imageInfoString);
     }
 
     private void WriteManifestSummary(IReadOnlyList<ManifestListInfo> manifestLists)
diff --git a/src/ImageBuilder/Commands/GenerateEolAnnotationDataCommandBase.cs b/src/ImageBuilder/Commands/GenerateEolAnnotationDataCommandBase.cs
index ceda8cfa1..6140022eb 100644
--- a/src/ImageBuilder/Commands/GenerateEolAnnotationDataCommandBase.cs
+++ b/src/ImageBuilder/Commands/GenerateEolAnnotationDataCommandBase.cs
@@ -26,6 +26,7 @@ public abstract class GenerateEolAnnotationDataCommandBase<TOptions>
     private readonly IAcrClientFactory _acrClientFactory;
     private readonly ILifecycleMetadataService _lifecycleMetadataService;
     private readonly IRegistryCredentialsProvider _registryCredentialsProvider;
+    protected IArtifactService ArtifactService { get; }
     private readonly DateOnly _eolDate = DateOnly.FromDateTime(DateTime.UtcNow); // default EOL date
 
     protected GenerateEolAnnotationDataCommandBase(
@@ -33,13 +34,15 @@ protected GenerateEolAnnotationDataCommandBase(
         IAcrContentClientFactory acrContentClientFactory,
         IAcrClientFactory acrClientFactory,
         ILifecycleMetadataService lifecycleMetadataService,
-        IRegistryCredentialsProvider registryCredentialsProvider)
+        IRegistryCredentialsProvider registryCredentialsProvider,
+        IArtifactService artifactService)
     {
         _logger = logger;
         _acrContentClientFactory = acrContentClientFactory;
         _acrClientFactory = acrClientFactory;
         _lifecycleMetadataService = lifecycleMetadataService;
         _registryCredentialsProvider = registryCredentialsProvider;
+        ArtifactService = artifactService;
     }
 
     public sealed override async Task ExecuteAsync()
@@ -127,7 +130,7 @@ protected void WriteDigestDataJson(IEnumerable<EolDigestData> digestsToAnnotate)
             eolAnnotations,
             Formatting.Indented,
             new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore });
-        File.WriteAllText(Options.EolDigestsListPath, annotationsJson);
+        ArtifactService.WriteAllText(Options.EolDigestsListPath, annotationsJson);
     }
 
     private async Task<IEnumerable<EolDigestData>> GetDigestsWithoutExistingAnnotationAsync(
diff --git a/src/ImageBuilder/Commands/GenerateEolAnnotationDataForAllImagesCommand.cs b/src/ImageBuilder/Commands/GenerateEolAnnotationDataForAllImagesCommand.cs
index bae9562cb..843a5be36 100644
--- a/src/ImageBuilder/Commands/GenerateEolAnnotationDataForAllImagesCommand.cs
+++ b/src/ImageBuilder/Commands/GenerateEolAnnotationDataForAllImagesCommand.cs
@@ -16,13 +16,15 @@ public GenerateEolAnnotationDataForAllImagesCommand(
         IAcrClientFactory acrClientFactory,
         IAcrContentClientFactory acrContentClientFactory,
         ILifecycleMetadataService lifecycleMetadataService,
-        IRegistryCredentialsProvider registryCredentialsProvider)
+        IRegistryCredentialsProvider registryCredentialsProvider,
+        IArtifactService artifactService)
         : base(
             logger,
             acrContentClientFactory,
             acrClientFactory,
             lifecycleMetadataService,
-            registryCredentialsProvider)
+            registryCredentialsProvider,
+            artifactService)
     {
     }
 
diff --git a/src/ImageBuilder/Commands/GenerateEolAnnotationDataForPublishCommand.cs b/src/ImageBuilder/Commands/GenerateEolAnnotationDataForPublishCommand.cs
index 2b037fdba..148a12b10 100644
--- a/src/ImageBuilder/Commands/GenerateEolAnnotationDataForPublishCommand.cs
+++ b/src/ImageBuilder/Commands/GenerateEolAnnotationDataForPublishCommand.cs
@@ -22,13 +22,15 @@ public GenerateEolAnnotationDataForPublishCommand(
         IAcrClientFactory acrClientFactory,
         IAcrContentClientFactory acrContentClientFactory,
         ILifecycleMetadataService lifecycleMetadataService,
-        IRegistryCredentialsProvider registryCredentialsProvider)
+        IRegistryCredentialsProvider registryCredentialsProvider,
+        IArtifactService artifactService)
         : base(
             logger,
             acrContentClientFactory,
             acrClientFactory,
             lifecycleMetadataService,
-            registryCredentialsProvider)
+            registryCredentialsProvider,
+            artifactService)
     {
         _logger = logger;
     }
@@ -37,14 +39,17 @@ public GenerateEolAnnotationDataForPublishCommand(
 
     protected override async Task<IEnumerable<EolDigestData>> GetDigestsToAnnotateAsync()
     {
-        if (!File.Exists(Options.OldImageInfoPath) && !File.Exists(Options.NewImageInfoPath))
+        string oldImageInfoPath = ArtifactService.ResolvePath(Options.OldImageInfoPath);
+        string newImageInfoPath = ArtifactService.ResolvePath(Options.NewImageInfoPath);
+
+        if (!File.Exists(oldImageInfoPath) && !File.Exists(newImageInfoPath))
         {
             _logger.LogInformation("No digests to annotate because no image info files were provided.");
             return [];
         }
 
-        ImageArtifactDetails oldImageArtifactDetails = ImageInfoHelper.DeserializeImageArtifactDetails(Options.OldImageInfoPath);
-        ImageArtifactDetails newImageArtifactDetails = ImageInfoHelper.DeserializeImageArtifactDetails(Options.NewImageInfoPath);
+        ImageArtifactDetails oldImageArtifactDetails = ImageInfoHelper.DeserializeImageArtifactDetails(oldImageInfoPath);
+        ImageArtifactDetails newImageArtifactDetails = ImageInfoHelper.DeserializeImageArtifactDetails(newImageInfoPath);
 
         try
         {
diff --git a/src/ImageBuilder/Commands/IngestKustoImageInfoCommand.cs b/src/ImageBuilder/Commands/IngestKustoImageInfoCommand.cs
index 5d1932525..56caa0f45 100644
--- a/src/ImageBuilder/Commands/IngestKustoImageInfoCommand.cs
+++ b/src/ImageBuilder/Commands/IngestKustoImageInfoCommand.cs
@@ -18,11 +18,17 @@ public class IngestKustoImageInfoCommand : ManifestCommand<IngestKustoImageInfoO
     {
         private readonly IKustoClient _kustoClient;
         private readonly ILogger<IngestKustoImageInfoCommand> _logger;
+        private readonly IArtifactService _artifactService;
 
-        public IngestKustoImageInfoCommand(IManifestJsonService manifestJsonService, ILogger<IngestKustoImageInfoCommand> logger, IKustoClient kustoClient) : base(manifestJsonService)
+        public IngestKustoImageInfoCommand(
+            IManifestJsonService manifestJsonService,
+            ILogger<IngestKustoImageInfoCommand> logger,
+            IKustoClient kustoClient,
+            IArtifactService artifactService) : base(manifestJsonService)
         {
             _logger = logger ?? throw new ArgumentNullException(nameof(logger));
             _kustoClient = kustoClient ?? throw new ArgumentNullException(nameof(kustoClient));
+            _artifactService = artifactService ?? throw new ArgumentNullException(nameof(artifactService));
         }
 
         protected override string Description => "Ingests image info data into Kusto";
@@ -30,8 +36,9 @@ public IngestKustoImageInfoCommand(IManifestJsonService manifestJsonService, ILo
         public override async Task ExecuteAsync()
         {
             _logger.LogInformation("INGESTING IMAGE INFO DATA INTO KUSTO");
+            string imageInfoPath = _artifactService.ResolvePath(Options.ImageInfoPath);
 
-            (string imageInfo, string layerInfo) = GetImageInfoCsv();
+            (string imageInfo, string layerInfo) = GetImageInfoCsv(imageInfoPath);
             _logger.LogInformation($"Image Info to Ingest:{Environment.NewLine}{imageInfo}{Environment.NewLine}");
             _logger.LogInformation($"Image Layer to Ingest:{Environment.NewLine}{layerInfo}{Environment.NewLine}");
 
@@ -50,12 +57,12 @@ public override async Task ExecuteAsync()
             await IngestInfoAsync(layerInfo, Options.LayerTable);
         }
 
-        private (string imageInfo, string layerInfo) GetImageInfoCsv()
+        private (string imageInfo, string layerInfo) GetImageInfoCsv(string imageInfoPath)
         {
             StringBuilder imageInfo = new();
             StringBuilder layerInfo = new();
 
-            foreach (RepoData repo in ImageInfoHelper.LoadFromFile(Options.ImageInfoPath, Manifest).Repos)
+            foreach (RepoData repo in ImageInfoHelper.LoadFromFile(imageInfoPath, Manifest).Repos)
             {
                 foreach (ImageData image in repo.Images)
                 {
diff --git a/src/ImageBuilder/Commands/MergeImageInfoCommand.cs b/src/ImageBuilder/Commands/MergeImageInfoCommand.cs
index 02395be50..59153eee3 100644
--- a/src/ImageBuilder/Commands/MergeImageInfoCommand.cs
+++ b/src/ImageBuilder/Commands/MergeImageInfoCommand.cs
@@ -13,16 +13,22 @@
 
 namespace Microsoft.DotNet.ImageBuilder.Commands
 {
-    public partial class MergeImageInfoCommand : ManifestCommand<MergeImageInfoOptions>
+    public partial class MergeImageInfoCommand(
+        IManifestJsonService manifestJsonService,
+        IArtifactService artifactService
+    ) : ManifestCommand<MergeImageInfoOptions>(manifestJsonService)
     {
-        public MergeImageInfoCommand(IManifestJsonService manifestJsonService) : base(manifestJsonService) { }
-
         protected override string Description => "Merges the content of multiple image info files into one file";
 
         public override Task ExecuteAsync()
         {
+            string sourceImageInfoFolderPath = artifactService.ResolvePath(Options.SourceImageInfoFolderPath);
+            string? initialImageInfoPath = Options.InitialImageInfoPath is not null
+                ? artifactService.ResolvePath(Options.InitialImageInfoPath)
+                : null;
+
             IEnumerable<string> imageInfoFiles = Directory.EnumerateFiles(
-                Options.SourceImageInfoFolderPath,
+                sourceImageInfoFolderPath,
                 "*.json",
                 SearchOption.AllDirectories);
 
@@ -38,7 +44,7 @@ public override Task ExecuteAsync()
             if (!srcImageArtifactDetailsList.Any())
             {
                 throw new InvalidOperationException(
-                    $"No JSON files found in source folder '{Options.SourceImageInfoFolderPath}'");
+                    $"No JSON files found in source folder '{sourceImageInfoFolderPath}'");
             }
 
             ImageInfoMergeOptions options = new()
@@ -50,9 +56,9 @@ public override Task ExecuteAsync()
             ImageArtifactDetails? initialImageArtifactDetails = null;
 
             ImageArtifactDetails targetImageArtifactDetails;
-            if (Options.InitialImageInfoPath != null)
+            if (initialImageInfoPath != null)
             {
-                targetImageArtifactDetails = srcImageArtifactDetailsList.First(item => item.Path == Options.InitialImageInfoPath).ImageArtifactDetails;
+                targetImageArtifactDetails = srcImageArtifactDetailsList.First(item => item.Path == initialImageInfoPath).ImageArtifactDetails;
 
                 // Store a deep copy of the initial state for comparison if CommitUrlOverride is specified
                 if (!string.IsNullOrEmpty(Options.CommitOverride))
@@ -89,7 +95,7 @@ public override Task ExecuteAsync()
             }
 
             string destinationContents = JsonHelper.SerializeObject(targetImageArtifactDetails) + Environment.NewLine;
-            File.WriteAllText(Options.DestinationImageInfoPath, destinationContents);
+            artifactService.WriteAllText(Options.DestinationImageInfoPath, destinationContents);
 
             return Task.CompletedTask;
         }
diff --git a/src/ImageBuilder/Commands/MergeImageInfoOptions.cs b/src/ImageBuilder/Commands/MergeImageInfoOptions.cs
index 5e986819d..ec8260823 100644
--- a/src/ImageBuilder/Commands/MergeImageInfoOptions.cs
+++ b/src/ImageBuilder/Commands/MergeImageInfoOptions.cs
@@ -27,7 +27,7 @@ public class MergeImageInfoOptions : ManifestOptions
 
         private static readonly Argument<string> DestinationImageInfoPathArgument = new(nameof(DestinationImageInfoPath))
         {
-            Description = "Path to store the merged image info content"
+            Description = "Artifact-relative path to store the merged image info content"
         };
 
         private static readonly Option<bool> PublishOption = new("--publish")
diff --git a/src/ImageBuilder/Commands/PostPublishNotificationCommand.cs b/src/ImageBuilder/Commands/PostPublishNotificationCommand.cs
index ba81e85e6..00cb090e2 100644
--- a/src/ImageBuilder/Commands/PostPublishNotificationCommand.cs
+++ b/src/ImageBuilder/Commands/PostPublishNotificationCommand.cs
@@ -24,22 +24,26 @@ public class PostPublishNotificationCommand : ManifestCommand<PostPublishNotific
         private readonly IVssConnectionFactory _connectionFactory;
         private readonly INotificationService _notificationService;
         private readonly IOctokitClientFactory _octokitClientFactory;
+        private readonly IArtifactService _artifactService;
 
         public PostPublishNotificationCommand(
             IManifestJsonService manifestJsonService,
             IVssConnectionFactory connectionFactory,
             INotificationService notificationService,
-            IOctokitClientFactory octokitClientFactory) : base(manifestJsonService)
+            IOctokitClientFactory octokitClientFactory,
+            IArtifactService artifactService) : base(manifestJsonService)
         {
             _connectionFactory = connectionFactory ?? throw new ArgumentNullException(nameof(connectionFactory));
             _notificationService = notificationService ?? throw new ArgumentNullException(nameof(notificationService));
             _octokitClientFactory = octokitClientFactory ?? throw new ArgumentNullException(nameof(octokitClientFactory));
+            _artifactService = artifactService ?? throw new ArgumentNullException(nameof(artifactService));
         }
 
         protected override string Description => "Posts a notification about a publishing event";
 
         public override async Task ExecuteAsync()
         {
+            string imageInfoPath = _artifactService.ResolvePath(Options.ImageInfoPath);
             StringBuilder notificationMarkdown = new();
             string buildUrl = string.Empty;
             Dictionary<string, TaskResult?> taskResults = Options.TaskNames
@@ -95,7 +99,7 @@ public override async Task ExecuteAsync()
             notificationMarkdown.AppendLine("Published images are listed in comments below.");
             notificationMarkdown.AppendLine();
 
-            IEnumerable<string> imagesMarkdown = GetImagesMarkdown();
+            IEnumerable<string> imagesMarkdown = GetImagesMarkdown(imageInfoPath);
 
             await _notificationService.PostAsync(
                 $"Publish Result - {Options.SourceRepo}/{Options.SourceBranch}",
@@ -227,14 +231,14 @@ private static void WriteBuildParameters(Dictionary<string, string> buildParamet
             }
         }
 
-        private IEnumerable<string> GetImagesMarkdown()
+        private IEnumerable<string> GetImagesMarkdown(string imageInfoPath)
         {
-            if (!File.Exists(Options.ImageInfoPath))
+            if (!File.Exists(imageInfoPath))
             {
                 return Enumerable.Empty<string>();
             }
 
-            ImageArtifactDetails imageArtifactDetails = ImageInfoHelper.LoadFromFile(Options.ImageInfoPath, Manifest);
+            ImageArtifactDetails imageArtifactDetails = ImageInfoHelper.LoadFromFile(imageInfoPath, Manifest);
 
             List<(string digestSha, string repo, IEnumerable<string> tags)> imageInfos = new();
             foreach (RepoData repoData in imageArtifactDetails.Repos)
diff --git a/src/ImageBuilder/Commands/PublishImageInfoCommand.cs b/src/ImageBuilder/Commands/PublishImageInfoCommand.cs
index 518661732..62af6c33b 100644
--- a/src/ImageBuilder/Commands/PublishImageInfoCommand.cs
+++ b/src/ImageBuilder/Commands/PublishImageInfoCommand.cs
@@ -15,13 +15,20 @@ public class PublishImageInfoCommand : ManifestCommand<PublishImageInfoOptions>
         private readonly IGitService _gitService;
         private readonly IOctokitClientFactory _octokitClientFactory;
         private readonly ILogger<PublishImageInfoCommand> _logger;
+        private readonly IArtifactService _artifactService;
         private const string CommitMessage = "Merging Docker image info updates from build";
 
-        public PublishImageInfoCommand(IManifestJsonService manifestJsonService, IGitService gitService, IOctokitClientFactory octokitClientFactory, ILogger<PublishImageInfoCommand> logger) : base(manifestJsonService)
+        public PublishImageInfoCommand(
+            IManifestJsonService manifestJsonService,
+            IGitService gitService,
+            IOctokitClientFactory octokitClientFactory,
+            ILogger<PublishImageInfoCommand> logger,
+            IArtifactService artifactService) : base(manifestJsonService)
         {
             _gitService = gitService ?? throw new ArgumentNullException(nameof(gitService));
             _octokitClientFactory = octokitClientFactory ?? throw new ArgumentNullException(nameof(octokitClientFactory));
             _logger = logger ?? throw new ArgumentNullException(nameof(logger));
+            _artifactService = artifactService ?? throw new ArgumentNullException(nameof(artifactService));
         }
 
         protected override string Description => "Publishes a build's merged image info.";
@@ -29,6 +36,7 @@ public PublishImageInfoCommand(IManifestJsonService manifestJsonService, IGitSer
         public override async Task ExecuteAsync()
         {
             _logger.LogInformation("PUBLISHING IMAGE INFO");
+            string sourceImageInfoPath = _artifactService.ResolvePath(Options.ImageInfoPath);
 
             string repoPath = Path.Combine(Path.GetTempPath(), "imagebuilder-repos", Options.GitOptions.Repo);
             if (Directory.Exists(repoPath))
@@ -51,7 +59,7 @@ public override async Task ExecuteAsync()
 
                 Uri imageInfoPathIdentifier = GitHelper.GetBlobUrl(Options.GitOptions);
 
-                UpdateGitRepos(repoPath, repo, credentials);
+                UpdateGitRepos(repoPath, repo, credentials, sourceImageInfoPath);
             }
             finally
             {
@@ -62,7 +70,11 @@ public override async Task ExecuteAsync()
             }
         }
 
-        private void UpdateGitRepos(string repoPath, IRepository repo, CredentialsHandler credentials)
+        private void UpdateGitRepos(
+            string repoPath,
+            IRepository repo,
+            CredentialsHandler credentials,
+            string sourceImageInfoPath)
         {
             string imageInfoPath = Path.Combine(repoPath, Options.GitOptions.Path);
 
@@ -73,7 +85,7 @@ private void UpdateGitRepos(string repoPath, IRepository repo, CredentialsHandle
                 Directory.CreateDirectory(imageInfoDir);
             }
 
-            File.Copy(Options.ImageInfoPath, imageInfoPath, overwrite: true);
+            File.Copy(sourceImageInfoPath, imageInfoPath, overwrite: true);
 
             if (Options.IsDryRun)
             {
diff --git a/src/ImageBuilder/Commands/TrimUnchangedPlatformsCommand.cs b/src/ImageBuilder/Commands/TrimUnchangedPlatformsCommand.cs
index 62e5f1ecd..3c32bff06 100644
--- a/src/ImageBuilder/Commands/TrimUnchangedPlatformsCommand.cs
+++ b/src/ImageBuilder/Commands/TrimUnchangedPlatformsCommand.cs
@@ -15,10 +15,14 @@ namespace Microsoft.DotNet.ImageBuilder.Commands
     public class TrimUnchangedPlatformsCommand : Command<TrimUnchangedPlatformsOptions>
     {
         private readonly ILogger<TrimUnchangedPlatformsCommand> _logger;
+        private readonly IArtifactService _artifactService;
 
-        public TrimUnchangedPlatformsCommand(ILogger<TrimUnchangedPlatformsCommand> logger)
+        public TrimUnchangedPlatformsCommand(
+            ILogger<TrimUnchangedPlatformsCommand> logger,
+            IArtifactService artifactService)
         {
             _logger = logger ?? throw new ArgumentNullException(nameof(logger));
+            _artifactService = artifactService ?? throw new ArgumentNullException(nameof(artifactService));
         }
 
         protected override string Description => "Trims platforms marked as unchanged from the image info file";
@@ -26,22 +30,23 @@ public TrimUnchangedPlatformsCommand(ILogger<TrimUnchangedPlatformsCommand> logg
         public override async Task ExecuteAsync()
         {
             _logger.LogInformation("TRIMMING UNCHANGED PLATFORMS");
+            string imageInfoPath = _artifactService.ResolvePath(Options.ImageInfoPath);
 
-            if (!File.Exists(Options.ImageInfoPath))
+            if (!File.Exists(imageInfoPath))
             {
                 _logger.LogInformation(PipelineHelper.FormatWarningCommand(
                     "Image info file not found. Skipping trimming unchanged platforms."));
                 return;
             }
 
-            string imageInfoContents = await File.ReadAllTextAsync(Options.ImageInfoPath);
+            string imageInfoContents = await File.ReadAllTextAsync(imageInfoPath);
             ImageArtifactDetails imageArtifactDetails = JsonConvert.DeserializeObject<ImageArtifactDetails>(imageInfoContents);
             RemoveUnchangedPlatforms(imageArtifactDetails);
             imageInfoContents = JsonHelper.SerializeObject(imageArtifactDetails);
 
             if (!Options.IsDryRun)
             {
-                await File.WriteAllTextAsync(Options.ImageInfoPath, imageInfoContents);
+                await File.WriteAllTextAsync(imageInfoPath, imageInfoContents);
             }
         }
 
diff --git a/src/ImageBuilder/Commands/WaitForMarAnnotationIngestionCommand.cs b/src/ImageBuilder/Commands/WaitForMarAnnotationIngestionCommand.cs
index 6fd8e58a8..73925b228 100644
--- a/src/ImageBuilder/Commands/WaitForMarAnnotationIngestionCommand.cs
+++ b/src/ImageBuilder/Commands/WaitForMarAnnotationIngestionCommand.cs
@@ -14,12 +14,16 @@ public class WaitForMarAnnotationIngestionCommand : Command<WaitForMarAnnotation
     {
         private readonly ILogger<WaitForMarAnnotationIngestionCommand> _logger;
         private readonly IMarImageIngestionReporter _imageIngestionReporter;
+        private readonly IArtifactService _artifactService;
 
         public WaitForMarAnnotationIngestionCommand(
-            ILogger<WaitForMarAnnotationIngestionCommand> logger, IMarImageIngestionReporter imageIngestionReporter)
+            ILogger<WaitForMarAnnotationIngestionCommand> logger,
+            IMarImageIngestionReporter imageIngestionReporter,
+            IArtifactService artifactService)
         {
             _logger = logger ?? throw new ArgumentNullException(nameof(logger));
             _imageIngestionReporter = imageIngestionReporter ?? throw new ArgumentNullException(nameof(imageIngestionReporter));
+            _artifactService = artifactService ?? throw new ArgumentNullException(nameof(artifactService));
         }
 
         protected override string Description => "Waits for annotations to complete ingestion into MAR";
@@ -27,8 +31,9 @@ public WaitForMarAnnotationIngestionCommand(
         public override async Task ExecuteAsync()
         {
             _logger.LogInformation("WAITING FOR ANNOTATION INGESTION");
+            string annotationDigestsPath = _artifactService.ResolvePath(Options.AnnotationDigestsPath);
 
-            string[] annotationDigests = File.ReadAllLines(Options.AnnotationDigestsPath);
+            string[] annotationDigests = File.ReadAllLines(annotationDigestsPath);
             IEnumerable<DigestInfo> digests = annotationDigests
                 .Select(digest =>
                 {
diff --git a/src/ImageBuilder/Commands/WaitForMcrImageIngestionCommand.cs b/src/ImageBuilder/Commands/WaitForMcrImageIngestionCommand.cs
index 5d751d311..645392cde 100644
--- a/src/ImageBuilder/Commands/WaitForMcrImageIngestionCommand.cs
+++ b/src/ImageBuilder/Commands/WaitForMcrImageIngestionCommand.cs
@@ -16,13 +16,17 @@ public class WaitForMcrImageIngestionCommand : ManifestCommand<WaitForMcrImageIn
     {
         private readonly ILogger<WaitForMcrImageIngestionCommand> _logger;
         private readonly IMarImageIngestionReporter _imageIngestionReporter;
+        private readonly IArtifactService _artifactService;
 
         public WaitForMcrImageIngestionCommand(
             IManifestJsonService manifestJsonService,
-            ILogger<WaitForMcrImageIngestionCommand> logger, IMarImageIngestionReporter imageIngestionReporter) : base(manifestJsonService)
+            ILogger<WaitForMcrImageIngestionCommand> logger,
+            IMarImageIngestionReporter imageIngestionReporter,
+            IArtifactService artifactService) : base(manifestJsonService)
         {
             _logger = logger ?? throw new ArgumentNullException(nameof(logger));
             _imageIngestionReporter = imageIngestionReporter ?? throw new ArgumentNullException(nameof(imageIngestionReporter));
+            _artifactService = artifactService ?? throw new ArgumentNullException(nameof(artifactService));
         }
 
         protected override string Description => "Waits for images to complete ingestion into MCR";
@@ -30,8 +34,9 @@ public WaitForMcrImageIngestionCommand(
         public override async Task ExecuteAsync()
         {
             _logger.LogInformation("WAITING FOR IMAGE INGESTION");
+            string imageInfoPath = _artifactService.ResolvePath(Options.ImageInfoPath);
 
-            if (!File.Exists(Options.ImageInfoPath))
+            if (!File.Exists(imageInfoPath))
             {
                 _logger.LogInformation(PipelineHelper.FormatWarningCommand(
                     "Image info file not found. Skipping image ingestion wait."));
@@ -40,7 +45,7 @@ public override async Task ExecuteAsync()
 
             if (!Options.IsDryRun)
             {
-                ImageArtifactDetails imageArtifactDetails = ImageInfoHelper.LoadFromFile(Options.ImageInfoPath, Manifest);
+                ImageArtifactDetails imageArtifactDetails = ImageInfoHelper.LoadFromFile(imageInfoPath, Manifest);
                 IEnumerable<DigestInfo> imageInfos = GetImageDigestInfos(imageArtifactDetails);
                 await _imageIngestionReporter.ReportImageStatusesAsync(
                     Options.MarServiceConnection,
diff --git a/src/ImageBuilder/IArtifactService.cs b/src/ImageBuilder/IArtifactService.cs
new file mode 100644
index 000000000..039da164a
--- /dev/null
+++ b/src/ImageBuilder/IArtifactService.cs
@@ -0,0 +1,23 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+namespace Microsoft.DotNet.ImageBuilder;
+
+/// <summary>
+/// Maps input and output artifact paths to the configured staging directory.
+/// Use when accepting files as input or writing files as output.
+/// </summary>
+public interface IArtifactService
+{
+    /// <summary>
+    /// Gets the full path to the specified artifact.
+    /// Does not create the artifact or guarantee its presence.
+    /// </summary>
+    string ResolvePath(string artifactPath);
+
+    /// <summary>
+    /// Writes <paramref name="contents"/> to the output path, creating its directory.
+    /// </summary>
+    void WriteAllText(string artifactPath, string contents);
+}
diff --git a/src/ImageBuilder/ImageBuilder.cs b/src/ImageBuilder/ImageBuilder.cs
index fe496a706..7530e8e2f 100644
--- a/src/ImageBuilder/ImageBuilder.cs
+++ b/src/ImageBuilder/ImageBuilder.cs
@@ -42,6 +42,7 @@ public static IHost CreateAppHost()
 
         // Register abstractions
         builder.Services.AddSingleton<IFileSystem, FileSystem>();
+        builder.Services.AddSingleton<IArtifactService, ArtifactService>();
 
         // Register services
         builder.Services.AddSingleton<IAzdoGitHttpClientFactory, AzdoGitHttpClientFactory>();
diff --git a/src/Infrastructure/Content/CHANGELOG.md b/src/Infrastructure/Content/CHANGELOG.md
index 0936f6feb..6945d654e 100644
--- a/src/Infrastructure/Content/CHANGELOG.md
+++ b/src/Infrastructure/Content/CHANGELOG.md
@@ -4,6 +4,22 @@ All breaking changes and new features in `eng/docker-tools` will be documented i
 
 ---
 
+## 2026-07-28: Publish stage artifacts consolidated
+
+The Publish stage now uploads `$(Build.ArtifactStagingDirectory)` once as
+`publish-attempt-$(System.JobAttempt)`. This replaces these separate artifacts:
+
+- `image-info-final-$(System.JobAttempt)`
+- `eol-annotation-data-$(System.JobAttempt)`
+- `annotation-digests-<registry>-$(System.JobAttempt)`
+- `source-build-id`
+
+Consumers of those artifact names must download the consolidated artifact instead. Files retain
+their staging-directory paths, including `imageInfo/`, `eol-annotation-data/`,
+`annotation-digests/`, and `sourceBuildId/source-build-id.txt`.
+
+---
+
 ## 2026-06-11: Configurable per-registry referrer-lookup rate limit
 
 - Issue: [#2141](https://github.com/dotnet/docker-tools/issues/2141)
diff --git a/src/Infrastructure/Content/templates/jobs/build-images.yml b/src/Infrastructure/Content/templates/jobs/build-images.yml
index 7327b6d69..d98d88527 100644
--- a/src/Infrastructure/Content/templates/jobs/build-images.yml
+++ b/src/Infrastructure/Content/templates/jobs/build-images.yml
@@ -140,4 +140,4 @@ jobs:
         displayName: Publish SBOM
         internalProjectName: ${{ parameters.internalProjectName }}
         publicProjectName: ${{ parameters.publicProjectName }}
-        condition: ne(variables['BuildImages.builtImages'], '')
+        condition: and(succeeded(), ne(variables['BuildImages.builtImages'], ''))
diff --git a/src/Infrastructure/Content/templates/jobs/post-build.yml b/src/Infrastructure/Content/templates/jobs/post-build.yml
index 32b9c7999..8a07759bd 100644
--- a/src/Infrastructure/Content/templates/jobs/post-build.yml
+++ b/src/Infrastructure/Content/templates/jobs/post-build.yml
@@ -11,7 +11,6 @@ jobs:
   variables:
     imageInfosSubDir: "/image-infos"
     imageInfosHostDir: "$(Build.ArtifactStagingDirectory)$(imageInfosSubDir)"
-    imageInfosContainerDir: "$(artifactsPath)$(imageInfosSubDir)"
     imageInfosOutputSubDir: "/output"
     sbomOutputDir: "$(Build.ArtifactStagingDirectory)/sbom"
   steps:
@@ -73,11 +72,10 @@ jobs:
         exit 0
       }
 
-      New-Item -ItemType Directory -Path $(imageInfosHostDir)$(imageInfosOutputSubDir) -Force
       $(runImageBuilderCmd) mergeImageInfo `
         --manifest $(manifest) `
-        $(imageInfosContainerDir) `
-        $(imageInfosContainerDir)$(imageInfosOutputSubDir)/image-info.json `
+        image-infos `
+        image-infos/output/image-info.json `
         $(manifestVariables)
     name: MergeImageInfoFiles
     displayName: Merge Image Info Files
@@ -89,7 +87,7 @@ jobs:
         condition: and(succeeded(), ne(variables['MergeImageInfoFiles.noImageInfos'], 'true'), ne(variables['Build.Reason'], 'PullRequest'))
         args: >-
           createManifestList
-          '$(imageInfosContainerDir)$(imageInfosOutputSubDir)/image-info.json'
+          'image-infos/output/image-info.json'
           --repo-prefix '${{ parameters.publishConfig.BuildRegistry.repoPrefix }}'
           --os-type '*'
           --architecture '*'
diff --git a/src/Infrastructure/Content/templates/jobs/publish.yml b/src/Infrastructure/Content/templates/jobs/publish.yml
index 5839be2d7..e78449c91 100644
--- a/src/Infrastructure/Content/templates/jobs/publish.yml
+++ b/src/Infrastructure/Content/templates/jobs/publish.yml
@@ -37,8 +37,6 @@ jobs:
       value: $[ replace(variables['System.PullRequest.SourceBranch'], 'refs/heads/', '') ]
   - name: imageInfoHostDir
     value: $(Build.ArtifactStagingDirectory)/imageInfo
-  - name: imageInfoContainerDir
-    value: $(artifactsPath)/imageInfo
   - name: sourceBuildIdOutputDir
     value: $(Build.ArtifactStagingDirectory)/sourceBuildId
   - name: commitOverrideArg
@@ -99,7 +97,7 @@ jobs:
 
   - script: >
       $(runImageBuilderCmd) trimUnchangedPlatforms
-      '$(imageInfoContainerDir)/image-info.json'
+      'imageInfo/image-info.json'
     displayName: Trim Unchanged Images
 
   - template: /eng/docker-tools/templates/steps/run-imagebuilder.yml@self
@@ -113,23 +111,15 @@ jobs:
         --os-type '*'
         --architecture '*'
         --repo-prefix '${{ parameters.publishConfig.PublishRegistry.repoPrefix }}'
-        --image-info '$(imageInfoContainerDir)/image-info.json'
+        --image-info 'imageInfo/image-info.json'
         $(dryRunArg)
         $(imageBuilder.pathArgs)
         $(imageBuilder.commonCmdArgs)
 
-  - template: /eng/docker-tools/templates/steps/publish-artifact.yml@self
-    parameters:
-      path: $(imageInfoHostDir)
-      artifactName: image-info-final-$(System.JobAttempt)
-      displayName: Publish Image Info File Artifact
-      internalProjectName: ${{ parameters.internalProjectName }}
-      publicProjectName: ${{ parameters.publicProjectName }}
-
   - template: /eng/docker-tools/templates/steps/wait-for-mcr-image-ingestion.yml@self
     parameters:
       publishConfig: ${{ parameters.publishConfig }}
-      imageInfoPath: '$(imageinfoContainerDir)/image-info.json'
+      imageInfoPath: 'imageInfo/image-info.json'
       minQueueTime: $(imageQueueTime)
       dryRunArg: $(dryRunArg)
       condition: succeeded()
@@ -139,9 +129,6 @@ jobs:
       dryRunArg: $(dryRunArg)
       condition: and(succeeded(), eq(variables['publishReadme'], 'true'))
 
-  - script: mkdir -p $(Build.ArtifactStagingDirectory)/eol-annotation-data
-    displayName: Create EOL Annotation Data Directory
-
   - script: |-
       cd $(versionsRepoRoot)
       git pull origin $(gitHubVersionsRepoInfo.branch)
@@ -155,13 +142,13 @@ jobs:
 
   - script: >
       $(runImageBuilderCmd) mergeImageInfo
-      $(imageInfoContainerDir)
-      $(imageInfoContainerDir)/full-image-info-new.json
+      imageInfo
+      imageInfo/full-image-info-new.json
       $(manifestVariables)
       $(dryRunArg)
       --manifest $(manifest)
       --publish
-      --initial-image-info-path $(imageInfoContainerDir)/full-image-info-orig.json
+      --initial-image-info-path imageInfo/full-image-info-orig.json
       $(commitOverrideArg)
     condition: and(succeeded(), eq(variables['publishImageInfo'], 'true'))
     displayName: Merge Image Info
@@ -178,7 +165,7 @@ jobs:
       condition: and(succeeded(), eq(variables['ingestKustoImageInfo'], 'true'))
       args: >-
         ingestKustoImageInfo
-        '$(imageInfoContainerDir)/image-info.json'
+        'imageInfo/image-info.json'
         '$(kusto.cluster)'
         '$(kusto.database)'
         '$(kusto.imageTable)'
@@ -197,29 +184,21 @@ jobs:
         generateEolAnnotationDataForPublish
         '${{ parameters.publishConfig.PublishRegistry.server }}'
         '${{ parameters.publishConfig.PublishRegistry.repoPrefix }}'
-        '$(artifactsPath)/eol-annotation-data/eol-annotation-data.json'
-        '$(imageInfoContainerDir)/full-image-info-orig.json'
-        '$(imageInfoContainerDir)/full-image-info-new.json'
+        'eol-annotation-data/eol-annotation-data.json'
+        'imageInfo/full-image-info-orig.json'
+        'imageInfo/full-image-info-new.json'
         $(generateEolAnnotationDataExtraOptions)
         $(dryRunArg)
 
-  - template: /eng/docker-tools/templates/steps/publish-artifact.yml@self
-    parameters:
-      path: $(Build.ArtifactStagingDirectory)/eol-annotation-data
-      artifactName: eol-annotation-data-$(System.JobAttempt)
-      displayName: Publish EOL Annotation Data Artifact
-      internalProjectName: internal
-      publicProjectName: public
-      condition: and(succeeded(), eq(variables['publishEolAnnotations'], 'true'))
-
   - template: /eng/docker-tools/templates/steps/annotate-eol-digests.yml@self
     parameters:
       acr: ${{ parameters.publishConfig.PublishRegistry }}
-      dataFile: $(artifactsPath)/eol-annotation-data/eol-annotation-data.json
+      dataFile: eol-annotation-data/eol-annotation-data.json
+      skipArtifactPublish: true
 
   - script: >
       $(runImageBuilderCmd) publishImageInfo
-      '$(imageInfoContainerDir)/full-image-info-new.json'
+      'imageInfo/full-image-info-new.json'
       '$(gitHubVersionsRepoInfo.userName)'
       '$(gitHubVersionsRepoInfo.email)'
       $(gitHubVersionsRepoInfo.authArgs)
@@ -248,7 +227,7 @@ jobs:
       $(runImageBuilderCmd) postPublishNotification
       '$(publishNotificationRepoName)'
       '$(branchName)'
-      '$(imageInfoContainerDir)/image-info.json'
+      'imageInfo/image-info.json'
       $(Build.BuildId)
       '$(System.AccessToken)'
       '$(azdoOrgName)'
@@ -285,8 +264,10 @@ jobs:
 
   - template: /eng/docker-tools/templates/steps/publish-artifact.yml@self
     parameters:
-      path: $(sourceBuildIdOutputDir)
-      artifactName: source-build-id
-      displayName: Publish Source Build ID Artifact
+      path: $(Build.ArtifactStagingDirectory)
+      artifactName: publish-attempt-$(System.JobAttempt)
+      displayName: Publish Artifacts
       internalProjectName: ${{ parameters.internalProjectName }}
       publicProjectName: ${{ parameters.publicProjectName }}
+      # Always upload, even if the pipeline fails or is canceled.
+      condition: always()
diff --git a/src/Infrastructure/Content/templates/steps/annotate-eol-digests.yml b/src/Infrastructure/Content/templates/steps/annotate-eol-digests.yml
index 8e2f7571b..ded682854 100644
--- a/src/Infrastructure/Content/templates/steps/annotate-eol-digests.yml
+++ b/src/Infrastructure/Content/templates/steps/annotate-eol-digests.yml
@@ -4,10 +4,11 @@ parameters:
 # Path to EOL annotation data JSON file generated by 'generateEolAnnotationData*' command
 - name: dataFile
   type: string
+- name: skipArtifactPublish
+  type: boolean
+  default: false
 
 steps:
-  - script: mkdir -p $(Build.ArtifactStagingDirectory)/annotation-digests
-    displayName: Create Annotation Digests Directory
   - template: /eng/docker-tools/templates/steps/run-imagebuilder.yml@self
     parameters:
       displayName: Annotate EOL Images (${{ parameters.acr.server }})
@@ -18,16 +19,17 @@ steps:
         "${{ parameters.dataFile }}"
         "${{ parameters.acr.server }}"
         "${{ parameters.acr.repoPrefix }}"
-        $(artifactsPath)/annotation-digests/annotation-digests.txt
+        annotation-digests/annotation-digests.txt
         $(dryRunArg)
-  - template: /eng/docker-tools/templates/steps/publish-artifact.yml@self
-    parameters:
-      path: $(Build.ArtifactStagingDirectory)/annotation-digests
-      artifactName: annotation-digests-${{ parameters.acr.server }}-$(System.JobAttempt)
-      displayName: Publish Annotation Digests List (${{ parameters.acr.server }})
-      internalProjectName: internal
-      publicProjectName: public
-      condition: and(succeeded(), eq(variables['publishEolAnnotations'], 'true'))
+  - ${{ if not(parameters.skipArtifactPublish) }}:
+    - template: /eng/docker-tools/templates/steps/publish-artifact.yml@self
+      parameters:
+        path: $(Build.ArtifactStagingDirectory)/annotation-digests
+        artifactName: annotation-digests-${{ parameters.acr.server }}-$(System.JobAttempt)
+        displayName: Publish Annotation Digests List (${{ parameters.acr.server }})
+        internalProjectName: internal
+        publicProjectName: public
+        condition: and(succeeded(), eq(variables['publishEolAnnotations'], 'true'))
   - template: /eng/docker-tools/templates/steps/run-imagebuilder.yml@self
     parameters:
       displayName: Wait for Annotation Ingestion (${{ parameters.acr.server }})
@@ -40,4 +42,4 @@ steps:
       condition: and(succeeded(), eq(variables['publishEolAnnotations'], 'true'), eq(variables['waitForIngestionEnabled'], 'true'))
       args: >-
         waitForMarAnnotationIngestion
-        $(artifactsPath)/annotation-digests/annotation-digests.txt
+        annotation-digests/annotation-digests.txt
diff --git a/src/Infrastructure/Content/templates/steps/publish-artifact.yml b/src/Infrastructure/Content/templates/steps/publish-artifact.yml
index 72ce47005..6095a1dd6 100644
--- a/src/Infrastructure/Content/templates/steps/publish-artifact.yml
+++ b/src/Infrastructure/Content/templates/steps/publish-artifact.yml
@@ -11,7 +11,7 @@ parameters:
   type: string
 - name: condition
   type: string
-  default: 'true'
+  default: succeeded()
 
 steps:
 - ${{ if eq(variables['System.TeamProject'], parameters.internalProjectName) }}:
@@ -20,9 +20,9 @@ steps:
       path: ${{ parameters.path }}
       artifact: ${{ parameters.artifactName }}
     displayName: ${{ parameters.displayName }}
-    condition: and(succeeded(), ${{ parameters.condition }})
+    condition: ${{ parameters.condition }}
 - ${{ if eq(variables['System.TeamProject'], parameters.publicProjectName) }}:
   - publish: ${{ parameters.path }}
     artifact: ${{ parameters.artifactName }}
     displayName: ${{ parameters.displayName }}
-    condition: and(succeeded(), ${{ parameters.condition }})
+    condition: ${{ parameters.condition }}