diff --git a/.github/workflows/pull-components.yml b/.github/workflows/pull-components.yml
index 9a147285..c22d5d9e 100644
--- a/.github/workflows/pull-components.yml
+++ b/.github/workflows/pull-components.yml
@@ -128,6 +128,12 @@ jobs:
             tar --use-compress-program=unzstd -xvf $release_archive_name
             tar -zcvf "${{ env.NAME }}.tar.gz" "${{ env.NAME }}"
             echo "UPLOAD_FILE=$(pwd)/${{ env.NAME }}.tar.gz" >> $GITHUB_ENV
+          elif [[ $release_archive_name == "dxvk-nvapi"* ]]; then
+            curl -fsSLO "$release_archive_url"
+            mkdir "${{ env.NAME }}"
+            tar -xvf $release_archive_name --directory "${{ env.NAME }}"
+            tar -zcvf "${{ env.NAME }}.tar.gz" "${{ env.NAME }}"
+            echo "UPLOAD_FILE=$(pwd)/${{ env.NAME }}.tar.gz" >> $GITHUB_ENV
           fi
 
       - name: Check for new artifact
@@ -168,7 +174,9 @@ jobs:
           if [[ "${{ env.NAMEPREFIX }}" == "dxvk"* ]]; then
             rm -rf "$folder/usr"
           fi
-          tar -C "$folder" -zcvf "${{ env.NAME }}.tar.gz" .
+          mkdir "${{ env.NAME }}"
+          mv "$folder"/* "${{ env.NAME }}"
+          tar -zcvf "${{ env.NAME }}.tar.gz" "${{ env.NAME }}"
           echo "UPLOAD_FILE=$(pwd)/${{ env.NAME }}.tar.gz" >> $GITHUB_ENV
 
       - name: Upload component archive
diff --git a/input_files/14-dxvk.yml b/input_files/14-dxvk.yml
index c3241112..36851a23 100644
--- a/input_files/14-dxvk.yml
+++ b/input_files/14-dxvk.yml
@@ -1,7 +1,3 @@
-dxvk-2.0-1-18b0ef6:
-  Category: dxvk
-  Channel: unstable
-  Date: '1671209496'
 dxvk-2.0:
   Category: dxvk
   Channel: stable
diff --git a/input_files/16-dxvk-nvapi.yml b/input_files/16-dxvk-nvapi.yml
deleted file mode 100644
index afe86874..00000000
--- a/input_files/16-dxvk-nvapi.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-dxvk-nvapi-v0.6:
-  Category: nvapi
-  Channel: stable
-  Date: '1669741761'
-dxvk-nvapi-v0.5.4:
-  Category: nvapi
-  Channel: stable
-  Date: '1649403018'
-dxvk-nvapi-v0.5.3:
-  Category: nvapi
-  Channel: stable
-dxvk-nvapi-v0.5.2:
-  Category: nvapi
-  Channel: stable
-dxvk-nvapi-v0.5.1:
-  Category: nvapi
-  Channel: stable
-dxvk-nvapi-v0.4:
-  Category: nvapi
-  Channel: stable
diff --git a/input_files/update_yml_entries.sh b/input_files/update_yml_entries.sh
index 17186eba..95031273 100755
--- a/input_files/update_yml_entries.sh
+++ b/input_files/update_yml_entries.sh
@@ -16,7 +16,8 @@ GITHUB_ENV=${GITHUB_ENV-/dev/null}
 command_wo_sub="{\"$component_name\": {\"Category\":\"$category\", \"Channel\": \"$channel\", \"Date\": \"$created_at\"}}"
 command_w_sub="{\"$component_name\": {\"Category\":\"$category\", \"Sub-category\":\"$subcategory\", \"Channel\": \"$channel\", \"Date\": \"$created_at\"}}"
 
-if ! [ -f "$filename" ]; then
+empty_file=$(yq "." $filename)
+if ! [ -f "$filename" ] || [ -z "$empty_file" ]; then
     touch $filename
     if [ -z "$subcategory" ]; then
         yq -n -i -y "$command_wo_sub" $filename