diff --git a/Samples/Gateway/Headquarter/App.config b/Samples/Gateway/Headquarter/App.config
index beb678771c8..3b52f4df052 100644
--- a/Samples/Gateway/Headquarter/App.config
+++ b/Samples/Gateway/Headquarter/App.config
@@ -9,12 +9,12 @@
 
   <GatewayConfig>
     <Sites>
-      <Site Key="SiteA" Address="http://localhost/SiteA/" ChannelType="Http"/>
-      <Site Key="SiteB" Address="http://localhost/SiteB/" ChannelType="Http"/>
+      <Site Key="SiteA" Address="http://localhost:25899/SiteA/" ChannelType="Http"/>
+      <Site Key="SiteB" Address="http://localhost:25899/SiteB/" ChannelType="Http"/>
     </Sites>
     <Channels>
-      <Channel Address="http://localhost/Headquarter/" ChannelType="Http" Default="true"/>
-      <Channel Address="http://localhost/Headquarter2/" ChannelType="Http"/>
+      <Channel Address="http://localhost:25899/Headquarter/" ChannelType="Http" Default="true"/>
+      <Channel Address="http://localhost:25899/Headquarter2/" ChannelType="Http"/>
     </Channels>
   </GatewayConfig>
 </configuration>
\ No newline at end of file
diff --git a/Samples/Gateway/SiteA/App.config b/Samples/Gateway/SiteA/App.config
index 2f059a7199f..6a0fd2bd14d 100644
--- a/Samples/Gateway/SiteA/App.config
+++ b/Samples/Gateway/SiteA/App.config
@@ -2,7 +2,12 @@
 <configuration>
   <configSections>
     <section name="MessageForwardingInCaseOfFaultConfig" type="NServiceBus.Config.MessageForwardingInCaseOfFaultConfig, NServiceBus.Core" />
+    <section name="GatewayConfig" type="NServiceBus.Config.GatewayConfig, NServiceBus.Core" />
   </configSections>
-
+  <GatewayConfig>
+    <Channels>
+      <Channel Address="http://localhost:25899/SiteA/" ChannelType="Http" Default="true"/>
+    </Channels>
+  </GatewayConfig>
   <MessageForwardingInCaseOfFaultConfig ErrorQueue="error"/>
 </configuration>
\ No newline at end of file
diff --git a/Samples/Gateway/SiteB/App.config b/Samples/Gateway/SiteB/App.config
index a37613b6742..db25ebb754a 100644
--- a/Samples/Gateway/SiteB/App.config
+++ b/Samples/Gateway/SiteB/App.config
@@ -2,8 +2,12 @@
 <configuration>
   <configSections>
     <section name="MessageForwardingInCaseOfFaultConfig" type="NServiceBus.Config.MessageForwardingInCaseOfFaultConfig, NServiceBus.Core"/>
+    <section name="GatewayConfig" type="NServiceBus.Config.GatewayConfig, NServiceBus.Core" />
   </configSections>
-
+  <GatewayConfig>
+    <Channels>
+      <Channel Address="http://localhost:25899/SiteB/" ChannelType="Http" Default="true"/>
+    </Channels>
+  </GatewayConfig>
   <MessageForwardingInCaseOfFaultConfig ErrorQueue="error"/>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/Samples/Gateway/WebClient/Index.htm b/Samples/Gateway/WebClient/Index.htm
index bba63ed11e8..60482ec55bd 100644
--- a/Samples/Gateway/WebClient/Index.htm
+++ b/Samples/Gateway/WebClient/Index.htm
@@ -43,7 +43,7 @@
 	</script>
     <h1>Click the button below to make a JSONP request to the nservicebus gateway</h1>
     <p>Gateway address:</p>
-    <input type="text" id="gatewayaddress" value="http://localhost/Headquarter/" size="60"/><br/>
+    <input type="text" id="gatewayaddress" value="http://localhost:25899/Headquarter/" size="60"/><br/>
     <input type="button" id="go" name="go" value="Send price update command to server" />
 </body>
 </html>