diff --git a/steps/writebbsetupjson.py b/steps/writebbsetupjson.py
index e1f14634..68a8b2db 100644
--- a/steps/writebbsetupjson.py
+++ b/steps/writebbsetupjson.py
@@ -39,6 +39,10 @@ class WriteBBSetupJson(steps.StringDownload):
             branch = self.getProperty("branch_{}".format(repo))
             revision = self.getProperty("commit_{}".format(repo))
 
+            # Skip mixin-wrynose-linux-firmware for non wrynose builds
+            if "wrynose" in repo and "wrynose" not in branch:
+                continue
+
             if revision and revision != "HEAD":
                 rev = revision
             else:
diff --git a/steps/writelayerinfo.py b/steps/writelayerinfo.py
index 741888b1..cdfd0657 100644
--- a/steps/writelayerinfo.py
+++ b/steps/writelayerinfo.py
@@ -29,6 +29,9 @@ class WriteLayerInfo(steps.StringDownload):
             location = self.getProperty("location_{}".format(repo))
             if location:
                 repodict["location"] = location
+            # Skip mixin-wrynose-linux-firmware for non wrynose builds
+            if "wrynose" in repo and "wrynose" not in repodict["branch"]:
+                continue
             layerinfo[repo] = repodict
 
         return json.dumps(layerinfo, sort_keys=True, indent=4,