diff --git a/master-nonlatent/master.cfg b/master-nonlatent/master.cfg
index 85fe01da..46ea68b5 100644
--- a/master-nonlatent/master.cfg
+++ b/master-nonlatent/master.cfg
@@ -117,7 +117,7 @@ dockerlibrary_worker = mkWorker(
     os.getenv("MASTER_NONLATENT_DOCKERLIBRARY_WORKER", default="bb-rhel8-docker"),
     properties={
         "jobs": 1,
-        "save_packages": os.getenv("ENVIRON") == "PROD",
+        "save_packages": os.getenv("ENVIRON") != "DEV",
         "scriptpath": "dev" if os.getenv("ENVIRON") == "DEV" else "main",
     },
 )
@@ -731,11 +731,12 @@ f_dockerlibrary.addStep(
 f_dockerlibrary.addStep(
     steps.ShellCommand(
         name="build quay.io manifest image for MariaDB",
+        env={'SAVE_PACKAGES': lambda step: str(savePackage(step))},
         command=[
             "bash",
             "-xc",
             util.Interpolate(
-                './docker-library-manifest.sh "%(prop:tarbuildnum)s" "%(prop:mariadb_version)s" "%(prop:parentbuildername)s" "%(prop:revision)s" "%(prop:branch)s" "%(prop:save_packages)s"'
+                './docker-library-manifest.sh "%(prop:tarbuildnum)s" "%(prop:mariadb_version)s" "%(prop:parentbuildername)s" "%(prop:revision)s" "%(prop:branch)s" "${SAVE_PACKAGES:-False}"'
             ),
         ],
         doStepIf=lambda step: savePackage(step),
diff --git a/utils.py b/utils.py
index b35575e0..14eac49f 100644
--- a/utils.py
+++ b/utils.py
@@ -327,8 +327,6 @@ def ls2list(rc, stdout, stderr):
 
 # Save packages for current branch?
 def savePackage(step, savedBranches=savedPackageBranches):
-    builderName = str(step.getProperty("buildername"))
-
     return step.getProperty("save_packages") and fnmatch_any(
         step.getProperty("branch"), savedBranches
     )