diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4a582eb79fe761ccefcdf72b5e04ffa1d9e7dec6..75fe53cf3b0ec9e7f7525e72d5fca6bb50b1d834 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,3 +1,11 @@
+variables:
+    CUCUMBER_TAG:
+      value: "tsa"
+      description: "Enter which tests to be execute. Other valid options are - 'cache', 'policy', 'signer', 'task', 'negative'."
+    BASE_URL:
+      value: "https://gaiax.vereign.com/tsa"
+      description: "Enter the environment on which the services are deployed."
+
 stages:
   - test
 
@@ -14,12 +22,10 @@ cache:
 test:
   stage: test
   image: gradle:7.4.1-jdk17
-  only:
-    - main
   tags: 
    - amd64-docker
   script:
-    - gradle regressionSuite -PbaseUrl=https://gaiax.vereign.com/tsa -Dcucumber.tags="@tsa, not @wip" -Dcourgette.threads=1 -Dcourgette.runLevel=Scenario -Dcourgette.rerunFailedScenarios=false -Dcourgette.rerunAttempts=1
+    - gradle regressionSuite -PbaseUrl=${BASE_URL} -Dcucumber.tags="@${CUCUMBER_TAG}, not @wip" -Dcourgette.threads=1 -Dcourgette.runLevel=Scenario -Dcourgette.rerunFailedScenarios=false -Dcourgette.rerunAttempts=1
   artifacts:
     when: always
     reports: