diff --git a/app/dialplan/resources/xml/dialplan/310_send_to_voicemail.xml b/app/dialplan/resources/xml/dialplan/310_send_to_voicemail.xml
index f849644729..c648d654fc 100644
--- a/app/dialplan/resources/xml/dialplan/310_send_to_voicemail.xml
+++ b/app/dialplan/resources/xml/dialplan/310_send_to_voicemail.xml
@@ -3,9 +3,11 @@
 		<condition field="destination_number" expression="^\*99(\d{2,7})$">
 			<action application="answer"/>
 			<action application="sleep" data="1000"/>
-			<action application="set" data="dialed_extension=$1"/>
-			<action application="export" data="dialed_extension=$1"/>
-			<action application="voicemail" data="default ${domain_name} ${dialed_extension}"/>
+			<action application="set" data="voicemail_action=save"/>
+			<action application="set" data="voicemail_id=$1"/>
+			<action application="set" data="voicemail_profile=default"/>
+			<action application="lua" data="voicemail.lua"/>
+			<!--<action application="voicemail" data="default ${domain_name} ${dialed_extension}"/>-->
 		</condition>
 	</extension>
 </context>
\ No newline at end of file
diff --git a/app/dialplan/resources/xml/dialplan/320_vmain.xml b/app/dialplan/resources/xml/dialplan/320_vmain.xml
index 90ffea9d34..a906d0f2f1 100644
--- a/app/dialplan/resources/xml/dialplan/320_vmain.xml
+++ b/app/dialplan/resources/xml/dialplan/320_vmain.xml
@@ -4,7 +4,10 @@
 		<condition field="destination_number" expression="^vmain$|^\*4000$|^\*98$">
 			<action application="answer"/>
 			<action application="sleep" data="1000"/>
-			<action application="voicemail" data="check default ${domain_name}"/>  
+			<action application="set" data="voicemail_action=check"/>
+			<action application="set" data="voicemail_profile=default"/>
+			<action application="lua" data="voicemail.lua"/>
+			<!--<action application="voicemail" data="check default ${domain_name}"/>-->
 		</condition>
 	</extension>
 </context>
\ No newline at end of file
diff --git a/app/dialplan/resources/xml/dialplan/330_vmain_user.xml b/app/dialplan/resources/xml/dialplan/330_vmain_user.xml
index f433637f0b..3e20bb8afd 100644
--- a/app/dialplan/resources/xml/dialplan/330_vmain_user.xml
+++ b/app/dialplan/resources/xml/dialplan/330_vmain_user.xml
@@ -4,7 +4,11 @@
 		<condition field="destination_number" expression="^\*97$">
 			<action application="answer"/>
 			<action application="sleep" data="1000"/>
-			<action application="voicemail" data="check default ${domain_name} ${caller_id_number}"/>
+			<action application="set" data="voicemail_action=check"/>
+			<action application="set" data="voicemail_id=${caller_id_number}"/>
+			<action application="set" data="voicemail_profile=default"/>
+			<action application="lua" data="voicemail.lua"/>
+			<!--<action application="voicemail" data="check default ${domain_name} ${caller_id_number}"/>-->
 		</condition>
 	</extension>
 </context>
\ No newline at end of file
diff --git a/app/dialplan/resources/xml/dialplan/999_local_extension.xml b/app/dialplan/resources/xml/dialplan/999_local_extension.xml
index 2e58d417f0..b76c8600c9 100644
--- a/app/dialplan/resources/xml/dialplan/999_local_extension.xml
+++ b/app/dialplan/resources/xml/dialplan/999_local_extension.xml
@@ -28,7 +28,11 @@
 			<action application="bridge" data="user/${user_data(${destination_number}@${domain_name} attr id)}@${domain_name}"/>
 			<action application="answer"/>
 			<action application="sleep" data="1000"/>
-			<action application="voicemail" data="default ${domain_name} ${dialed_extension}"/>
+			<!--<action application="voicemail" data="default ${domain_name} ${dialed_extension}"/>-->
+			<action application="set" data="voicemail_action=save"/>
+			<action application="set" data="voicemail_id=$1"/>
+			<action application="set" data="voicemail_profile=default"/>
+			<action application="lua" data="voicemail.lua"/>
 		</condition>
 	</extension>
 </context>
\ No newline at end of file