diff --git a/lib/getOptions.js b/lib/getOptions.js
index 3ac55794..c84e538f 100644
--- a/lib/getOptions.js
+++ b/lib/getOptions.js
@@ -120,9 +120,9 @@ const getBaseOptions = cb => {
 
   if (process.env.SEMAPHORE) {
     options.service_name = 'semaphore';
-    options.service_job_id = process.env.SEMAPHORE_BUILD_NUMBER;
-    git_commit = process.env.REVISION;
-    git_branch = process.env.BRANCH_NAME;
+    options.service_job_id = process.env.SEMAPHORE_WORKFLOW_ID;
+    git_commit = process.env.SEMAPHORE_GIT_SHA;
+    git_branch = process.env.SEMAPHORE_GIT_WORKING_BRANCH;
   }
 
   if (process.env.TF_BUILD) {
diff --git a/test/getOptions.js b/test/getOptions.js
index 5bf0312f..78958c32 100644
--- a/test/getOptions.js
+++ b/test/getOptions.js
@@ -657,9 +657,9 @@ const testBuildkite = (sut, done) => {
 
 const testSemaphore = (sut, done) => {
   process.env.SEMAPHORE = true;
-  process.env.SEMAPHORE_BUILD_NUMBER = '1234';
-  process.env.REVISION = 'e3e3e3e3e3e3e3e3e';
-  process.env.BRANCH_NAME = 'master';
+  process.env.SEMAPHORE_WORKFLOW_ID = '1234';
+  process.env.SEMAPHORE_GIT_SHA = 'e3e3e3e3e3e3e3e3e';
+  process.env.SEMAPHORE_GIT_WORKING_BRANCH = 'master';
 
   const git = {
     head: {