diff --git a/app/dialplans/resources/switch/conf/dialplan/470_valet_park.xml b/app/dialplans/resources/switch/conf/dialplan/470_valet_park.xml
index ae502c5256..49084c1605 100644
--- a/app/dialplans/resources/switch/conf/dialplan/470_valet_park.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/470_valet_park.xml
@@ -4,7 +4,7 @@
 		<action application="set" data="referred_by_user=$1" inline="true"/>
 	</condition>
 	<condition field="destination_number" expression="^(?:park)?\+?\*(59(0[1-9]|[1-9][0-9]))$" break="never">
-		<action application="set" data="valet_context=${domain_name}" inline="true"/>
+		<action application="set" data="valet_context=${context}" inline="true"/>
 	</condition>
 	<condition field="destination_number" expression="^(?:park)?\+?\*(59(0[1-9]|[1-9][0-9]))$" break="never">
 		<action application="set" data="park_in_use=false" inline="true"/>
diff --git a/app/dialplans/resources/switch/conf/dialplan/474_valet_park_in.xml b/app/dialplans/resources/switch/conf/dialplan/474_valet_park_in.xml
index 08275b1811..0ee782212c 100644
--- a/app/dialplans/resources/switch/conf/dialplan/474_valet_park_in.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/474_valet_park_in.xml
@@ -5,6 +5,6 @@
 		<action application="set" data="valet_hold_music=${hold_music}" enabled="true"/>
 		<action application="set" data="valet_parking_orbit_exten=${referred_by_user}" enabled="true"/>
 		<action application="set" data="valet_parking_timeout=900" enabled="true"/>
-		<action application="valet_park" data="5900@${domain_name} auto in 5901 5999" enabled="true"/>
+		<action application="valet_park" data="5900@${context} auto in 5901 5999" enabled="true"/>
 	</condition>
 </extension>
diff --git a/app/dialplans/resources/switch/conf/dialplan/475_valet_park_out.xml b/app/dialplans/resources/switch/conf/dialplan/475_valet_park_out.xml
index ec00260185..6f225d5bb4 100644
--- a/app/dialplans/resources/switch/conf/dialplan/475_valet_park_out.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/475_valet_park_out.xml
@@ -1,6 +1,6 @@
 <extension name="valet_park_out" number="5901-5999" context="${domain_name}" continue="false" app_uuid="242130d4-61d6-4daf-9dd1-b139a2b3b166" enabled="false" order="475">
 	<condition field="destination_number" expression="^(?:park\+)?(59[0-9][0-9])$">
 		<action application="answer"/>
-		<action application="valet_park" data="5900@${domain_name} $1"/>
+		<action application="valet_park" data="5900@${context} $1"/>
 	</condition>
 </extension>