diff --git a/.github/workflows/xbox_nxdk.yml b/.github/workflows/xbox_nxdk.yml
index 9e25a1d2d..3f95ab81a 100644
--- a/.github/workflows/xbox_nxdk.yml
+++ b/.github/workflows/xbox_nxdk.yml
@@ -23,7 +23,7 @@ jobs:
 
     - name: Build NXDK
       shell: bash
-      run: PATH="${NXDK_DIR}/bin:$PATH" make -j $(nproc) -C "$NXDK_DIR" NXDK_ONLY=1 all cxbe extract-xiso
+      run: PATH="${NXDK_DIR}/bin:$PATH" make -j $(nproc) -C "$NXDK_DIR" NXDK_ONLY=1 all cxbe
 
     - name: Checkout
       uses: actions/checkout@v3
@@ -37,13 +37,11 @@ jobs:
     - name: Build
       working-directory: ${{github.workspace}}
       shell: bash
-      run: cmake --build build-xbox -j $(nproc) --target nxdk_iso
+      run: cmake --build build-xbox -j $(nproc) --target nxdk_xbe
 
     - name: Upload-Package
       if: ${{ !env.ACT }}
       uses: actions/upload-artifact@v3
       with:
         name: devilutionx
-        path: |
-          build-xbox/pkg/default.xbe
-          build-xbox/devilutionx.iso
+        path: build-xbox/pkg/
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1f020eed7..b6906dae3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -470,7 +470,6 @@ endif()
 if(NXDK)
   set(_nxdk_pkg_dir "${CMAKE_BINARY_DIR}/pkg")
   set(_xbe_path "${_nxdk_pkg_dir}/default.xbe")
-  set(_iso_path "${CMAKE_BINARY_DIR}/devilutionx.iso")
   add_custom_command(
     OUTPUT "${_xbe_path}"
     COMMAND "${CMAKE_COMMAND}" -E make_directory "${_nxdk_pkg_dir}"
@@ -478,12 +477,6 @@ if(NXDK)
     DEPENDS "${BIN_TARGET}"
   )
   add_custom_target(nxdk_xbe DEPENDS "${_xbe_path}")
-  add_custom_command(
-      OUTPUT "${_iso_path}"
-      COMMAND "${NXDK_DIR}/tools/extract-xiso/build/extract-xiso" -c "${_nxdk_pkg_dir}" "${_iso_path}"
-      DEPENDS nxdk_xbe devilutionx_copied_assets
-  )
-  add_custom_target(nxdk_iso DEPENDS "${_iso_path}")
 endif()
 
 if(CPACK AND (APPLE OR BUILD_ASSETS_MPQ OR SRC_DIST))