diff --git a/asterisk/conf/extensions.conf b/asterisk/conf/extensions.conf
index 1164ab1..aa4702a 100644
--- a/asterisk/conf/extensions.conf
+++ b/asterisk/conf/extensions.conf
@@ -7,12 +7,12 @@
 exten => s,1,Verbose(1, "INFO ${CALLERID(num)} was passed to default.")
  same => n,Wait(1)
  same => n,Answer(1)
- same => n,Goto(default,s-info,1)
- same => n,Goto(default,s-info,1)
- same => n,Goto(default,s-info,1)
+ same => n,Goto(s-info,1)
+ same => n,Goto(s-info,1)
+ same => n,Goto(s-info,1)
  same => n,Hangup(3)
 
-ext => s-info,1,PlayTones(info)
+exten => s-info,1,PlayTones(info)
  same => n,Playback(hangup-try-again)
 
 [globals]
diff --git a/asterisk/conf/queues.conf b/asterisk/conf/queues.conf
index 629e59c..3e3367a 100644
--- a/asterisk/conf/queues.conf
+++ b/asterisk/conf/queues.conf
@@ -46,4 +46,4 @@ ringinuse = yes
 ;
 ; The "penalty" value is not interesting for our use case.
 ; With PJSIP, the BLF/Presence interface is identical to the standard interface name.
-member => to-ext/1000,0,1000,to-ext/1000
+member => Local/1000@to-ext,0