diff --git a/resources/definitions/beamup_s.def.json b/resources/definitions/beamup_s.def.json
new file mode 100644
index 0000000000..07e0458db3
--- /dev/null
+++ b/resources/definitions/beamup_s.def.json
@@ -0,0 +1,58 @@
+{
+    "version": 2,
+    "name": "BeamUp S",
+    "inherits": "fdmprinter",
+    "metadata": {
+        "visible": true,
+        "author": "BeamUp",
+        "manufacturer": "BeamUp",
+        "file_formats": "text/x-gcode",
+        "platform": "beamup_s.stl",
+        "platform_offset": [0, -5, -10],
+        "has_machine_quality": true,
+        "has_materials": true,
+        "machine_extruder_trains":
+        {
+            "0": "beamup_s_extruder_0"
+        }
+    },
+
+    "overrides": {
+        "machine_name": { 
+            "default_value": "BeamUp S" 
+        },
+        "machine_width": {
+            "default_value": 200
+        },
+        "machine_depth": {
+            "default_value": 180
+        },
+        "machine_height": {
+            "default_value": 130
+        },
+        "machine_heated_bed": {
+            "default_value": false
+        },
+        "machine_center_is_zero": {
+            "default_value": false
+        },
+        "machine_nozzle_heat_up_speed": {
+            "default_value": 2
+        },
+        "machine_nozzle_cool_down_speed": {
+            "default_value": 2
+        },
+        "gantry_height": {
+            "value": "0"
+        },
+        "machine_gcode_flavor": {
+            "default_value": "RepRap (Marlin/Sprinter)"
+        },
+        "machine_start_gcode": {
+            "default_value": "G28 ; home\nG29 ; level\nM80 ; led\nG1 Z15.0 F6000\nT0\nG92 E0.0000\nG1 E-1.4500 F1800\nG1 X5 Y0 Z0.300 F6000\nM300 S3000 P300\nG1 E1.0000 F1800\nG92 E0.0000\nG1 X180 Y0 E15 F662"
+        },
+        "machine_end_gcode": {
+            "default_value": "G28 ; home\nM104 S0 ; turn off\n M140 S0 ; turn off\nM84 ; disable motors\nM107 ; fan off"
+        }
+    }
+}
diff --git a/resources/extruders/beamup_s_extruder_0.def.json b/resources/extruders/beamup_s_extruder_0.def.json
new file mode 100644
index 0000000000..1df9068198
--- /dev/null
+++ b/resources/extruders/beamup_s_extruder_0.def.json
@@ -0,0 +1,15 @@
+{
+    "version": 2,
+    "name": "Extruder 1",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "beamup_s",
+        "position": "0"
+    },
+
+    "overrides": {
+        "extruder_nr": { "default_value": 0 },
+        "machine_nozzle_size": { "default_value": 0.4 },
+        "material_diameter": { "default_value": 1.75 }
+    }
+}
diff --git a/resources/meshes/beamup_s.stl b/resources/meshes/beamup_s.stl
new file mode 100644
index 0000000000..18dac61f8c
Binary files /dev/null and b/resources/meshes/beamup_s.stl differ
diff --git a/resources/quality/beamup_s/beamup_s_coarse.inst.cfg b/resources/quality/beamup_s/beamup_s_coarse.inst.cfg
new file mode 100644
index 0000000000..9f82b7b138
--- /dev/null
+++ b/resources/quality/beamup_s/beamup_s_coarse.inst.cfg
@@ -0,0 +1,40 @@
+[general]
+version = 4
+name = BeamUp S Coarse
+definition = beamup_s
+
+[metadata]
+setting_version = 10
+type = quality
+quality_type = coarse
+weight = -3
+material = generic_pla
+
+[values]
+layer_height = 0.30
+adhesion_type = brim
+brim_line_count = 5
+infill_before_walls = False
+initial_layer_line_width_factor = 120.0
+material_print_temperature = 215
+material_print_temperature_layer_0 = 230
+retraction_amount = 1.5
+retraction_speed = 30
+speed_infill = 50
+speed_layer_0 = 25
+speed_print = 50
+speed_support_interface = 50
+speed_topbottom = 50
+speed_wall_0 = 35
+speed_wall_x = 50
+support_enable = True
+support_angle = 60
+support_infill_rate = 20
+support_interface_enable = True
+support_interface_height = 0.60
+support_interface_pattern = zigzag
+support_interface_skip_height = 0.30
+support_offset = 0.8
+support_z_distance = 0.2
+wall_thickness = 0.8
+zig_zaggify_infill = True
diff --git a/resources/quality/beamup_s/beamup_s_draft.inst.cfg b/resources/quality/beamup_s/beamup_s_draft.inst.cfg
new file mode 100644
index 0000000000..a696fafd2b
--- /dev/null
+++ b/resources/quality/beamup_s/beamup_s_draft.inst.cfg
@@ -0,0 +1,40 @@
+[general]
+version = 4
+name = BeamUp S Draft
+definition = beamup_s
+
+[metadata]
+setting_version = 10
+type = quality
+quality_type = draft
+weight = -2
+material = generic_pla
+
+[values]
+layer_height = 0.2
+adhesion_type = brim
+brim_line_count = 5
+infill_before_walls = False
+initial_layer_line_width_factor = 120.0
+material_print_temperature = 210
+material_print_temperature_layer_0 = 230
+retraction_amount = 1.5
+retraction_speed = 30
+speed_infill = 45
+speed_layer_0 = 25
+speed_print = 45
+speed_support_interface = 45
+speed_topbottom = 45
+speed_wall_0 = 35
+speed_wall_x = 45
+support_enable = True
+support_angle = 60
+support_infill_rate = 20
+support_interface_enable = True
+support_interface_height = 0.40
+support_interface_pattern = zigzag
+support_interface_skip_height = 0.20
+support_offset = 0.8
+support_z_distance = 0.2
+wall_thickness = 0.8
+zig_zaggify_infill = True
diff --git a/resources/quality/beamup_s/beamup_s_extra_fine.inst.cfg b/resources/quality/beamup_s/beamup_s_extra_fine.inst.cfg
new file mode 100644
index 0000000000..ee1a1cb6a7
--- /dev/null
+++ b/resources/quality/beamup_s/beamup_s_extra_fine.inst.cfg
@@ -0,0 +1,40 @@
+[general]
+version = 4
+name = BeamUp S Extra Fine
+definition = beamup_s
+
+[metadata]
+setting_version = 10
+type = quality
+quality_type = high
+weight = 1
+material = generic_pla
+
+[values]
+layer_height = 0.06
+adhesion_type = brim
+brim_line_count = 5
+infill_before_walls = False
+initial_layer_line_width_factor = 120.0
+material_print_temperature = 195
+material_print_temperature_layer_0 = 230
+retraction_amount = 1.5
+retraction_speed = 30
+speed_infill = 40
+speed_layer_0 = 25
+speed_print = 40
+speed_support_interface = 40
+speed_topbottom = 40
+speed_wall_0 = 30
+speed_wall_x = 40
+support_enable = True
+support_angle = 60
+support_infill_rate = 20
+support_interface_enable = True
+support_interface_height = 0.30
+support_interface_pattern = zigzag
+support_interface_skip_height = 0.06
+support_offset = 0.8
+support_z_distance = 0.2
+wall_thickness = 0.8
+zig_zaggify_infill = True
diff --git a/resources/quality/beamup_s/beamup_s_fine.inst.cfg b/resources/quality/beamup_s/beamup_s_fine.inst.cfg
new file mode 100644
index 0000000000..c68f854536
--- /dev/null
+++ b/resources/quality/beamup_s/beamup_s_fine.inst.cfg
@@ -0,0 +1,40 @@
+[general]
+version = 4
+name = BeamUp S Fine
+definition = beamup_s
+
+[metadata]
+setting_version = 10
+type = quality
+quality_type = normal
+weight = 0
+material = generic_pla
+
+[values]
+layer_height = 0.1
+adhesion_type = brim
+brim_line_count = 5
+infill_before_walls = False
+initial_layer_line_width_factor = 120.0
+material_print_temperature = 200
+material_print_temperature_layer_0 = 230
+retraction_amount = 1.5
+retraction_speed = 30
+speed_infill = 40
+speed_layer_0 = 25
+speed_print = 40
+speed_support_interface = 40
+speed_topbottom = 40
+speed_wall_0 = 30
+speed_wall_x = 40
+support_enable = True
+support_angle = 60
+support_infill_rate = 20
+support_interface_enable = True
+support_interface_height = 0.30
+support_interface_pattern = zigzag
+support_interface_skip_height = 0.10
+support_offset = 0.8
+support_z_distance = 0.2
+wall_thickness = 0.8
+zig_zaggify_infill = True
diff --git a/resources/quality/beamup_s/beamup_s_normal.inst.cfg b/resources/quality/beamup_s/beamup_s_normal.inst.cfg
new file mode 100644
index 0000000000..7b692d2cb3
--- /dev/null
+++ b/resources/quality/beamup_s/beamup_s_normal.inst.cfg
@@ -0,0 +1,40 @@
+[general]
+version = 4
+name = BeamUp S Normal
+definition = beamup_s
+
+[metadata]
+setting_version = 10
+type = quality
+quality_type = fast
+weight = -1
+material = generic_pla
+
+[values]
+layer_height = 0.15
+adhesion_type = brim
+brim_line_count = 5
+infill_before_walls = False
+initial_layer_line_width_factor = 120.0
+material_print_temperature = 205
+material_print_temperature_layer_0 = 230
+retraction_amount = 1.5
+retraction_speed = 30
+speed_infill = 45
+speed_layer_0 = 25
+speed_print = 45
+speed_support_interface = 45
+speed_topbottom = 45
+speed_wall_0 = 35
+speed_wall_x = 45
+support_enable = True
+support_angle = 60
+support_infill_rate = 20
+support_interface_enable = True
+support_interface_height = 0.45
+support_interface_pattern = zigzag
+support_interface_skip_height = 0.15
+support_offset = 0.8
+support_z_distance = 0.2
+wall_thickness = 0.8
+zig_zaggify_infill = True