diff --git a/package_release.py b/package_release.py
index b7bc8241e9faa3e9cd26d28b39d77f8e41b25912..a40e1d9308b84fd9487d353ab4c5856175366c54 100755
--- a/package_release.py
+++ b/package_release.py
@@ -123,20 +123,18 @@ def main():
     artifacts_all = buildvars["DISTRO_RELEASE_ARTEFACTS"].split()
     artifacts_all.append("BUILD_SRCREVS.log")
 
-    # Set directories (use relative path)
-    release_name = "GUF-Yocto-%s" % version
-    # output_dir = "%s/%s/%s" % (args.release_dir, release_name, machine)
-    output_dir = os.path.join(args.release_dir, release_name)
-    # Create output directory
-    os.makedirs(output_dir, exist_ok=True)
-
-    # local output ( mount on host machine)
-    release_name_local = "Yocto-%s" % version
     if version.startswith("fngsystem"):
+        release_name_local = version.replace("fngsystem", "FNGSystem")
+        release_name = release_name_local
         outlocal_base = "/artifacts-fngsystem"
     else:
+        release_name = "GUF-Yocto-%s" % version
+        release_name_local = "Yocto-%s" % version
         outlocal_base = "/artifacts-yocto"
-    # outlocal_dir = "%s/%s/%s" % (outlocal_base, release_name_local, machine)
+
+    # Create output directories
+    output_dir = os.path.join(args.release_dir, release_name)
+    os.makedirs(output_dir, exist_ok=True)
     outlocal_dir = os.path.join(outlocal_base, release_name_local)
     os.makedirs(outlocal_dir, exist_ok=True)