diff --git a/.github/bin/docker-release.sh b/.github/bin/docker-release.sh
index bac8448..0d31255 100755
--- a/.github/bin/docker-release.sh
+++ b/.github/bin/docker-release.sh
@@ -14,7 +14,7 @@ export GHCR_REPO="ghcr.io/${GHCR_ORG}/${GHCR_PROJECT}"
 if [[ -n "${IMAGE_TAG}" ]]; then
   docker buildx build --progress plain --pull --push --platform "${DOCKER_BUILD_PLATFORM}" -t ${DOCKER_REPO}:${IMAGE_TAG} -t ${GHCR_REPO}:${IMAGE_TAG} \
   --label "org.opencontainers.image.created=$(date -u --iso-8601=seconds)" \
-  --label "org.opencontainers.image.revision=${CI_COMMIT_SHA}" \
+  --label "org.opencontainers.image.revision=${GITHUB_SHA}" \
   .
 else
   :
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 2e36cf4..6664cb9 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -496,7 +496,7 @@ jobs:
           docker info
           docker build --pull -f ${{ matrix.file }} --build-arg NANO_BASE_TAG=${{ matrix.nano_base_tag }} --build-arg CORE_BASE_TAG=${{ matrix.core_base_tag }} -t democratic-csi-windows:${GITHUB_RUN_ID}-${{ matrix.core_base_tag }} \
           --label "org.opencontainers.image.created=$(date -u --iso-8601=seconds)" \
-          --label "org.opencontainers.image.revision=${CI_COMMIT_SHA}" \
+          --label "org.opencontainers.image.revision=${GITHUB_SHA}" \
           .
           docker inspect democratic-csi-windows:${GITHUB_RUN_ID}-${{ matrix.core_base_tag }}
           docker save democratic-csi-windows:${GITHUB_RUN_ID}-${{ matrix.core_base_tag }} -o democratic-csi-windows-${{ matrix.core_base_tag }}.tar
diff --git a/bin/democratic-csi b/bin/democratic-csi
index 7d2e0ad..e45f7eb 100755
--- a/bin/democratic-csi
+++ b/bin/democratic-csi
@@ -31,6 +31,29 @@ const args = require("yargs")
         return true;
       } catch (e) {}
 
+      // CONTAINER_SANDBOX_MOUNT_POINT  C:\C\0eac9a8da76f6d7119c5d9f86c8b3106d67dbbf01dbeb22fdc0192476b7e31cb\
+      if (process.env.CONTAINER_SANDBOX_MOUNTPOINT) {
+        try {
+          options = JSON.parse(
+            fs.readFileSync(
+              `${process.env.CONTAINER_SANDBOX_MOUNTPOINT}${path}`,
+              "utf-8"
+            )
+          );
+          return true;
+        } catch (e) {}
+
+        try {
+          options = yaml.load(
+            fs.readFileSync(
+              `${process.env.CONTAINER_SANDBOX_MOUNTPOINT}${path}`,
+              "utf8"
+            )
+          );
+          return true;
+        } catch (e) {}
+      }
+
       throw new Error("failed parsing config file: " + path);
     },
   })
diff --git a/src/utils/windows.js b/src/utils/windows.js
index 90a530d..d2a969e 100644
--- a/src/utils/windows.js
+++ b/src/utils/windows.js
@@ -317,6 +317,7 @@ class Windows {
   async DisconnectIscsiTargetByNodeAddress(nodeAddress) {
     let command;
 
+    // https://github.com/PowerShell/PowerShell/issues/17306
     command = `Disconnect-IscsiTarget -NodeAddress ${nodeAddress.toLowerCase()} -Confirm:$false`;
     await this.ps.exec(command);
   }