diff --git a/.github/actions/features_parse/action.yml b/.github/actions/features_parse/action.yml
index 70a403fb..75636913 100644
--- a/.github/actions/features_parse/action.yml
+++ b/.github/actions/features_parse/action.yml
@@ -11,7 +11,7 @@ outputs:
 runs:
   using: composite
   steps:
-    - uses: gardenlinux/python-gardenlinux-lib/.github/actions/setup@0.8.3
+    - uses: gardenlinux/python-gardenlinux-lib/.github/actions/setup@0.8.4
     - id: result
       shell: bash
       run: |
diff --git a/.github/actions/flavors_parse/action.yml b/.github/actions/flavors_parse/action.yml
index 38c3d539..4afd50e1 100644
--- a/.github/actions/flavors_parse/action.yml
+++ b/.github/actions/flavors_parse/action.yml
@@ -13,7 +13,7 @@ outputs:
 runs:
   using: composite
   steps:
-    - uses: gardenlinux/python-gardenlinux-lib/.github/actions/setup@0.8.3
+    - uses: gardenlinux/python-gardenlinux-lib/.github/actions/setup@0.8.4
     - id: matrix
       shell: bash
       run: |
diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
index 8c290c36..2c7d471a 100644
--- a/.github/actions/setup/action.yml
+++ b/.github/actions/setup/action.yml
@@ -3,7 +3,7 @@ description: Installs the given GardenLinux Python library
 inputs:
     version:
         description: GardenLinux Python library version
-        default: "0.8.3"
+        default: "0.8.4"
 runs:
     using: composite
     steps:
diff --git a/pyproject.toml b/pyproject.toml
index a41285be..35a8e511 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "gardenlinux"
-version = "0.8.0"
+version = "0.8.4"
 description = "Contains tools to work with the features directory of gardenlinux, for example deducting dependencies from feature sets or validating cnames"
 authors = ["Garden Linux Maintainers <contact@gardenlinux.io>"]
 license = "Apache-2.0"
diff --git a/src/gardenlinux/oci/container.py b/src/gardenlinux/oci/container.py
index ea2965c4..8e807dbd 100644
--- a/src/gardenlinux/oci/container.py
+++ b/src/gardenlinux/oci/container.py
@@ -445,16 +445,15 @@ def push_manifest_and_artifacts_from_directory(
         if not isinstance(manifest, Manifest):
             raise RuntimeError("Artifacts image manifest given is invalid")
 
+        # Scan and extract nested artifacts
+        for file_path_name in artifacts_dir.glob("*.pxe.tar.gz"):
+            self._logger.info(f"Found nested artifact {file_path_name}")
+            extract_targz(file_path_name, artifacts_dir)
+
         files = [
             file_name for file_name in artifacts_dir.iterdir() if file_name.is_file()
         ]
 
-        # Scan and extract nested artifacts
-        for file_path_name in files:
-            if file_path_name.match("*.pxe.tar.gz"):
-                self._logger.info(f"Found nested artifact {file_path_name}")
-                extract_targz(file_path_name, artifacts_dir)
-
         artifacts_with_metadata = Container.get_artifacts_metadata_from_files(
             files, manifest.arch
         )