diff --git a/lib/commands/upload/build.rb b/lib/commands/upload/build.rb
index bb5cbf9..2a5abd4 100644
--- a/lib/commands/upload/build.rb
+++ b/lib/commands/upload/build.rb
@@ -23,6 +23,7 @@ class Build < EmergeCLI::Commands::GlobalOptions
         option :base_sha, type: :string, required: false, desc: 'Base SHA'
         option :previous_sha, type: :string, required: false, desc: 'Previous SHA'
         option :pr_number, type: :string, required: false, desc: 'PR number'
+        option :tag, type: :string, required: false, desc: 'Tag to associate with this build'
 
         def initialize(network: nil, git_info_provider: nil)
           @network = network
@@ -102,7 +103,8 @@ def fetch_upload_url
             # Optional
             base_sha:,
             previous_sha:,
-            pr_number: pr_number&.to_s
+            pr_number: pr_number&.to_s,
+            tag: @options[:tag]
           }.compact
 
           upload_response = @network.post(
diff --git a/lib/commands/upload/snapshots/snapshots.rb b/lib/commands/upload/snapshots/snapshots.rb
index cfbcc18..5b2773f 100644
--- a/lib/commands/upload/snapshots/snapshots.rb
+++ b/lib/commands/upload/snapshots/snapshots.rb
@@ -27,6 +27,7 @@ class Snapshots < EmergeCLI::Commands::GlobalOptions
         option :base_sha, type: :string, required: false, desc: 'Base SHA'
         option :previous_sha, type: :string, required: false, desc: 'Previous SHA'
         option :pr_number, type: :string, required: false, desc: 'PR number'
+        option :tag, type: :string, required: false, desc: 'Tag to associate with this snapshot run'
         option :concurrency, type: :integer, default: 5,
                              desc: 'Number of concurrency for parallel image uploads when not using batch mode'
 
@@ -178,7 +179,8 @@ def create_run
             # Optional
             base_sha:,
             previous_sha:,
-            pr_number: pr_number&.to_s
+            pr_number: pr_number&.to_s,
+            tag: @options[:tag]
           }.compact
 
           response = @network.post(path: '/v1/snapshots/run', body: payload)
diff --git a/test/commands/upload/snapshots/snapshots_test.rb b/test/commands/upload/snapshots/snapshots_test.rb
index 114e3f5..3d4a81f 100644
--- a/test/commands/upload/snapshots/snapshots_test.rb
+++ b/test/commands/upload/snapshots/snapshots_test.rb
@@ -74,6 +74,7 @@ def test_overrides_git_info_with_options
             base_sha: 'custom-base-sha',
             previous_sha: 'custom-previous-sha',
             pr_number: 'custom-pr',
+            tag: 'manual-run',
             concurrency: 1
           }
 
@@ -85,6 +86,7 @@ def test_overrides_git_info_with_options
           assert_equal 'custom-base-sha', run_request[:body][:base_sha]
           assert_equal 'custom-previous-sha', run_request[:body][:previous_sha]
           assert_equal 'custom-pr', run_request[:body][:pr_number]
+          assert_equal 'manual-run', run_request[:body][:tag]
         end
       end
     end