diff --git a/src/main/java/com/eprosima/vbsdds/idl/templates/cpp/DDSPubSubMain.stg b/src/main/java/com/eprosima/vbsdds/idl/templates/cpp/DDSPubSubMain.stg
index d8dcc824b2b11188b3259ea6adc75bef4373903b..d1a8af37d372c07af38cffdfc1d9fe62acdca553 100644
--- a/src/main/java/com/eprosima/vbsdds/idl/templates/cpp/DDSPubSubMain.stg
+++ b/src/main/java/com/eprosima/vbsdds/idl/templates/cpp/DDSPubSubMain.stg
@@ -121,6 +121,11 @@ $if(ctx.NotUseVbsFramework)$
     {
         xmlparser::XMLProfileManager::loadXMLFile(xml_config_file);
     }
+$else$
+    if (argc == 3)
+    {
+        xml_config_file = argv[2];
+    }
 $endif$
 
     // Register the type being used
diff --git a/src/main/java/com/eprosima/vbsdds/idl/templates/cpp/DDSPubSubMain2to2.stg b/src/main/java/com/eprosima/vbsdds/idl/templates/cpp/DDSPubSubMain2to2.stg
index b6cd7c8fc58990e375270708f82d198af6fcb366..b140ed5b420231d418dc7370057b22d6e87b8479 100644
--- a/src/main/java/com/eprosima/vbsdds/idl/templates/cpp/DDSPubSubMain2to2.stg
+++ b/src/main/java/com/eprosima/vbsdds/idl/templates/cpp/DDSPubSubMain2to2.stg
@@ -63,6 +63,11 @@ $if(ctx.NotUseVbsFramework)$
     {
         xmlparser::XMLProfileManager::loadXMLFile(xml_config_file);
     }
+$else$
+    if (argc == 3)
+    {
+        xml_config_file = argv[2];
+    }
 $endif$
 
     // Register the type being used
diff --git a/src/main/java/com/eprosima/vbsdds/idl/templates/cpp/DDSPublisherSource.stg b/src/main/java/com/eprosima/vbsdds/idl/templates/cpp/DDSPublisherSource.stg
index 8448cf2aeed00b5d9c48addf75cbecec1b67924a..a010fcdc9b3d9d5ea0c45604e0aa7c51cd8aac8b 100644
--- a/src/main/java/com/eprosima/vbsdds/idl/templates/cpp/DDSPublisherSource.stg
+++ b/src/main/java/com/eprosima/vbsdds/idl/templates/cpp/DDSPublisherSource.stg
@@ -99,11 +99,7 @@ bool $ctx.filename$Publisher::init(const std::string& xml_config_file)
     $endif$
 
     /* Create DomainParticipant*/
-$if(ctx.TestExample)$
     std::string participant_profile_name = "test_xml_pub.xml_profile";
-$else$
-    std::string participant_profile_name = "pub_participant_profile";
-$endif$
 
 $if(ctx.UseVbsFramework)$
 $if(ctx.TestExample)$
diff --git a/src/main/java/com/eprosima/vbsdds/idl/templates/cpp/DDSPublisherSource2to2.stg b/src/main/java/com/eprosima/vbsdds/idl/templates/cpp/DDSPublisherSource2to2.stg
index 74480bcc9826e5893cfb2fe0090f73c819416145..3b5451f871238e1adc5faa1a36e3e13c032d4c47 100644
--- a/src/main/java/com/eprosima/vbsdds/idl/templates/cpp/DDSPublisherSource2to2.stg
+++ b/src/main/java/com/eprosima/vbsdds/idl/templates/cpp/DDSPublisherSource2to2.stg
@@ -107,11 +107,7 @@ bool $ctx.filename$Publisher::init(bool use_env)
     $endif$
 
     /* Create DomainParticipant*/
-$if(ctx.TestExample)$
     std::string participant_profile_name = "test_xml_pub.xml_profile";
-$else$
-    std::string participant_profile_name = "pub_participant_profile";
-$endif$
 
 $if(ctx.UseVbsFramework)$
 $if(ctx.TestExample)$
diff --git a/src/main/java/com/eprosima/vbsdds/idl/templates/cpp/DDSPublisherSourceZeroCopy.stg b/src/main/java/com/eprosima/vbsdds/idl/templates/cpp/DDSPublisherSourceZeroCopy.stg
index 84371896d94dc6023ed59b074585278f9057ec5f..b4a6175d6de65350b40151da6c14a3b25d8f0298 100644
--- a/src/main/java/com/eprosima/vbsdds/idl/templates/cpp/DDSPublisherSourceZeroCopy.stg
+++ b/src/main/java/com/eprosima/vbsdds/idl/templates/cpp/DDSPublisherSourceZeroCopy.stg
@@ -99,11 +99,7 @@ bool $ctx.filename$Publisher::init(bool use_env)
     $endif$
 
     /* Create DomainParticipant*/
-$if(ctx.TestExample)$
     std::string participant_profile_name = "test_xml_pub.xml_profile";
-$else$
-    std::string participant_profile_name = "pub_participant_profile";
-$endif$
 
 $if(ctx.UseVbsFramework)$
 $if(ctx.TestExample)$
diff --git a/src/main/java/com/eprosima/vbsdds/idl/templates/cpp/DDSSubscriberSource.stg b/src/main/java/com/eprosima/vbsdds/idl/templates/cpp/DDSSubscriberSource.stg
index 080cd4b9abc62bf0c1177e5d674f08370b9dcd7e..cc3e7ff3e75e3f4b1ebe50b5717ae74419b82d01 100644
--- a/src/main/java/com/eprosima/vbsdds/idl/templates/cpp/DDSSubscriberSource.stg
+++ b/src/main/java/com/eprosima/vbsdds/idl/templates/cpp/DDSSubscriberSource.stg
@@ -117,11 +117,7 @@ bool $ctx.filename$Subscriber::init(const std::string& xml_config_file)
     $endif$
 
     /* Create DomainParticipant*/
-$if(ctx.TestExample)$
     std::string participant_profile_name = "test_xml_sub.xml_profile";
-$else$
-    std::string participant_profile_name = "pub_participant_profile";
-$endif$
 
 $if(ctx.UseVbsFramework)$
 $if(ctx.TestExample)$
diff --git a/src/main/java/com/eprosima/vbsdds/idl/templates/cpp/DDSSubscriberSource2to2.stg b/src/main/java/com/eprosima/vbsdds/idl/templates/cpp/DDSSubscriberSource2to2.stg
index 395516f99c4865b20d6b17031e219078863f235c..34691af3f7d23a371e02c53bb1bb72a761e9eac5 100644
--- a/src/main/java/com/eprosima/vbsdds/idl/templates/cpp/DDSSubscriberSource2to2.stg
+++ b/src/main/java/com/eprosima/vbsdds/idl/templates/cpp/DDSSubscriberSource2to2.stg
@@ -100,11 +100,7 @@ bool $ctx.filename$Subscriber::init(bool use_env)
     $endif$
 
     /* Create DomainParticipant*/
-$if(ctx.TestExample)$
     std::string participant_profile_name = "test_xml_sub.xml_profile";
-$else$
-    std::string participant_profile_name = "pub_participant_profile";
-$endif$
 
 $if(ctx.UseVbsFramework)$
 $if(ctx.TestExample)$
diff --git a/src/main/java/com/eprosima/vbsdds/idl/templates/cpp/DDSSubscriberSourceZeroCopy.stg b/src/main/java/com/eprosima/vbsdds/idl/templates/cpp/DDSSubscriberSourceZeroCopy.stg
index 510ea73ce8536ce6c756c6a2caef53dc79dcaab2..5c7144a7ea7d0ca555ea2c2058ea8d3d1f6bf02d 100644
--- a/src/main/java/com/eprosima/vbsdds/idl/templates/cpp/DDSSubscriberSourceZeroCopy.stg
+++ b/src/main/java/com/eprosima/vbsdds/idl/templates/cpp/DDSSubscriberSourceZeroCopy.stg
@@ -94,11 +94,7 @@ bool $ctx.filename$Subscriber::init(bool use_env)
     $endif$
 
     /* Create DomainParticipant*/
-$if(ctx.TestExample)$
     std::string participant_profile_name = "test_xml_sub.xml_profile";
-$else$
-    std::string participant_profile_name = "pub_participant_profile";
-$endif$
 
 $if(ctx.UseVbsFramework)$
 $if(ctx.TestExample)$