diff --git a/.github/workflows/pull_request_check.yml b/.github/workflows/pull_request_check.yml
index 13ab53df..0624470f 100644
--- a/.github/workflows/pull_request_check.yml
+++ b/.github/workflows/pull_request_check.yml
@@ -59,6 +59,10 @@ jobs:
         env:
           TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Set up MSVC
+        if: matrix.os == 'windows-latest'
+        uses: ilammy/msvc-dev-cmd@v1
+
       - name: Creating native image (Win)
         if: matrix.os == 'windows-latest'
         run: mvn install -P native-image -D os.platform=win -D maven.wagon.httpconnectionManager.ttlSeconds=60
diff --git a/.github/workflows/tagged_release.yml b/.github/workflows/tagged_release.yml
index 3a09262b..4a0f485b 100644
--- a/.github/workflows/tagged_release.yml
+++ b/.github/workflows/tagged_release.yml
@@ -95,8 +95,7 @@ jobs:
 
       - name: Set up MSVC
         if: matrix.os == 'windows-latest'
-        run: |
-          call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
+        uses: ilammy/msvc-dev-cmd@v1
 
       - name: Creating native image (Win)
         if: matrix.os == 'windows-latest'