diff --git a/src/common/getMetadata.ts b/src/common/getMetadata.ts
index e639462..dd93185 100644
--- a/src/common/getMetadata.ts
+++ b/src/common/getMetadata.ts
@@ -59,15 +59,18 @@ function getMetadata(runner: string): IMetadata {
     if (repoName?.endsWith('.git')) {
         repoName = repoName?.substring(0, repoName?.lastIndexOf('.'));
     }
-    const ci_unique_run_id = process.env.GITHUB_RUN_ID?.concat('_').concat(process.env.GITHUB_RUN_NUMBER || '1');
+    // to support both gitlab and github
+    const ciJobId = process.env.CI_JOB_ID || process.env.GITHUB_RUN_ID?.concat('_').concat(process.env.GITHUB_RUN_NUMBER || '1');
+    const branch = process.env.CI_COMMIT_REF_NAME || process.env.GITHUB_REF_NAME;
+    const username = process.env.GITLAB_USER_LOGIN || process.env.GITHUB_TRIGGERING_ACTOR;
 
     return {
-        branch: process.env.GITHUB_REF_NAME || gitBranch,
+        branch: branch || gitBranch,
         projectName: repoName,
         repository: gitProjectUrl,
         repositoryName: repoName,
         hostname: os.hostname(),
-        username: process.env.GITHUB_TRIGGERING_ACTOR || (userInfo ? userInfo.username : null),
+        username: username || (userInfo ? userInfo.username : null),
         os: os.type(),
         osVersion: os.release(),
         gitCommitDate: gitCommitDate ? gitCommitDate.toISO() : null,
@@ -75,7 +78,7 @@ function getMetadata(runner: string): IMetadata {
         testRunner: runner,
         testRunnerVersion: testRunnerVersion,
         cpuCount: os.cpus().length,
-        id: ci_unique_run_id || uuid4()
+        id: ciJobId || uuid4()
     };
 }
 
diff --git a/src/jest/publishJestMetrics.ts b/src/jest/publishJestMetrics.ts
index a01adc3..d5fb5f5 100644
--- a/src/jest/publishJestMetrics.ts
+++ b/src/jest/publishJestMetrics.ts
@@ -3,9 +3,7 @@ import getMetadata from '../common/getMetadata';
 import { IMetadata, IJestTestResults } from '../common/types';
 
 function publishJestMetrics(result: any) {
-    const JEST_TESTDATA_API_URL: string = process.env.JEST_TESTDATA_API_URL
-        ? process.env.JEST_TESTDATA_API_URL
-        : 'http://your_domain/your_jest_api'; // TODO change to your api endpoint
+    const JEST_TESTDATA_API_URL: string = process.env.JEST_TESTDATA_API_URL ?? '<unknown>'; // your api endpoint eg. 'http://your_domain/jest'
 
     const metadata: IMetadata = getMetadata('jest');
     const payload: IJestTestResults = {
diff --git a/src/playwright/publishPlaywrightMetrics.ts b/src/playwright/publishPlaywrightMetrics.ts
index 3b9d8e0..3300693 100644
--- a/src/playwright/publishPlaywrightMetrics.ts
+++ b/src/playwright/publishPlaywrightMetrics.ts
@@ -24,9 +24,7 @@ class PublishLocalPlaywrightMetrics implements Reporter {
     if (!this.junitOutputFile) {
       return;
     }
-    const PLAYWRIGHT_TESTDATA_API_URL: string = process.env.PLAYWRIGHT_TESTDATA_API_URL
-        ? process.env.PLAYWRIGHT_TESTDATA_API_URL
-        : 'http://your_domain/testdata/junit'; // TODO change to your api endpoint
+    const PLAYWRIGHT_TESTDATA_API_URL: string = process.env.PLAYWRIGHT_TESTDATA_API_URL ?? '<unknown>'; // your api endpoint eg. 'http://your_domain/testdata/junit'
     const formdata = new FormData();
     Object.entries(getMetadata("playwright")).forEach(([key, value]) => {
       if (value !== null && value !== undefined) {