diff --git a/src/Helpers/Build.php b/src/Helpers/Build.php
index 87bcf4d060c4786af944b5923eb2b611c51d9aaa..17507e5483d411c58fd28a30c468eed52e064aee 100644
--- a/src/Helpers/Build.php
+++ b/src/Helpers/Build.php
@@ -138,7 +138,7 @@
 
             $ret = false;
 
-            if ($params['device'] == $this->model) {
+            if ($params['device'] == $this->model || $params['device'] === "2e" && $this->model === "zirconia") {
                 if (count($params['channels']) > 0) {
                     foreach ($params['channels'] as $channel) {
                         if (strtolower($channel) == $this->channel) {
diff --git a/src/Helpers/Builds.php b/src/Helpers/Builds.php
index 75cc37e3d0da2ac28b25e5323a3fd7b1ca667d0a..7749c45597c6d1e5a4007fdf52a3cabc76451e83 100644
--- a/src/Helpers/Builds.php
+++ b/src/Helpers/Builds.php
@@ -186,7 +186,7 @@
                 foreach ($files as $file) {
                     // Skip all files except for the ones that match the pattern
                     // filename starting with e- and ending with .zip are considered as valid files
-                    if (!preg_match("/^e-[0-9\.]+-(.*)-$device\.zip$/i", $file)) {
+                    if (!preg_match("/^e-[0-9\.]+-(.*)-$device\.zip$/i", $file) && !($device === "2e" && preg_match("/^e-[0-9\.]+-(.*)-zirconia\.zip$/i", $file))) {
                         continue;
                     }
                     $build = null;