diff --git a/.github/workflows/ffmpeg.yml b/.github/workflows/ffmpeg.yml
index b7c1002..d9fe63a 100644
--- a/.github/workflows/ffmpeg.yml
+++ b/.github/workflows/ffmpeg.yml
@@ -3,6 +3,14 @@ name: 'Build FFmpeg'
 on:
   workflow_dispatch:
     inputs:
+      system:
+        type: choice
+        required: true
+        default: 'windows-2022' 
+        description: 'System'
+        options: 
+        - windows-2022
+
       type:
         type: choice
         required: true
@@ -29,6 +37,9 @@ on:
         
   workflow_call:
     inputs:
+      system:
+        type: string
+        required: true
       type:
         type: string
         required: true
@@ -46,74 +57,57 @@ env:
   cFlags: ${{ inputs.config == 'release' && '-MD' || '-MDd' }}
   variant: ${{ inputs.type == 'static' && ' --pkg-config-flags="--static" --disable-shared --enable-static' || ' --disable-static --enable-shared' }}
   msbuildConfig: ${{ inputs.config == 'release' && 'Release' || 'Debug' }}
-  system: windows-2022
-  libvpl_refId: ''
-  libogg_refId: v1.3.5
-  libvorbis_refId: v1.3.7
-  libsvtav1_refId: v1.1.0
-  libsnappy_refId: 1.1.9
-  libvpx_refId: v1.12.0
-  libmp3lame_refId: ''
-  libzimg_refId: ''
-  libopus_refId: ''
-  libfdkaac_refId: ''
-  libx264_refId: ''
-  libx265_refId: ''
 
 jobs:
   libvpl:
-    runs-on: ${{ env.system }}
-    if: ${{ env.libvpl_refId != '' }}
+    runs-on: ${{ inputs.system }}
+    if: false
     steps:
     - uses: actions/checkout@v3
     - uses: ./.github/actions/libvpl
       with:
-        refId: ${{ env.libvpl_refId }}
+        refId: ''
         config: ${{ inputs.config }}
 
   liboggvorbis:
-    runs-on: ${{ env.system }}
-    if: ${{ env.libogg_refId != '' && env.libvorbis_refId != '' }}
+    runs-on: ${{ inputs.system }}
     steps:
     - uses: actions/checkout@v3
     - uses: ./.github/actions/liboggvorbis
       with:
-        libogg_refId: ${{ env.libogg_refId }}
-        libvorbis_refId: ${{ env.libvorbis_refId }}
+        libogg_refId: v1.3.5
+        libvorbis_refId: v1.3.7
         config: ${{ inputs.config }}
         
   libsvtav1:
-    runs-on: ${{ env.system }}
-    if: ${{ env.libsvtav1_refId != '' }}
+    runs-on: ${{ inputs.system }}
     steps:
     - uses: actions/checkout@v3
     - uses: ./.github/actions/libsvtav1
       with:
-        refId: ${{ env.libsvtav1_refId }}
+        refId: v1.1.0
         config: ${{ inputs.config }}
        
   libsnappy:
-    runs-on: ${{ env.system }}
-    if: ${{ env.libsnappy_refId != '' }}
+    runs-on: ${{ inputs.system }}
     steps:
     - uses: actions/checkout@v3
     - uses: ./.github/actions/libsnappy
       with:
-        refId: ${{ env.libsnappy_refId }}
+        refId: 1.1.9
         config: ${{ inputs.config }}
 
   libvpx:
-    runs-on: ${{ env.system }}
-    if: ${{ env.libvpx_refId != '' }}
+    runs-on: ${{ inputs.system }}
     steps:
     - uses: actions/checkout@v3
     - uses: ./.github/actions/libvpx
       with:
-        refId: ${{ env.libvpx_refId }}
+        refId: v1.12.0
         config: ${{ inputs.config }}
 
   libmp3lame:
-    runs-on: ${{ env.system }}
+    runs-on: ${{ inputs.system }}
     steps:
     - uses: actions/checkout@v3
     - uses: ./.github/actions/libmp3lame
@@ -122,7 +116,7 @@ jobs:
         config: ${{ inputs.config }}
 
   libzimg:
-    runs-on: ${{ env.system }}
+    runs-on: ${{ inputs.system }}
     steps:
     - uses: actions/checkout@v3
     - uses: ./.github/actions/libzimg
@@ -131,7 +125,7 @@ jobs:
         config: ${{ inputs.config }}
 
   libopus:
-    runs-on: ${{ env.system }}
+    runs-on: ${{ inputs.system }}
     steps:
     - uses: actions/checkout@v3
     - uses: ./.github/actions/libopus
@@ -140,7 +134,7 @@ jobs:
         config: ${{ inputs.config }}
 
   libfdkaac:
-    runs-on: ${{ env.system }}
+    runs-on: ${{ inputs.system }}
     steps:
     - uses: actions/checkout@v3
     - uses: ./.github/actions/libfdkaac
@@ -149,7 +143,7 @@ jobs:
         config: ${{ inputs.config }}
 
   libx264:
-    runs-on: ${{ env.system }}
+    runs-on: ${{ inputs.system }}
     steps:
     - uses: actions/checkout@v3
     - uses: ./.github/actions/libx264
@@ -158,7 +152,7 @@ jobs:
         config: ${{ inputs.config }}
 
   libx265-12:
-    runs-on: ${{ env.system }}
+    runs-on: ${{ inputs.system }}
     steps:
     - uses: actions/checkout@v3
     - uses: ./.github/actions/libx265-12
@@ -167,7 +161,7 @@ jobs:
         config: ${{ inputs.config }}
 
   libx265-10:
-    runs-on: ${{ env.system }}
+    runs-on: ${{ inputs.system }}
     steps:
     - uses: actions/checkout@v3
     - uses: ./.github/actions/libx265-10
@@ -186,7 +180,7 @@ jobs:
         config: ${{ inputs.config }}
 
   cartwheel:
-    runs-on: ${{ env.system }}
+    runs-on: ${{ inputs.system }}
     if: ${{ inputs.source == 'cartwheel' }}
     needs: [libvpl,libopus,libsvtav1,libsnappy,libmp3lame,libzimg,liboggvorbis,libx264,libx265,libfdkaac,libvpx]
     steps:
@@ -234,7 +228,7 @@ jobs:
         path: dist/ffmpeg-win64-${{ inputs.type }}-${{ inputs.config }}.tar.gz
 
   ffmpeg:
-    runs-on: ${{ env.system }}
+    runs-on: ${{ inputs.system }}
     if: ${{ inputs.source == 'ffmpeg' }}  
     needs: [libopus,libsvtav1,libsnappy,libmp3lame,libzimg,liboggvorbis,libx264,libx265,libfdkaac,libvpx]
     steps: