diff --git a/install/protocol-server-data/bap-client.yaml-sample b/install/protocol-server-data/bap-client.yaml-sample
index 96b1e35..ad3e1cc 100644
--- a/install/protocol-server-data/bap-client.yaml-sample
+++ b/install/protocol-server-data/bap-client.yaml-sample
@@ -130,4 +130,9 @@ app:
     batchSize: 100
     # In minutes
     syncInterval: 30
-    redis_db: 3
\ No newline at end of file
+    redis_db: 3
+  
+  useLayer2Config: USE_LAYER_2_CONFIG
+  mandateLayer2Config: MANDATE_LAYER_2_CONFIG
+
+  
diff --git a/install/scripts/update_bap_config.sh b/install/scripts/update_bap_config.sh
index ec4530e..c4aa61a 100755
--- a/install/scripts/update_bap_config.sh
+++ b/install/scripts/update_bap_config.sh
@@ -80,6 +80,8 @@ if [[ $(uname -s ) == 'Darwin' ]];then
         "BAP_SUBSCRIBER_ID=$bap_subscriber_id"
         "BAP_SUBSCRIBER_URL=$bap_subscriber_url"
         "BAP_SUBSCRIBER_KEY_ID=$bap_subscriber_key_id"
+        "USE_LAYER_2_CONFIG"=true
+        "MANDATE_LAYER_2_CONFIG"=true
     )
 
     echo "Configuring BAP protocol server"
@@ -108,6 +110,8 @@ else
         ["BAP_SUBSCRIBER_ID"]=$bap_subscriber_id
         ["BAP_SUBSCRIBER_URL"]=$bap_subscriber_url
         ["BAP_SUBSCRIBER_KEY_ID"]=$bap_subscriber_key_id
+        ["USE_LAYER_2_CONFIG"]=true
+        ["MANDATE_LAYER_2_CONFIG"]=true        
     )
 
     echo "Configuring BAP protocol server"
diff --git a/layer2/samples/uei:charging_1.1.0.yaml b/layer2/samples/uei_charging_1.1.0.yaml
similarity index 100%
rename from layer2/samples/uei:charging_1.1.0.yaml
rename to layer2/samples/uei_charging_1.1.0.yaml