diff --git a/nginx/nginx.conf b/nginx/nginx.conf
index 32145f3e0..3ecded277 100644
--- a/nginx/nginx.conf
+++ b/nginx/nginx.conf
@@ -33,14 +33,14 @@ http {
 
         absolute_redirect off;
 
-        location /search/ {
+        location /docs/search/ {
             if ($request_method != GET) {
                 return 405;
             }
             proxy_pass http://elasticsearch:9200/;
         }
         
-        rewrite ^(?!(\/docs|\/search))\/(.*)$ /docs/$2 permanent;
+        rewrite ^(?!\/docs)\/(.*)$ /docs/$1 permanent;
         rewrite ^\/docs\/(((?!index).)*)\.html$ /docs/$1/ permanent;
 
         rewrite ^/docs/cloud/(.*)$ /docs/ecloud/$1 permanent;
diff --git a/source/_themes/ukf/static/app.js b/source/_themes/ukf/static/app.js
index 553c52ec2..04c78db1d 100644
--- a/source/_themes/ukf/static/app.js
+++ b/source/_themes/ukf/static/app.js
@@ -1,6 +1,6 @@
 App = {};
 App.config = {
-  url: '/search/',
+  url: '/docs/search/',
   version: '2-3'
 };
 
diff --git a/source/_themes/ukf/static/opensearchdescription-book-3-x.xml b/source/_themes/ukf/static/opensearchdescription-book-3-x.xml
index d70b4e8b6..efa767ec2 100644
--- a/source/_themes/ukf/static/opensearchdescription-book-3-x.xml
+++ b/source/_themes/ukf/static/opensearchdescription-book-3-x.xml
@@ -6,7 +6,7 @@
   
   <Url type="text/html"
        method="get"
-       template="https://docs.ukfast.co.uk/search.html?check_keywords=yes&amp;area=default&amp;q={searchTerms}">
+       template="https://www.ans.co.uk/docs/search.html?check_keywords=yes&amp;area=default&amp;q={searchTerms}">
   </Url>
   <OutputEncoding>UTF-8</OutputEncoding>
   <InputEncoding>UTF-8</InputEncoding>