diff --git a/python_modules/build_iso.py b/python_modules/build_iso.py
index 0af164b3..1730f61d 100644
--- a/python_modules/build_iso.py
+++ b/python_modules/build_iso.py
@@ -60,7 +60,7 @@ class BuildBase:
         lbsetup = None
         if self.sbase in ["deb", "dev"]:
             arch_suffix = self.sarch[1:]
-            if arch_suffix in ["64", "32", "arm"]:
+            if arch_suffix in ["64", "32", "arm", "64srv", "64ld"]:
                 lbsetup = getattr(
                             conf, f"LBSET_{self.sbase.upper()}{arch_suffix}"
                             )
@@ -208,9 +208,9 @@ class BuildLoaded(BuildBase):
         arch_suffix = self.sarch[1:]
         cmd_list = None
         if self.sbase in ["deb", "dev"]:
-            if arch_suffix in ["64", "32", "arm"]:
+            if arch_suffix in ["64ld"]:
                 os.system(f'touch {self.sbase.upper()}.{arch_suffix}loaded')
-        if arch_suffix in ["64", "32", "arm"]:
+        if arch_suffix in ["64ld]:
             cmd_list = getattr(conf, f"build{arch_suffix}_loaded_build", [])
             for command in cmd_list:
                 execute = command + '()'
@@ -236,9 +236,9 @@ class BuildServer(BuildBase):
         arch_suffix = self.sarch[1:]
         cmd_list = None
         if self.sbase in ["deb", "dev"]:
-            if arch_suffix in ["64", "32", "arm"]:
+            if arch_suffix in ["64srv"]:
                 os.system(f'touch {self.sbase.upper()}.{arch_suffix}server')
-        if arch_suffix in ["64", "32", "arm"]:
+        if arch_suffix in ["64srv"]:
             cmd_list = getattr(conf, f"build{arch_suffix}_server_build", [])
             for command in cmd_list:
                 execute = command + '()'
@@ -385,8 +385,8 @@ class Decsions:
     def dserver(self):
         """ Arguments for the Server """
         build_type_mapping = {
-            'b-srvdeb': ("server", "_64"),
-            'b-srvdev': ("server", "_64"),
+            'b-srvdeb': ("server", "_64srv"),
+            'b-srvdev': ("server", "_64srv"),
         }
 
         build_argument = self.arguments.b