diff --git a/files/providers/wls_server/create.py.erb b/files/providers/wls_server/create.py.erb
index aad38b6f..2f9077bc 100644
--- a/files/providers/wls_server/create.py.erb
+++ b/files/providers/wls_server/create.py.erb
@@ -204,6 +204,13 @@ try:
         set_attribute_value('Directory', default_file_store, use_default_value_when_empty)
 
     #FCUBS improvement
+    print("Creating the OverloadProtection Bean CREATE!!!!")
+    cd('/Servers/'+name+'/OverloadProtection/'+name)
+    cmo.createServerFailureTrigger()
+    print("CREATED THE ServerFailureTrigger")
+    cd('/Servers/'+name+'/OverloadProtection/'+name+'/ServerFailureTrigger/'+name)
+    set_attribute_value('MaxStuckThreadTime', stuck_thread_max_time, use_default_value_when_empty)
+
     if diag_image_directory:
         cd('/Servers/'+name+'/ServerDiagnosticConfig/'+name)
         set_attribute_value('ImageDir', diag_image_directory, use_default_value_when_empty)
diff --git a/files/providers/wls_server/modify.py.erb b/files/providers/wls_server/modify.py.erb
index b283a680..cfa65eb7 100644
--- a/files/providers/wls_server/modify.py.erb
+++ b/files/providers/wls_server/modify.py.erb
@@ -238,6 +238,12 @@ try:
         set_attribute_value('Directory', default_file_store, use_default_value_when_empty)
 
     # Added for the FCUBS best practices
+    print("Creating the OverloadProtection Bean Inside Modify!!!!")
+    cd('/Servers/'+name+'/OverloadProtection/'+name)
+    cmo.createServerFailureTrigger()
+    cd('/Servers/'+name+'/OverloadProtection/'+name+'/ServerFailureTrigger/'+name)
+    set_attribute_value('MaxStuckThreadTime', stuck_thread_max_time, use_default_value_when_empty)
+
     if diag_image_directory:
         cd('/Servers/'+name+'/ServerDiagnosticConfig/'+name)
         set_attribute_value('ImageDir', diag_image_directory, use_default_value_when_empty)