diff --git a/src/Runner.Worker/JobExtension.cs b/src/Runner.Worker/JobExtension.cs
index 58e8929b44a..02b79090554 100644
--- a/src/Runner.Worker/JobExtension.cs
+++ b/src/Runner.Worker/JobExtension.cs
@@ -396,7 +396,7 @@ public async Task<List<IStep>> InitializeJob(IExecutionContext jobContext, Pipel
                     }
 
                     // Register custom image creation post-job step if the "snapshot" token is present in the message.
-                    var snapshotRequest = templateEvaluator.EvaluateJobSnapshotRequest(message.Snapshot, jobContext.ExpressionValues, jobContext.ExpressionFunctions);
+                    var snapshotRequest = message.Snapshot;
                     if (snapshotRequest != null)
                     {
                         var snapshotOperationProvider = HostContext.GetService<ISnapshotOperationProvider>();
diff --git a/src/Sdk/DTPipelines/Pipelines/AgentJobRequestMessage.cs b/src/Sdk/DTPipelines/Pipelines/AgentJobRequestMessage.cs
index e6ecbf4509d..732d12306f5 100644
--- a/src/Sdk/DTPipelines/Pipelines/AgentJobRequestMessage.cs
+++ b/src/Sdk/DTPipelines/Pipelines/AgentJobRequestMessage.cs
@@ -43,7 +43,7 @@ public AgentJobRequestMessage(
             TemplateToken jobOutputs,
             IList<TemplateToken> defaults,
             ActionsEnvironmentReference actionsEnvironment,
-            TemplateToken snapshot,
+            Snapshot snapshot,
             String messageType = JobRequestMessageTypes.PipelineAgentJobRequest)
         {
             this.MessageType = messageType;
@@ -240,7 +240,7 @@ public ActionsEnvironmentReference ActionsEnvironment
         }
 
         [DataMember(EmitDefaultValue = false)]
-        public TemplateToken Snapshot
+        public Snapshot Snapshot
         {
             get;
             set;
diff --git a/src/Test/L0/Worker/JobExtensionL0.cs b/src/Test/L0/Worker/JobExtensionL0.cs
index 9ce99070bf6..ea70d423f31 100644
--- a/src/Test/L0/Worker/JobExtensionL0.cs
+++ b/src/Test/L0/Worker/JobExtensionL0.cs
@@ -5,6 +5,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using GitHub.DistributedTask.ObjectTemplating.Tokens;
+using GitHub.DistributedTask.Pipelines;
 using GitHub.DistributedTask.Pipelines.ObjectTemplating;
 using GitHub.DistributedTask.WebApi;
 using GitHub.Runner.Worker;
@@ -486,46 +487,21 @@ public async Task EnsureNoSnapshotPostJobStep()
         public Task EnsureSnapshotPostJobStepForStringToken()
         {
             var snapshot = new Pipelines.Snapshot("TestImageNameFromStringToken");
-            var imageNameValueStringToken = new StringToken(null, null, null, snapshot.ImageName);
+            var imageNameValueStringToken = new Snapshot(imageName: snapshot.ImageName);
             return EnsureSnapshotPostJobStepForToken(imageNameValueStringToken, snapshot);
         }
 
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public Task EnsureSnapshotPostJobStepForMappingToken()
-        {
-            var snapshot = new Pipelines.Snapshot("TestImageNameFromMappingToken");
-            var imageNameValueStringToken = new StringToken(null, null, null, snapshot.ImageName);
-            var mappingToken = new MappingToken(null, null, null)
-            {
-                { new StringToken(null,null,null, PipelineTemplateConstants.ImageName), imageNameValueStringToken }
-            };
-
-            return EnsureSnapshotPostJobStepForToken(mappingToken, snapshot);
-        }
-
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Worker")]
         public Task EnsureSnapshotPostJobStepForMappingToken_WithIf_Is_False()
         {
             var snapshot = new Pipelines.Snapshot("TestImageNameFromMappingToken", condition: $"{PipelineTemplateConstants.Success}() && 1==0", version: "2.*");
-            var imageNameValueStringToken = new StringToken(null, null, null, snapshot.ImageName);
-            var condition = new StringToken(null, null, null, snapshot.Condition);
-            var version = new StringToken(null, null, null, snapshot.Version);
-
-            var mappingToken = new MappingToken(null, null, null)
-            {
-                { new StringToken(null,null,null, PipelineTemplateConstants.ImageName), imageNameValueStringToken },
-                { new StringToken(null,null,null, PipelineTemplateConstants.If), condition },
-                { new StringToken(null,null,null, PipelineTemplateConstants.CustomImageVersion), version }
-            };
-
-            return EnsureSnapshotPostJobStepForToken(mappingToken, snapshot, skipSnapshotStep: true);
+            
+            return EnsureSnapshotPostJobStepForToken(snapshot, snapshot, skipSnapshotStep: true);
         }
 
-        private async Task EnsureSnapshotPostJobStepForToken(TemplateToken snapshotToken, Pipelines.Snapshot expectedSnapshot, bool skipSnapshotStep = false)
+        private async Task EnsureSnapshotPostJobStepForToken(Snapshot snapshotToken, Pipelines.Snapshot expectedSnapshot, bool skipSnapshotStep = false)
         {
             using (TestHostContext hc = CreateTestContext())
             {