diff --git a/.github/actions/test-system-rclip-windows/action.yaml b/.github/actions/test-system-rclip-windows/action.yaml
index c5afe1d..3130eb0 100644
--- a/.github/actions/test-system-rclip-windows/action.yaml
+++ b/.github/actions/test-system-rclip-windows/action.yaml
@@ -24,28 +24,9 @@ runs:
       shell: powershell
     - name: Print tested rclip version (Windows)
       run: |
-        Import-Module "$env:ChocolateyInstall/helpers/chocolateyInstaller.psm1"
-        refreshenv
         which rclip
         rclip --version
-      shell: powershell
+      shell: powershell -NoLogo -NonInteractive -ExecutionPolicy RemoteSigned -Command "$env:Path = [Environment]::GetEnvironmentVariable('Path', 'Machine') + ';' + [Environment]::GetEnvironmentVariable('Path', 'User'); & {0}"
     - name: Run e2e tests on the rclip installed system-wide (Windows)
-      run: |
-        powershell -NonInteractive - <<\EOF
-          Import-Module "$env:ChocolateyInstall\helpers\chocolateyProfile.psm1"
-          Update-SessionEnvironment
-          # Round brackets in variable names cause problems with bash
-          Get-ChildItem env:* | %{
-            if (!($_.Name.Contains('('))) {
-              $value = $_.Value
-              if ($_.Name -eq 'PATH') {
-                $value = $value -replace ';',':'
-              }
-              Write-Output ("export " + $_.Name + "='" + $value + "'")
-            }
-          } | Out-File -Encoding ascii $env:TEMP\refreshenv.sh
-        EOF
-        source "$TEMP/refreshenv.sh"
-
-        RCLIP_TEST_RUN_SYSTEM_RCLIP=true poetry run pytest tests/e2e
-      shell: bash
+      run: make test-system-rclip
+      shell: powershell -NoLogo -NonInteractive -ExecutionPolicy RemoteSigned -Command "$env:Path = [Environment]::GetEnvironmentVariable('Path', 'Machine') + ';' + [Environment]::GetEnvironmentVariable('Path', 'User'); & {0}"
diff --git a/pyproject.toml b/pyproject.toml
index 8655ea1..d55ef85 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "rclip"
-version = "1.11.1a56"
+version = "1.11.1a57"
 description = "AI-Powered Command-Line Photo Search Tool"
 authors = ["Yurij Mikhalevich <yurij@mikhalevi.ch>"]
 license = "MIT"
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 2c2f3ba..fe28a7f 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -10,7 +10,7 @@ description: |
   For a detailed demonstration, watch the video: https://www.youtube.com/watch?v=tAJHXOkHidw.
 
   You can use another image as a query by passing a file path or even an URL to the image file to **rclip** and combine multiple queries. Check out the project's README on GitHub for more usage examples: https://github.com/yurijmikhalevich/rclip#readme.
-version: 1.11.1a56
+version: 1.11.1a57
 website: https://github.com/yurijmikhalevich/rclip
 contact: yurij@mikhalevi.ch
 passthrough:
@@ -28,7 +28,7 @@ apps:
 parts:
   rclip:
     plugin: python
-    source: ./snap/local/rclip-1.11.1a56.tar.gz
+    source: ./snap/local/rclip-1.11.1a57.tar.gz
     build-packages:
       - python3-pip
     build-environment: