diff --git a/devtracker.rb b/devtracker.rb
index 53d61602..19b65523 100644
--- a/devtracker.rb
+++ b/devtracker.rb
@@ -49,12 +49,12 @@
 include RecaptchaHelper
 
 # Developer Machine: set global settings
-set :oipa_api_url, 'http://dfid-oipa.zz-clients.net/api/'
+#set :oipa_api_url, 'http://dfid-oipa.zz-clients.net/api/'
 #set :oipa_api_url, 'https://devtracker.dfid.gov.uk/api/'
 #set :oipa_api_url, 'http://loadbalancer1-dfid.oipa.nl/api/'
 
 # Server Machine: set global settings to use varnish cache
-#set :oipa_api_url, 'http://127.0.0.1:6081/api/'
+set :oipa_api_url, 'http://127.0.0.1:6081/api/'
 
 #ensures that we can use the extension html.erb rather than just .erb
 Tilt.register Tilt::ERBTemplate, 'html.erb'
diff --git a/views/layouts/layout.erb b/views/layouts/layout.erb
index f4b8d3e2..c4b4646e 100644
--- a/views/layouts/layout.erb
+++ b/views/layouts/layout.erb
@@ -81,8 +81,8 @@
         });
         //This stores the base url inside a global variable so that we can make the oipa calls through the varnish
         var tempGetUrl = window.location;
-        //window.baseUrl = tempGetUrl.protocol + "//" + tempGetUrl.host + "/" + "api/";
-        window.baseUrl = 'http://dfid-oipa.zz-clients.net/api/';
+        window.baseUrl = tempGetUrl.protocol + "//" + tempGetUrl.host + "/" + "api/";
+        //window.baseUrl = 'http://staging-dfid.oipa.nl/api/';
         $('#search').submit(function(){
             $('.modal_free_text_search').show();
             setTimeout(patience,10000);
diff --git a/views/layouts/layout_forms.erb b/views/layouts/layout_forms.erb
index 297073d6..9311db5d 100644
--- a/views/layouts/layout_forms.erb
+++ b/views/layouts/layout_forms.erb
@@ -81,8 +81,8 @@
         });
         //This stores the base url inside a global variable so that we can make the oipa calls through the varnish
         var tempGetUrl = window.location;
-        //window.baseUrl = tempGetUrl.protocol + "//" + tempGetUrl.host + "/" + "api/";
-        window.baseUrl = 'http://dfid-oipa.zz-clients.net/api/';
+        window.baseUrl = tempGetUrl.protocol + "//" + tempGetUrl.host + "/" + "api/";
+        //window.baseUrl = 'http://staging-dfid.oipa.nl/api/';
         $('#search').submit(function(){
             $('.modal_free_text_search').show();
             setTimeout(patience,10000);
diff --git a/views/partials/_project_list.html.erb b/views/partials/_project_list.html.erb
index 2aff24f1..87c7170d 100644
--- a/views/partials/_project_list.html.erb
+++ b/views/partials/_project_list.html.erb
@@ -177,8 +177,8 @@
         <script src="/javascripts/jquery.simplePagination.js" type="text/javascript"></script>
         <script type='text/javascript'>
             $(document).ready(function() {
-                window.oipaApiUrl = "<%= oipa_api_url %>";
-                //window.oipaApiUrl = window.baseUrl;
+                //window.oipaApiUrl = "<%#= oipa_api_url %>";
+                window.oipaApiUrl = window.baseUrl;
                 window.project_count = "<%= total_projects %>";
                 window.maxBudget = <%= budgetHigherBound %>;
                 window.StartDate = '<%= actualStartDate %>';
diff --git a/views/search/search.html.erb b/views/search/search.html.erb
index f9555da0..4a6f1467 100644
--- a/views/search/search.html.erb
+++ b/views/search/search.html.erb
@@ -226,8 +226,8 @@
             <script src="/javascripts/jquery.simplePagination.js" type="text/javascript"></script>
             <script type='text/javascript'>
                 $(document).ready(function() {
-                    window.oipaApiUrl = "<%= oipa_api_url %>";
-                    //window.oipaApiUrl = window.baseUrl;
+                    //window.oipaApiUrl = "<%#= oipa_api_url %>";
+                    window.oipaApiUrl = window.baseUrl;
                     window.project_count = "<%= project_count %>";
                     window.searchQuery = "<%= query %>";
                     window.searchType = "F";