diff --git a/alphaplan_fwr.py b/alphaplan_fwr.py
index 150dfa284ec2671d6dc8e2d24b7abd2136d6cd25..4e6db229d67c8ca3924c32f4be18568ec3305070 100755
--- a/alphaplan_fwr.py
+++ b/alphaplan_fwr.py
@@ -304,12 +304,10 @@ def main():
 
     if version.startswith("fngsystem"):
         release_name_local = version.replace("fngsystem", "FNGSystem")
-        release_name = release_name_local
     else:
-        release_name = "GUF-Yocto-%s" % version
         release_name_local = "Yocto-%s" % version
 
-    output_dir = os.path.join(args.outputdir_upload, release_name)
+    output_dir = os.path.join(args.outputdir_upload, release_name_local)
     outlocal_dir = os.path.join(args.outputdir_local, release_name_local)
     if not os.path.isdir(outlocal_dir):
         sys.exit("ERROR: ouputdir-local does not exist")
diff --git a/package_release.py b/package_release.py
index 79670b9194547d7464b814bdc3036b0952e7f968..9e7a414dc21f42cc7a692d840346052300411182 100755
--- a/package_release.py
+++ b/package_release.py
@@ -145,16 +145,14 @@ def main():
 
     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"
 
     # Create output directories
     if args.outputdir_upload is not None:
-        output_dir = os.path.join(args.outputdir_upload, release_name)
+        output_dir = os.path.join(args.outputdir_upload, release_name_local)
         os.makedirs(output_dir, exist_ok=True)
     else:
         output_dir = None