diff --git a/src/Umbraco.Web.UI/config/ExamineIndex.Release.config b/src/Umbraco.Web.UI/config/ExamineIndex.Release.config
index 35ea1dd922..80b07209f0 100644
--- a/src/Umbraco.Web.UI/config/ExamineIndex.Release.config
+++ b/src/Umbraco.Web.UI/config/ExamineIndex.Release.config
@@ -8,10 +8,10 @@ More information and documentation can be found on GitHub: https://github.com/Sh
 -->
 <ExamineLuceneIndexSets>
   <!-- The internal index set used by Umbraco back-office - DO NOT REMOVE -->
-  <IndexSet SetName="InternalIndexSet" IndexPath="~/App_Data/TEMP/ExamineIndexes/{machinename}/Internal/"/>
+  <IndexSet SetName="InternalIndexSet" IndexPath="~/App_Data/TEMP/ExamineIndexes/Internal/"/>
 
   <!-- The internal index set used by Umbraco back-office for indexing members - DO NOT REMOVE -->
-  <IndexSet SetName="InternalMemberIndexSet" IndexPath="~/App_Data/TEMP/ExamineIndexes/{machinename}/InternalMember/">
+  <IndexSet SetName="InternalMemberIndexSet" IndexPath="~/App_Data/TEMP/ExamineIndexes/InternalMember/">
     <IndexAttributeFields>
       <add Name="id" />
       <add Name="nodeName"/>
@@ -24,5 +24,5 @@ More information and documentation can be found on GitHub: https://github.com/Sh
   </IndexSet>
     
   <!-- Default Indexset for external searches, this indexes all fields on all types of nodes-->
-  <IndexSet SetName="ExternalIndexSet" IndexPath="~/App_Data/TEMP/ExamineIndexes/{machinename}/External/" />
+  <IndexSet SetName="ExternalIndexSet" IndexPath="~/App_Data/TEMP/ExamineIndexes/External/" />
 </ExamineLuceneIndexSets>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/config/ExamineSettings.config b/src/Umbraco.Web.UI/config/ExamineSettings.config
index aacf5e3732..076fb08493 100644
--- a/src/Umbraco.Web.UI/config/ExamineSettings.config
+++ b/src/Umbraco.Web.UI/config/ExamineSettings.config
@@ -12,18 +12,15 @@ More information and documentation can be found on GitHub: https://github.com/Sh
       <add name="InternalIndexer" type="UmbracoExamine.UmbracoContentIndexer, UmbracoExamine"
            supportUnpublished="true"
            supportProtected="true"
-           analyzer="Lucene.Net.Analysis.WhitespaceAnalyzer, Lucene.Net"
-		   useTempStorage="Sync"/>
+           analyzer="Lucene.Net.Analysis.WhitespaceAnalyzer, Lucene.Net"/>
 
       <add name="InternalMemberIndexer" type="UmbracoExamine.UmbracoMemberIndexer, UmbracoExamine"
            supportUnpublished="true"
            supportProtected="true"
-           analyzer="Lucene.Net.Analysis.Standard.StandardAnalyzer, Lucene.Net"
-		   useTempStorage="Sync"/>
+           analyzer="Lucene.Net.Analysis.Standard.StandardAnalyzer, Lucene.Net"/>
 
       <!-- default external indexer, which excludes protected and unpublished pages-->
-      <add name="ExternalIndexer" type="UmbracoExamine.UmbracoContentIndexer, UmbracoExamine"
-		   useTempStorage="Sync"/>
+      <add name="ExternalIndexer" type="UmbracoExamine.UmbracoContentIndexer, UmbracoExamine"/>
 
     </providers>
   </ExamineIndexProviders>
@@ -31,16 +28,13 @@ More information and documentation can be found on GitHub: https://github.com/Sh
   <ExamineSearchProviders defaultProvider="ExternalSearcher">
     <providers>
       <add name="InternalSearcher" type="UmbracoExamine.UmbracoExamineSearcher, UmbracoExamine"
-           analyzer="Lucene.Net.Analysis.WhitespaceAnalyzer, Lucene.Net"
-		   useTempStorage="Sync"/>
+           analyzer="Lucene.Net.Analysis.WhitespaceAnalyzer, Lucene.Net"/>
 
-      <add name="ExternalSearcher" type="UmbracoExamine.UmbracoExamineSearcher, UmbracoExamine"
-		   useTempStorage="Sync"/>
+      <add name="ExternalSearcher" type="UmbracoExamine.UmbracoExamineSearcher, UmbracoExamine"/>
 
       <add name="InternalMemberSearcher" type="UmbracoExamine.UmbracoExamineSearcher, UmbracoExamine"
            analyzer="Lucene.Net.Analysis.Standard.StandardAnalyzer, Lucene.Net"
-		   enableLeadingWildcard="true"
-		   useTempStorage="Sync"/>
+		       enableLeadingWildcard="true"/>
 
     </providers>
   </ExamineSearchProviders>