diff --git a/src/Microsoft.DotNet.ImageBuilder/src/Commands/IOptions.cs b/src/Microsoft.DotNet.ImageBuilder/src/Commands/IOptions.cs
index 51c92431d..6f34f0c52 100644
--- a/src/Microsoft.DotNet.ImageBuilder/src/Commands/IOptions.cs
+++ b/src/Microsoft.DotNet.ImageBuilder/src/Commands/IOptions.cs
@@ -8,6 +8,5 @@ public interface IOptions
     {
         bool IsDryRun { get; }
         bool IsVerbose { get; }
-        string GetOption(string name);
     }
 }
diff --git a/src/Microsoft.DotNet.ImageBuilder/src/Commands/Options.cs b/src/Microsoft.DotNet.ImageBuilder/src/Commands/Options.cs
index 210b0b00a..f4fc102b4 100644
--- a/src/Microsoft.DotNet.ImageBuilder/src/Commands/Options.cs
+++ b/src/Microsoft.DotNet.ImageBuilder/src/Commands/Options.cs
@@ -16,24 +16,6 @@ public class Options : IOptions
     {
         public bool IsDryRun { get; set; }
         public bool IsVerbose { get; set; }
-
-        public string? GetOption(string name)
-        {
-            string? result;
-
-            PropertyInfo? propInfo = GetType().GetProperties()
-                .FirstOrDefault(p => string.Equals(p.Name, name, StringComparison.Ordinal));
-            if (propInfo != null)
-            {
-                result = propInfo.GetValue(this)?.ToString() ?? "";
-            }
-            else
-            {
-                result = null;
-            }
-
-            return result;
-        }
     }
 
     public class CliOptionsBuilder
diff --git a/src/Microsoft.DotNet.ImageBuilder/src/ViewModel/TagInfo.cs b/src/Microsoft.DotNet.ImageBuilder/src/ViewModel/TagInfo.cs
index 851d281d5..30442d71c 100644
--- a/src/Microsoft.DotNet.ImageBuilder/src/ViewModel/TagInfo.cs
+++ b/src/Microsoft.DotNet.ImageBuilder/src/ViewModel/TagInfo.cs
@@ -33,7 +33,7 @@ public static TagInfo Create(
                 Model = model,
                 BuildContextPath = buildContextPath
             };
-            tagInfo.Name = variableHelper.SubstituteValues(name, tagInfo.GetVariableValue);
+            tagInfo.Name = variableHelper.SubstituteValues(name);
             tagInfo.FullyQualifiedName = GetFullyQualifiedName(repoName, tagInfo.Name);
 
             if (model.Syndication != null)
@@ -55,19 +55,5 @@ public static string GetFullyQualifiedName(string repoName, string tagName)
         {
             return $"{repoName}:{tagName}";
         }
-
-        private string GetVariableValue(string variableType, string variableName)
-        {
-            string variableValue = null;
-
-            if (string.Equals(variableType, VariableHelper.SystemVariableTypeId, StringComparison.Ordinal)
-                && string.Equals(variableName, VariableHelper.DockerfileGitCommitShaVariableName, StringComparison.Ordinal)
-                && BuildContextPath != null)
-            {
-                variableValue = GitHelper.GetCommitSha(BuildContextPath);
-            }
-
-            return variableValue;
-        }
     }
 }
diff --git a/src/Microsoft.DotNet.ImageBuilder/src/ViewModel/VariableHelper.cs b/src/Microsoft.DotNet.ImageBuilder/src/ViewModel/VariableHelper.cs
index 28dd2bbfa..3daaa409b 100644
--- a/src/Microsoft.DotNet.ImageBuilder/src/ViewModel/VariableHelper.cs
+++ b/src/Microsoft.DotNet.ImageBuilder/src/ViewModel/VariableHelper.cs
@@ -13,12 +13,9 @@ namespace Microsoft.DotNet.ImageBuilder.ViewModel
     public class VariableHelper
     {
         private const char BuiltInDelimiter = ':';
-        public const string DockerfileGitCommitShaVariableName = "DockerfileGitCommitSha";
         public const string McrTagsYmlRepoTypeId = "McrTagsYmlRepo";
         public const string McrTagsYmlTagGroupTypeId = "McrTagsYmlTagGroup";
         public const string RepoVariableTypeId = "Repo";
-        public const string SystemVariableTypeId = "System";
-        private const string TimeStampVariableName = "TimeStamp";
         private const string VariableGroupName = "variable";
 
         private static readonly string s_tagVariablePattern = $"\\$\\((?<{VariableGroupName}>[\\w:\\-.|]+)\\)";
@@ -109,22 +106,7 @@ public VariableHelper(Manifest manifest, IManifestOptionsInfo options, Func<stri
             string variableType = variableNameParts[0];
             variableName = variableNameParts[1];
 
-            if (string.Equals(variableType, SystemVariableTypeId, StringComparison.Ordinal))
-            {
-                if (string.Equals(variableName, TimeStampVariableName, StringComparison.Ordinal))
-                {
-                    variableValue = s_timeStamp;
-                }
-                else if (getContextBasedSystemValue != null)
-                {
-                    variableValue = getContextBasedSystemValue(variableType, variableName);
-                }
-                else
-                {
-                    variableValue = Options.GetOption(variableName);
-                }
-            }
-            else if (string.Equals(variableType, RepoVariableTypeId, StringComparison.Ordinal))
+            if (string.Equals(variableType, RepoVariableTypeId, StringComparison.Ordinal))
             {
                 variableValue = GetRepoById(variableName)?.QualifiedName;
             }