diff --git a/.azure/azure-pipelines.yml b/.azure/azure-pipelines.yml
index 29b20b918f..855b7a92aa 100644
--- a/.azure/azure-pipelines.yml
+++ b/.azure/azure-pipelines.yml
@@ -30,22 +30,22 @@ jobs:
 - job:
   strategy:
     matrix:
-      # macOS-OoC:
+      # macOS:
       #   imageName: Darwin
       #   preset_name: ci-macos-x64
       #   home_dir: /Users/buildbot
-      Windows-OoC:
+      Windows:
         imageName: Windows_NT
-        preset_name: ci-windows-v143-ooc
+        preset_name: ci-windows-v143
         home_dir: C:/Users/buildbot
-      Linux-OoC:
+      Linux:
         imageName: Linux
-        preset_name: ci-linux-x64-ooc
+        preset_name: ci-linux-x64
         home_dir: /home/buildbot
         python_dir: /opt/local/anaconda3/envs/dream3d/bin
 
   pool:
-    name: BlueQuartz Self Hosted
+    name: BlueQuartz-CI-Cluster
     demands:
       - Agent.OS -equals $(imageName)
       - BQ.PROXMOX
diff --git a/CMakePresets.json b/CMakePresets.json
index cd11395a42..ebe7e3c4e5 100644
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -194,92 +194,6 @@
         }
       }
     },
-    {
-      "name": "ci-windows-v143-ooc",
-      "displayName": "ci-windows-v143-ooc",
-      "description": "Build configuration for Azure Out-of-Core builds",
-      "generator": "Visual Studio 17 2022",
-      "inherits": "ci",
-      "cacheVariables": {
-        "VCPKG_TARGET_TRIPLET": {
-          "type": "STRING",
-          "value": "x64-windows-v143"
-        },
-        "VCPKG_HOST_TRIPLET": {
-          "type": "STRING",
-          "value": "x64-windows-v143"
-        },        
-        "VCPKG_MANIFEST_FEATURES": {
-          "type": "STRING",
-          "value": "python;tests;parallel;itk;ebsd;compressors"
-        },
-        "SIMPLNX_ENABLE_COMPRESSORS": {
-          "type": "BOOL",
-          "value": "ON"
-        },
-        "SIMPLNX_EXTRA_PLUGINS": {
-          "type": "STRING",
-          "value": "FileStore;SimplnxReview"
-        },
-        "SIMPLNX_FORCE_OUT_OF_CORE_DATA": {
-          "type": "BOOL",
-          "value": "ON"
-        },
-        "SIMPLNX_SimplnxReview_SOURCE_DIR": {
-          "type": "PATH",
-          "value": "${sourceDir}/SimplnxReview"
-        },
-        "SIMPLNX_FileStore_SOURCE_DIR": {
-          "type": "PATH",
-          "value": "${sourceDir}/FileStore"
-        }
-      }
-    },
-    {
-      "name": "ci-linux-x64-ooc",
-      "displayName": "ci-linux-x64-ooc",
-      "description": "Build configuration for Azure Out-of-Core builds",
-      "generator": "Ninja",
-      "inherits": "ci",
-      "cacheVariables": {
-        "VCPKG_TARGET_TRIPLET": {
-          "type": "STRING",
-          "value": "x64-linux-dynamic"
-        },
-        "VCPKG_HOST_TRIPLET": {
-          "type": "STRING",
-          "value": "x64-linux-dynamic"
-        },
-        "Python3_EXECUTABLE": {
-          "type": "PATH",
-          "value": "/opt/local/anaconda3/envs/dream3d/bin/python"
-        },        
-        "VCPKG_MANIFEST_FEATURES": {
-          "type": "STRING",
-          "value": "python;tests;parallel;itk;ebsd;compressors"
-        },
-        "SIMPLNX_ENABLE_COMPRESSORS": {
-          "type": "BOOL",
-          "value": "ON"
-        },
-        "SIMPLNX_EXTRA_PLUGINS": {
-          "type": "STRING",
-          "value": "FileStore;SimplnxReview"
-        },
-        "SIMPLNX_FORCE_OUT_OF_CORE_DATA": {
-          "type": "BOOL",
-          "value": "ON"
-        },
-        "SIMPLNX_SimplnxReview_SOURCE_DIR": {
-          "type": "PATH",
-          "value": "${sourceDir}/SimplnxReview"
-        },
-        "SIMPLNX_FileStore_SOURCE_DIR": {
-          "type": "PATH",
-          "value": "${sourceDir}/FileStore"
-        }
-      }
-    },
     {
       "name": "conda",
       "generator": "Ninja",