diff --git a/runner.py b/runner.py
index b6a7973c..dd205cc9 100644
--- a/runner.py
+++ b/runner.py
@@ -24,16 +24,10 @@
 
     # Convert to behave commandline args
     product_tag = argument.product.lower().replace("-", "_")
-    if product_tag in ["eps_fhir_prescribing", "eps_fhir_dispensing"]:
-        base_product_tag = "eps_fhir"
-        endpoint_tag = product_tag.replace("eps_fhir_", "")
-        tags = f" --tags {base_product_tag} --tags {endpoint_tag}"
+    if argument.tags:
+        tags = f" --tags {product_tag} --tags {argument.tags} "
     else:
         tags = f" --tags {product_tag}"
-
-    if argument.tags:
-        tags += f" --tags {argument.tags}"
-
     PRODUCT = f" -D product={argument.product}"
     ENV = f" -D env={argument.env}"