Index: branches/2931_OR-Tools_LP_MIP/HeuristicLab.Services.OKB/3.3/Web.config
===================================================================
--- branches/2931_OR-Tools_LP_MIP/HeuristicLab.Services.OKB/3.3/Web.config	(revision 16070)
+++ branches/2931_OR-Tools_LP_MIP/HeuristicLab.Services.OKB/3.3/Web.config	(revision 16139)
@@ -2,6 +2,6 @@
 <configuration>
   <connectionStrings>
-    <add name="HeuristicLab.Authentication" connectionString="Data Source=.\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication"/>
-    <add name="HeuristicLab.Services.OKB.DataAccess.Properties.Settings.OKBConnectionString" connectionString="Data Source=.\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.OKB"/>
+    <add name="HeuristicLab.Authentication" connectionString="Data Source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication"/>
+    <add name="HeuristicLab.Services.OKB.DataAccess.Properties.Settings.OKBConnectionString" connectionString="Data Source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.OKB"/>
   </connectionStrings>
 
@@ -34,5 +34,5 @@
         <host>
           <baseAddresses>
-            <add baseAddress="http://localhost:8000/OKB-3.3/AdministrationService.svc" />
+            <add baseAddress="http://services.heuristiclab.com/OKB-3.3/AdministrationService.svc" />
           </baseAddresses>
         </host>
@@ -41,10 +41,10 @@
         <endpoint binding="wsHttpBinding" bindingConfiguration="DefaultWsHttpBinding"
           name="WSHttpBinding_IQueryService" contract="HeuristicLab.Services.OKB.Query.IQueryService" />
-        <endpoint address="net.tcp://localhost:8001/OKB-3.3/QueryService.svc"
+        <endpoint address="net.tcp://services.heuristiclab.com/OKB-3.3/QueryService.svc"
           binding="netTcpBinding" bindingConfiguration="DefaultNetBinding"
           name="NetBinding_IQueryService" contract="HeuristicLab.Services.OKB.Query.IQueryService" />
         <host>
           <baseAddresses>
-            <add baseAddress="http://localhost:8000/OKB-3.3/QueryService.svc" />
+            <add baseAddress="http://services.heuristiclab.com/OKB-3.3/QueryService.svc" />
           </baseAddresses>
         </host>
@@ -55,5 +55,5 @@
         <host>
           <baseAddresses>
-            <add baseAddress="http://localhost:8000/OKB-3.3/RunCreationService.svc" />
+            <add baseAddress="http://services.heuristiclab.com/OKB-3.3/RunCreationService.svc" />
           </baseAddresses>
         </host>
@@ -91,5 +91,5 @@
             roleProviderName="AspNetSqlRoleProvider" />
           <serviceCredentials>
-            <serviceCertificate findValue="localhost" x509FindType="FindBySubjectName" />
+            <serviceCertificate findValue="services.heuristiclab.com" x509FindType="FindBySubjectName" />
             <userNameAuthentication userNamePasswordValidationMode="MembershipProvider"
               membershipProviderName="AspNetSqlMembershipProvider" />
Index: branches/2931_OR-Tools_LP_MIP/HeuristicLab.Services.OKB/3.3/app.config
===================================================================
--- branches/2931_OR-Tools_LP_MIP/HeuristicLab.Services.OKB/3.3/app.config	(revision 16070)
+++ branches/2931_OR-Tools_LP_MIP/HeuristicLab.Services.OKB/3.3/app.config	(revision 16139)
@@ -2,6 +2,6 @@
 <configuration>
   <connectionStrings>
-    <add name="HeuristicLab.Authentication" connectionString="Data Source=.\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication"/>
-    <add name="HeuristicLab.Services.OKB.DataAccess.Properties.Settings.OKBConnectionString" connectionString="Data Source=.\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.OKB"/>
+    <add name="HeuristicLab.Authentication" connectionString="Data Source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication"/>
+    <add name="HeuristicLab.Services.OKB.DataAccess.Properties.Settings.OKBConnectionString" connectionString="Data Source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.OKB"/>
   </connectionStrings>
 
@@ -34,5 +34,5 @@
         <host>
           <baseAddresses>
-            <add baseAddress="http://localhost:8000/OKB-3.3/AdministrationService.svc" />
+            <add baseAddress="http://services.heuristiclab.com/OKB-3.3/AdministrationService.svc" />
           </baseAddresses>
         </host>
@@ -41,10 +41,10 @@
         <endpoint binding="wsHttpBinding" bindingConfiguration="DefaultWsHttpBinding"
           name="WSHttpBinding_IQueryService" contract="HeuristicLab.Services.OKB.Query.IQueryService" />
-        <endpoint address="net.tcp://localhost:8001/OKB-3.3/QueryService.svc"
+        <endpoint address="net.tcp://services.heuristiclab.com/OKB-3.3/QueryService.svc"
           binding="netTcpBinding" bindingConfiguration="NetTcpBinding_IQueryService"
           name="NetBinding_IQueryService" contract="HeuristicLab.Services.OKB.Query.IQueryService" />
         <host>
           <baseAddresses>
-            <add baseAddress="http://localhost:8000/OKB-3.3/QueryService.svc" />
+            <add baseAddress="http://services.heuristiclab.com/OKB-3.3/QueryService.svc" />
           </baseAddresses>
         </host>
@@ -55,5 +55,5 @@
         <host>
           <baseAddresses>
-            <add baseAddress="http://localhost:8000/OKB-3.3/RunCreationService.svc" />
+            <add baseAddress="http://services.heuristiclab.com/OKB-3.3/RunCreationService.svc" />
           </baseAddresses>
         </host>
@@ -91,5 +91,5 @@
             roleProviderName="AspNetSqlRoleProvider" />
           <serviceCredentials>
-            <serviceCertificate findValue="localhost" x509FindType="FindBySubjectName" />
+            <serviceCertificate findValue="services.heuristiclab.com" x509FindType="FindBySubjectName" />
             <userNameAuthentication userNamePasswordValidationMode="MembershipProvider"
               membershipProviderName="AspNetSqlMembershipProvider" />
