diff --git a/iso_configs/calamares_settings/oem/oem.conf b/iso_configs/calamares_settings/oem/oem.conf
new file mode 100644
index 00000000..c214708d
--- /dev/null
+++ b/iso_configs/calamares_settings/oem/oem.conf
@@ -0,0 +1,16 @@
+# Put this file inthis location
+# /etc/calamares/oem.conf
+
+oem:
+  # OEM mode
+  enabled: truerrrrrrrrrrrrrrrrrrrrraserffewfrfesda sd f sdf sdf dsaf sdafa dsf sda fsd af
+
+  # OEM user account
+  user:
+    name: oemuser
+    password: oempassword
+    groups: [sudo, audio, video, plugdev]
+
+  # OEM system settings
+  system:
+    hostname: oemhostname
diff --git a/iso_configs/calamares_settings/oem/settings.conf b/iso_configs/calamares_settings/oem/settings.conf
new file mode 100644
index 00000000..53ab6e8e
--- /dev/null
+++ b/iso_configs/calamares_settings/oem/settings.conf
@@ -0,0 +1,110 @@
+# Configuration file for Calamares
+# Syntax is YAML 1.2
+---
+
+# "local" is LIBDIR/calamares/modules with settings in SHARE/calamares/modules
+modules-search: [ local, /usr/lib/calamares/modules ]
+
+# YAML: list of maps of string:string key-value pairs.
+instances:
+#- id:       packages
+#  module:   netinstall
+#  config:   netinstall-packages.conf
+#- id:       system
+#  module:   netinstall
+#  config:   netinstall-system.conf
+#- id:       pkgs
+#  module:   netinstall
+#  config:   netinstall-pkgs.conf
+
+
+sequence:
+
+# Phase 1 - prepare.
+# View modules are shown as UI pages, jobs from job modules
+# are executed immediately in the background.
+# Jobs should be executed sparingly (if at all) in this phase.
+- show:
+  - welcome
+  - locale
+  - keyboard
+  - partition
+#  - netinstall@packages
+  - users
+  - summary
+
+# Phase 2 - install.
+# View modules are not shown. Only the view modules shown
+# in the previous phase are allowed, their names should be
+# added here as placeholders to specify the order in which
+# view module jobs should be enqueued. Job modules are
+# also allowed.
+- exec:
+  - partition
+  - mount
+  - unpackfs
+  - sources-media
+  - machineid
+  - fstab
+  - locale
+  - keyboard
+  - localecfg
+  - users
+  - displaymanager
+  - networkcfg
+  - hwclock
+  - services-systemd
+  - bootloader-config
+  - grubcfg
+  - bootloader
+  - packages
+  - luksbootkeyfile
+  - luksopenswaphookcfg
+  - plymouthcfg
+  - initramfscfg
+  - initramfs
+  - sources-media-unmount
+  - sources-final
+  - shellprocess
+  - umount
+
+# Phase 3 - postinstall.
+# View modules are shown as UI pages, jobs from job modules are
+# executed immediately in the background.
+# Jobs should be executed sparingly (if at all) in this phase.
+- show:
+  - finished
+
+# A branding component is a directory, either in
+# SHARE/calamares/branding or in /etc/calamares/branding
+# (the latter takes precedence). The directory must contain a
+# YAML file branding.desc which may reference additional resources
+# (such as images) as paths relative to the current directory.
+# Only the name of the branding component (directory) should be
+# specified here, Calamares then takes care of finding it and
+# loading the contents.
+branding: peppermint
+
+# If this is set to true, Calamares will show an "Are you sure?" prompt right
+# before each execution phase, i.e. at points of no return. If this is set to
+# false, no prompt is shown. Default is false.
+#
+# YAML: boolean.
+prompt-install: false
+
+# If this is set to true, Calamares will execute all target environment
+# commands in the current environment, without chroot. This setting should
+# only be used when setting up Calamares as a post-install configuration tool,
+# as opposed to a full operating system installer.
+#
+# Some official Calamares modules are not expected to function with this
+# setting. (e.g. partitioning seems like a bad idea, since that is expected to
+# have been done already)
+#
+# Default is false (for a normal installer).
+#
+# YAML: boolean.
+dont-chroot: false
+
+# include the OEM settings
+include_configuration("/etc/calamares/oem.conf")
diff --git a/python_modules/build_iso.py b/python_modules/build_iso.py
index 3792330d..a699a48e 100644
--- a/python_modules/build_iso.py
+++ b/python_modules/build_iso.py
@@ -132,6 +132,7 @@ class BuildXfce(BuildBase):
                 exec(execute)
         return cmd_list
 
+
 class BuildGflashback(BuildBase):
     """ This class will ensure the gnomeflashback builds are built """
     def __init__(self, sbase, sarch):
@@ -213,6 +214,14 @@ class Decsions:
             'b-debarm': ("deb", "_arm"),
             'b-devarm': ("dev", "_arm"),
         }
+        build_type_mapping_oem = {
+            'b-deb64o': ("debo", "_64"),
+            'b-deb32o': ("debo", "_32"),
+            'b-dev64o': ("devo", "_64"),
+            'b-dev32o': ("devo", "_32"),
+            'b-debarmo': ("debo", "_arm"),
+            'b-devarmo': ("devo", "_arm"),
+        }
 
         build_argument = self.arguments.b
         if build_argument in build_type_mapping:
@@ -220,6 +229,14 @@ class Decsions:
             BuildXfce(*build_type_mapping[build_argument])
         else:
             logger.critical("You have not specified a build to process!")
+        build_argument_oem = self.arguments.b
+        if build_argument_oem in build_type_mapping_oem:
+            readybuild()
+            BuildXfce(*build_type_mapping[build_argument])
+        else:
+            logger.critical("You have not specified a build to process!")
+        
+        
 
 
     def dgnomefb(self):