diff --git a/app/dialplans/resources/switch/conf/dialplan/470_valet_park_in.xml b/app/dialplans/resources/switch/conf/dialplan/470_valet_park_in.xml
index e4fef5114b..128ea0074d 100644
--- a/app/dialplans/resources/switch/conf/dialplan/470_valet_park_in.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/470_valet_park_in.xml
@@ -1,7 +1,7 @@
 <context name="{v_context}">
 	<extension name="valet_park_in" number="park+*5900" continue="false" app_uuid="c192ee50-084d-40d8-8d9a-6959369382c8" enabled="false" order="470">
-		<condition field="destination_number" expression="^(park\+)?(\*5900)$">
+		<condition field="destination_number" expression="^(?:(?:park\+\*?)|(?:\*))(5900)$">
 			<action application="valet_park" data="park@${domain_name} auto in 5901 5999"/>
 		</condition>
- </extension>
+	</extension>
 </context>
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 a21095f58c..b51390a82c 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,8 +1,8 @@
 <context name="{v_context}">
 	<extension name="valet_park_out" number="park+*5901-*5999" continue="false" app_uuid="242130d4-61d6-4daf-9dd1-b139a2b3b166" enabled="false" order="475">
-		<condition field="destination_number" expression="^(park\+)?\*(59[0-9][0-9])$">
+		<condition field="destination_number" expression="^(?:(?:park\+\*?)|(?:\*))(59[0-9][0-9])$">
 			<action application="answer"/>
-			<action application="valet_park" data="park@${domain_name} $2"/>
+			<action application="valet_park" data="park@${domain_name} $1"/>
 		</condition>
- </extension>
+	</extension>
 </context>