diff --git a/.github/workflows/ci_cd.yml b/.github/workflows/ci_cd.yml
index fbf2e16269..c95cdd6a27 100644
--- a/.github/workflows/ci_cd.yml
+++ b/.github/workflows/ci_cd.yml
@@ -19,7 +19,7 @@ env:
   GEO_CONT_NAME: ans_geo
   RESET_IMAGE_CACHE: 5
   IS_WORKFLOW_RUNNING: True
-  ARTIFACTORY_VERSION: v252
+  ARTIFACTORY_VERSION: v261
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
diff --git a/doc/changelog.d/2114.maintenance.md b/doc/changelog.d/2114.maintenance.md
new file mode 100644
index 0000000000..db0ae90f74
--- /dev/null
+++ b/doc/changelog.d/2114.maintenance.md
@@ -0,0 +1 @@
+Using proper artifactory location
\ No newline at end of file
diff --git a/docker/build_docker_windows.py b/docker/build_docker_windows.py
index a4f831f632..044894dcc1 100644
--- a/docker/build_docker_windows.py
+++ b/docker/build_docker_windows.py
@@ -69,19 +69,14 @@
 # Get the path to the Ansys installation
 ANSYS_PATH = Path(awp_root[ANSYS_VER])
 
-# Starting on 2025R2, the user can select between DMS and Core Services
-if ANSYS_VER > 252:
-    print("Select between DMS and Core Services")
-    print("1: DMS")
-    print("2: Core Services")
-    backend_selection = input("Selection [default - 1]: ")
-    backend_selection = 1 if backend_selection == "" else int(backend_selection)
-    if backend_selection not in [1, 2]:
-        print("XXXXXXX Invalid selection XXXXXXX")
-        exit(0)
+# Starting on 2025R2, only Core Service is available
+# Before that, only DMS is available
+if ANSYS_VER >= 252:
+    print(">>> Using Core Service")
+    backend_selection = 2  # Core Service
 else:
-    # Default to DMS for older versions
-    backend_selection = 1
+    print(">>> Using DMS Service")
+    backend_selection = 1  # DMS Service
 
 # Verify that the Geometry Service is installed
 if not Path.exists(ANSYS_PATH / "GeometryService"):