diff --git a/.github/workflows/dos-djgpp.yml b/.github/workflows/dos-djgpp.yml
index 1a32e32..e086f9b 100644
--- a/.github/workflows/dos-djgpp.yml
+++ b/.github/workflows/dos-djgpp.yml
@@ -38,7 +38,6 @@ jobs:
       CMAKE_FIND_ROOT_PATH: ${{ github.workspace }}/djgpp
       GCC_EXEC_PREFIX: ${{ github.workspace }}/lib/gcc/
       DJDIR: ${{ github.workspace }}/djgpp/i586-pc-msdosdjgpp
-      PATH: ${{ github.workspace }}/djgpp/i586-pc-msdosdjgpp/bin/:${{ github.workspace }}/djgpp/bin/:${PATH}
 
     steps:
       - name: Checkout Source Tree
@@ -62,6 +61,8 @@ jobs:
         run: |
           wget https://github.com/andrewwutw/build-djgpp/releases/download/v3.4/djgpp-linux64-gcc1220.tar.bz2
           tar xjf djgpp-linux64-gcc1220.tar.bz2
+          echo "${{ github.workspace }}/djgpp/i586-pc-msdosdjgpp/bin/" >> "$GITHUB_ENV"
+          echo "${{ github.workspace }}/djgpp/bin/" >> "$GITHUB_ENV"
 
       - name: Build UMSKT for MSDOS via DJGPP
         uses: threeal/cmake-action@v1.3.0
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 44a9a88..3cc9be8 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -41,7 +41,6 @@ jobs:
           - armhf
           - armv7
           - ppc64le
-          - riscv64
           - s390x
 
     steps:
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 5fd16b0..57c1828 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -54,7 +54,7 @@ jobs:
       - name: Configure and build UMSKT for ${{ matrix.arch.displayName }}
         uses: threeal/cmake-action@v1.3.0
         with:
-          options: MUSL_STATIC=ON CMAKE_BUILD_TYPE=Release CPM_SOURCE_CACHE=${{ github.workspace }}/.cpm-cache CMAKE_OSX_ARCHITECTURES=${{ matrix.arch.name }} BUILD_TESTING=On
+          options: MUSL_STATIC=ON CMAKE_BUILD_TYPE=Release CPM_SOURCE_CACHE=${{ github.workspace }}/.cpm-cache CMAKE_OSX_ARCHITECTURES="${{ matrix.arch.name }}" BUILD_TESTING=On
           run-build: true
           build-args: -j 2
           run-test: true