diff --git a/samples/bng_mapping.yaml b/samples/bng_mapping_any.yaml
similarity index 97%
copy from samples/bng_mapping.yaml
copy to samples/bng_mapping_any.yaml
index f61bfdb..cc9c2b8 100644
--- a/samples/bng_mapping.yaml
+++ b/samples/bng_mapping_any.yaml
@@ -23,5 +23,5 @@
     bngmapping:
       type: tosca.nodes.BNGPortMapping
       properties:
-        s_tag: 222
+        s_tag: "any"
         switch_port: 4
diff --git a/samples/bng_mapping.yaml b/samples/bng_mapping_range.yaml
similarity index 97%
rename from samples/bng_mapping.yaml
rename to samples/bng_mapping_range.yaml
index f61bfdb..5286ff5 100644
--- a/samples/bng_mapping.yaml
+++ b/samples/bng_mapping_range.yaml
@@ -23,5 +23,5 @@
     bngmapping:
       type: tosca.nodes.BNGPortMapping
       properties:
-        s_tag: 222
+        s_tag: "220-225"
         switch_port: 4
diff --git a/samples/bng_mapping.yaml b/samples/bng_mapping_single.yaml
similarity index 97%
copy from samples/bng_mapping.yaml
copy to samples/bng_mapping_single.yaml
index f61bfdb..92c24d8 100644
--- a/samples/bng_mapping.yaml
+++ b/samples/bng_mapping_single.yaml
@@ -23,5 +23,5 @@
     bngmapping:
       type: tosca.nodes.BNGPortMapping
       properties:
-        s_tag: 222
+        s_tag: "222"
         switch_port: 4