diff --git a/src/test/resources/features/tsa/policy/policy/{group}/{name}/{version}/evaluation/POST.feature b/src/test/resources/features/tsa/policy/policy/{group}/{name}/{version}/evaluation/POST.feature
index 16cbee720e7a7ef79689ec372e3de7f0fc25fff5..2e6ce3506865ae623ef1311ab5c2ba1b2259a02c 100644
--- a/src/test/resources/features/tsa/policy/policy/{group}/{name}/{version}/evaluation/POST.feature
+++ b/src/test/resources/features/tsa/policy/policy/{group}/{name}/{version}/evaluation/POST.feature
@@ -37,7 +37,7 @@ Feature: API -TSA - Policy - :group/:name/:version/evaluation POST
     And the response is valid according to the {Policy_Evaluate_schema.json} REST schema
     And the field {allow} has the value {true}
 
-  @issue-policy-35
+  @bug-policy-35
   Scenario: TSA - DID resolution - Positive
     Given I load the REST request {Policy.json} with profile {didResolve_evaluate}
     And I execute the policy {/policy/example/resolve/1.0/evaluation}
@@ -68,7 +68,7 @@ Feature: API -TSA - Policy - :group/:name/:version/evaluation POST
     And the response is valid according to the {Policy_Evaluate_negative_schema.json} REST schema
     And the field {message} has the value {error evaluating policy}
 
-  @negative @issue-policy-35
+  @negative @bug-policy-35
   Scenario: TSA - DID resolution with incorrect did - Negative
     Then I load the REST request {Policy.json} with profile {didResolve_missing_method}
     And I execute the policy {/policy/example/resolve/1.0/evaluation}
diff --git a/src/test/resources/features/tsa/task/v1/task/{taskName}/GET.feature b/src/test/resources/features/tsa/task/v1/task/{taskName}/GET.feature
index 42eb3f41c3167b822873a1f80589323ec64692b9..1ee887627188163aba4c2116b8d807e0427e1e2c 100644
--- a/src/test/resources/features/tsa/task/v1/task/{taskName}/GET.feature
+++ b/src/test/resources/features/tsa/task/v1/task/{taskName}/GET.feature
@@ -30,7 +30,7 @@ Feature: API -TSA - Task - v1/task GET
   Background:
     Given we are testing the TSA Task Api
 
-  @issue-policy-35
+  @bug-policy-35
   Scenario: TSA - Executing Task with DID resolver and Evaluate the Cache - Positive
     Given I load the REST request {Policy.json} with profile {didResolve_evaluate}
     And I send the current request as POST to endpoint {/v1/task/didResolve}
diff --git a/src/test/resources/features/tsa/task/v1/task/{taskName}/POST.feature b/src/test/resources/features/tsa/task/v1/task/{taskName}/POST.feature
index 38c6cc2ca9bc988650ca8b5dc793ce4ebee591c9..bd1a4e3550c980b6ec5045e1f31676f5a3ef53e1 100644
--- a/src/test/resources/features/tsa/task/v1/task/{taskName}/POST.feature
+++ b/src/test/resources/features/tsa/task/v1/task/{taskName}/POST.feature
@@ -30,7 +30,7 @@ Feature: API -TSA - Task - v1/task POST
   Background:
     Given we are testing the TSA Task Api
 
-  @issue-policy-35
+  @bug-policy-35
   Scenario: TSA - Executing Task with DID resolver - Positive
     Then I load the REST request {Policy.json} with profile {didResolve_evaluate}
     And I send the current request as POST to endpoint {/v1/task/didResolve}