diff --git a/src/Agoda.Tests.Metrics.Tests/TestCasePayloadTests.cs b/src/Agoda.Tests.Metrics.Tests/TestCasePayloadTests.cs
index 2ad2be6..c29c1d3 100644
--- a/src/Agoda.Tests.Metrics.Tests/TestCasePayloadTests.cs
+++ b/src/Agoda.Tests.Metrics.Tests/TestCasePayloadTests.cs
@@ -20,5 +20,6 @@ public void WhenInit_ShouldHaveDefaultVarsFromEnvironment()
 #pragma warning restore AG0035
         underTest.Platform.ShouldBe((int)Environment.OSVersion.Platform);
         underTest.Os.ShouldBe(Environment.OSVersion.VersionString);
+        underTest.RunId.ShouldNotBeNull();
     }
 }
\ No newline at end of file
diff --git a/src/Agoda.Tests.Metrics/TestCasePayload.cs b/src/Agoda.Tests.Metrics/TestCasePayload.cs
index eb21826..ca799f8 100644
--- a/src/Agoda.Tests.Metrics/TestCasePayload.cs
+++ b/src/Agoda.Tests.Metrics/TestCasePayload.cs
@@ -26,6 +26,15 @@ public TestCasePayload(string metricsVersion, GitContext gitContext, IList<TestC
             Branch = gitContext.BranchName;
             NUnitTestCases = testCases.ToList();
             IsDebuggerAttached = System.Diagnostics.Debugger.IsAttached;
+            var ciJobId = Environment.GetEnvironmentVariable("CI_JOB_ID");
+            if (!string.IsNullOrEmpty(ciJobId))
+            {
+                RunId = ciJobId;
+            }
+            else
+            {
+                RunId = Guid.NewGuid().ToString();
+            }
         }
 
         public bool IsDebuggerAttached { get; set; }
@@ -49,5 +58,8 @@ public TestCasePayload(string metricsVersion, GitContext gitContext, IList<TestC
         public string RepositoryName { get; set; }
 
         public IList<TestCase> NUnitTestCases { get; set; }
+
+        public string RunId { get; set; }
+
     }
 }