diff --git a/.github/workflows/installers.yml b/.github/workflows/installers.yml
index 6e531ba833..f1bd4b2d19 100644
--- a/.github/workflows/installers.yml
+++ b/.github/workflows/installers.yml
@@ -58,7 +58,7 @@ jobs:
       enterprise: ${{ github.event.inputs.enterprise == 'true' }}
       staging: ${{ github.event.inputs.staging == 'true' }}
       architecture: X64
-      operating_system: windows-2022
+      operating_system: self-hosted-Windows-X64
     secrets: inherit
 
   linux-installer:
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 22a81e9b2a..09f972bb1a 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -34,9 +34,10 @@ on:
       operating_system:
         description: 'OS'
         required: true
-        default: 'windows-2022'
+        default: 'self-hosted-Windows-X64'
         type: choice
         options:
+          - self-hosted-Windows-X64
           - windows-2022
 
 jobs:
diff --git a/cura/OAuth2/AuthorizationHelpers.py b/cura/OAuth2/AuthorizationHelpers.py
index a654ee4bdb..569ba80659 100644
--- a/cura/OAuth2/AuthorizationHelpers.py
+++ b/cura/OAuth2/AuthorizationHelpers.py
@@ -40,6 +40,7 @@ class AuthorizationHelpers:
         """
         data = {
             "client_id": self._settings.CLIENT_ID if self._settings.CLIENT_ID is not None else "",
+            "client_secret": self._settings.CLIENT_SECRET if self._settings.CLIENT_SECRET is not None else "",
             "redirect_uri": self._settings.CALLBACK_URL if self._settings.CALLBACK_URL is not None else "",
             "grant_type": "authorization_code",
             "code": authorization_code,
@@ -64,6 +65,7 @@ class AuthorizationHelpers:
         Logger.log("d", "Refreshing the access token for [%s]", self._settings.OAUTH_SERVER_URL)
         data = {
             "client_id": self._settings.CLIENT_ID if self._settings.CLIENT_ID is not None else "",
+            "client_secret": self._settings.CLIENT_SECRET if self._settings.CLIENT_SECRET is not None else "",
             "redirect_uri": self._settings.CALLBACK_URL if self._settings.CALLBACK_URL is not None else "",
             "grant_type": "refresh_token",
             "refresh_token": refresh_token,
diff --git a/cura/OAuth2/AuthorizationService.py b/cura/OAuth2/AuthorizationService.py
index 62bf31982a..29c426e46f 100644
--- a/cura/OAuth2/AuthorizationService.py
+++ b/cura/OAuth2/AuthorizationService.py
@@ -31,20 +31,24 @@ class AuthorizationService:
     account information.
     """
 
-    # Emit signal when authentication is completed.
-    onAuthStateChanged = Signal()
+    def __init__(self,
+                 settings: "OAuth2Settings",
+                 preferences: Optional["Preferences"] = None,
+                 callback_auth_data_retrieved: Callable[[], None] = None) -> None:
+        # Emit signal when authentication is completed.
+        self.onAuthStateChanged = Signal()
 
-    # Emit signal when authentication failed.
-    onAuthenticationError = Signal()
+        # Emit signal when authentication failed.
+        self.onAuthenticationError = Signal()
 
-    accessTokenChanged = Signal()
+        self.accessTokenChanged = Signal()
 
-    def __init__(self, settings: "OAuth2Settings", preferences: Optional["Preferences"] = None) -> None:
         self._settings = settings
         self._auth_helpers = AuthorizationHelpers(settings)
         self._auth_url = "{}/authorize".format(self._settings.OAUTH_SERVER_URL)
         self._auth_data: Optional[AuthenticationResponse] = None
         self._user_profile: Optional["UserProfile"] = None
+        self._callback_auth_data_retrieved = self.getUserProfile if callback_auth_data_retrieved is None else callback_auth_data_retrieved
         self._preferences = preferences
         self._server = LocalAuthorizationServer(self._auth_helpers, self._onAuthStateChanged, daemon=True)
         self._currently_refreshing_token = False  # Whether we are currently in the process of refreshing auth. Don't make new requests while busy.
@@ -294,7 +298,7 @@ class AuthorizationService:
         self._auth_data = auth_data
         self._currently_refreshing_token = False
         if auth_data:
-            self.getUserProfile()
+            self._callback_auth_data_retrieved()
             self._preferences.setValue(self._settings.AUTH_DATA_PREFERENCE_KEY, json.dumps(auth_data.dump()))
         else:
             Logger.log("d", "Clearing the user profile")
diff --git a/cura/OAuth2/Models.py b/cura/OAuth2/Models.py
index 4c84872a09..3427f1cc3d 100644
--- a/cura/OAuth2/Models.py
+++ b/cura/OAuth2/Models.py
@@ -16,6 +16,7 @@ class OAuth2Settings(BaseModel):
     CALLBACK_PORT = None  # type: Optional[int]
     OAUTH_SERVER_URL = None  # type: Optional[str]
     CLIENT_ID = None  # type: Optional[str]
+    CLIENT_SECRET = None  # type: Optional[str]
     CLIENT_SCOPES = None  # type: Optional[str]
     CALLBACK_URL = None  # type: Optional[str]
     AUTH_DATA_PREFERENCE_KEY = ""  # type: str
diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json
index 972d69e0d3..1ceb05a43a 100644
--- a/resources/definitions/ultimaker_method_base.def.json
+++ b/resources/definitions/ultimaker_method_base.def.json
@@ -361,8 +361,10 @@
         "raft_interface_line_width": { "value": 0.7 },
         "raft_interface_speed": { "value": 90 },
         "raft_interface_thickness": { "value": 0.3 },
-        "raft_margin": { "value": 3 },
+        "raft_interface_wall_count": { "value": "raft_wall_count" },
+        "raft_margin": { "value": 1.2 },
         "raft_surface_extruder_nr": { "value": "int(anyExtruderWithMaterial('material_is_support_material')) if support_enable and extruderValue(support_extruder_nr,'material_is_support_material') else raft_base_extruder_nr" },
+        "raft_surface_wall_count": { "value": "raft_wall_count" },
         "retraction_amount": { "value": 0.75 },
         "retraction_combing": { "value": "'off'" },
         "retraction_combing_max_distance": { "value": "speed_travel / 10" },
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_abs_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_abs_0.1mm.inst.cfg
index 5e0afa0015..ec9ff192a9 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.25_abs_0.1mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_abs_0.1mm.inst.cfg
@@ -12,6 +12,7 @@ variant = AA 0.25
 weight = 0
 
 [values]
+cool_fan_speed_0 = 0
 material_print_temperature = =default_material_print_temperature - 20
 speed_topbottom = =math.ceil(speed_print * 30 / 55)
 support_bottom_distance = =support_z_distance
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_um-abs_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_um-abs_0.1mm.inst.cfg
index ada1c2cefb..40058561ac 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.25_um-abs_0.1mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_um-abs_0.1mm.inst.cfg
@@ -12,6 +12,7 @@ variant = AA 0.25
 weight = 0
 
 [values]
+cool_fan_speed_0 = 0
 material_print_temperature = =default_material_print_temperature - 20
 speed_topbottom = =math.ceil(speed_print * 30 / 55)
 support_bottom_distance = =support_z_distance
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-abs_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-abs_0.15mm.inst.cfg
index cd8e392dfa..ee0525c13e 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-abs_0.15mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-abs_0.15mm.inst.cfg
@@ -52,7 +52,7 @@ small_skin_on_surface = False
 small_skin_width = 4
 speed_infill = =speed_print
 speed_ironing = 20
-speed_layer_0 = =speed_roofing
+speed_layer_0 = 30
 speed_prime_tower = =speed_wall_0
 speed_print = 100
 speed_roofing = =math.ceil(speed_wall*(45/100))
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-abs_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-abs_0.2mm.inst.cfg
index 29f3cb056f..57413c4b30 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-abs_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-abs_0.2mm.inst.cfg
@@ -53,7 +53,7 @@ small_skin_on_surface = False
 small_skin_width = 4
 speed_infill = =speed_print
 speed_ironing = 20
-speed_layer_0 = =speed_roofing
+speed_layer_0 = 30
 speed_prime_tower = =speed_wall_0
 speed_print = 100
 speed_roofing = =math.ceil(speed_wall*(45/100))
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-abs_0.3mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-abs_0.3mm.inst.cfg
index 94535ab9c1..0052ce90cd 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-abs_0.3mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-abs_0.3mm.inst.cfg
@@ -53,7 +53,7 @@ small_skin_on_surface = False
 small_skin_width = 4
 speed_infill = =speed_print
 speed_ironing = 20
-speed_layer_0 = =speed_roofing
+speed_layer_0 = 30
 speed_prime_tower = =speed_wall_0
 speed_print = 100
 speed_roofing = =math.ceil(speed_wall*(45/100))
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-petg_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-petg_0.15mm.inst.cfg
index 4c2861436a..8732c3ad63 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-petg_0.15mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-petg_0.15mm.inst.cfg
@@ -51,7 +51,7 @@ small_skin_on_surface = False
 small_skin_width = 4
 speed_infill = =speed_print
 speed_ironing = 20
-speed_layer_0 = =speed_roofing
+speed_layer_0 = 30
 speed_prime_tower = =speed_wall_0
 speed_print = 100
 speed_roofing = =math.ceil(speed_wall*(45/100))
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-petg_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-petg_0.2mm.inst.cfg
index 7e29e3a9d0..e7e50350c0 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-petg_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-petg_0.2mm.inst.cfg
@@ -52,7 +52,7 @@ small_skin_on_surface = False
 small_skin_width = 4
 speed_infill = =speed_print
 speed_ironing = 20
-speed_layer_0 = =speed_roofing
+speed_layer_0 = 30
 speed_prime_tower = =speed_wall_0
 speed_print = 100
 speed_roofing = =math.ceil(speed_wall*(45/100))
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-petg_0.3mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-petg_0.3mm.inst.cfg
index 2a74986a2a..5ecaa739db 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-petg_0.3mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-petg_0.3mm.inst.cfg
@@ -52,7 +52,7 @@ small_skin_on_surface = False
 small_skin_width = 4
 speed_infill = =speed_print
 speed_ironing = 20
-speed_layer_0 = =speed_roofing
+speed_layer_0 = 30
 speed_prime_tower = =speed_wall_0
 speed_print = 100
 speed_roofing = =math.ceil(speed_wall*(45/100))
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.15mm.inst.cfg
index 0f3fee265b..136a3bed42 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.15mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.15mm.inst.cfg
@@ -52,7 +52,7 @@ small_skin_on_surface = False
 small_skin_width = 4
 speed_infill = =speed_print
 speed_ironing = 20
-speed_layer_0 = =speed_roofing
+speed_layer_0 = 30
 speed_prime_tower = =speed_wall_0
 speed_print = 100
 speed_roofing = =math.ceil(speed_wall*(45/100))
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.2mm.inst.cfg
index 100f2485ba..dcbb580edb 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.2mm.inst.cfg
@@ -53,7 +53,7 @@ small_skin_on_surface = False
 small_skin_width = 4
 speed_infill = =speed_print
 speed_ironing = 20
-speed_layer_0 = =speed_roofing
+speed_layer_0 = 30
 speed_prime_tower = =speed_wall_0
 speed_print = 100
 speed_roofing = =math.ceil(speed_wall*(45/100))
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.3mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.3mm.inst.cfg
index d06fa7c63b..fc2a185be4 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.3mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.3mm.inst.cfg
@@ -53,7 +53,7 @@ small_skin_on_surface = False
 small_skin_width = 4
 speed_infill = =speed_print
 speed_ironing = 20
-speed_layer_0 = =speed_roofing
+speed_layer_0 = 30
 speed_prime_tower = =speed_wall_0
 speed_print = 100
 speed_roofing = =math.ceil(speed_wall*(45/100))
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.15mm.inst.cfg
index d0a2747ea4..2aa24f805d 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.15mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.15mm.inst.cfg
@@ -52,7 +52,7 @@ small_skin_on_surface = False
 small_skin_width = 4
 speed_infill = =speed_print
 speed_ironing = 20
-speed_layer_0 = =speed_roofing
+speed_layer_0 = 26
 speed_prime_tower = =speed_wall_0
 speed_print = 100
 speed_roofing = =math.ceil(speed_wall*(45/100))
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.2mm.inst.cfg
index ea4761463c..151af3ed50 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.2mm.inst.cfg
@@ -52,7 +52,7 @@ small_skin_on_surface = False
 small_skin_width = 4
 speed_infill = =speed_print
 speed_ironing = 20
-speed_layer_0 = =speed_roofing
+speed_layer_0 = 26
 speed_prime_tower = =speed_wall_0
 speed_print = 100
 speed_roofing = =math.ceil(speed_wall*(45/100))
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.3mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.3mm.inst.cfg
index 4ba2b956e9..56c097d890 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.3mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.3mm.inst.cfg
@@ -53,7 +53,7 @@ small_skin_on_surface = False
 small_skin_width = 4
 speed_infill = =speed_print
 speed_ironing = 20
-speed_layer_0 = =speed_roofing
+speed_layer_0 = 26
 speed_prime_tower = =speed_wall_0
 speed_print = 100
 speed_roofing = =math.ceil(speed_wall*(45/100))
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-abs_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-abs_0.2mm.inst.cfg
index 2051530eee..9d7b4455d6 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-abs_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-abs_0.2mm.inst.cfg
@@ -56,7 +56,7 @@ small_skin_on_surface = False
 small_skin_width = 4
 speed_infill = =speed_print
 speed_ironing = 20
-speed_layer_0 = =speed_roofing
+speed_layer_0 = 30
 speed_prime_tower = =speed_wall_0
 speed_print = 100
 speed_roofing = =math.ceil(speed_wall*(45/100))
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-abs_0.3mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-abs_0.3mm.inst.cfg
index 897b0e8688..e2a5c54c66 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-abs_0.3mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-abs_0.3mm.inst.cfg
@@ -53,7 +53,7 @@ small_skin_on_surface = False
 small_skin_width = 4
 speed_infill = =speed_print
 speed_ironing = 20
-speed_layer_0 = =speed_roofing
+speed_layer_0 = 30
 speed_prime_tower = =speed_wall_0
 speed_print = 75
 speed_roofing = =math.ceil(speed_wall*(45/100))
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-abs_0.4mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-abs_0.4mm.inst.cfg
index 12e37a25d9..26d3dc7fb8 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-abs_0.4mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-abs_0.4mm.inst.cfg
@@ -53,7 +53,7 @@ small_skin_on_surface = False
 small_skin_width = 4
 speed_infill = =speed_print
 speed_ironing = 20
-speed_layer_0 = =speed_roofing
+speed_layer_0 = 30
 speed_prime_tower = =speed_wall_0
 speed_print = 50
 speed_roofing = =math.ceil(speed_wall*(45/100))
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-petg_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-petg_0.2mm.inst.cfg
index e62880cf41..b1dae1cb7a 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-petg_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-petg_0.2mm.inst.cfg
@@ -55,7 +55,7 @@ small_skin_on_surface = False
 small_skin_width = 4
 speed_infill = =speed_print
 speed_ironing = 20
-speed_layer_0 = =speed_roofing
+speed_layer_0 = 30
 speed_prime_tower = =speed_wall_0
 speed_print = 100
 speed_roofing = =math.ceil(speed_wall*(45/100))
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-petg_0.3mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-petg_0.3mm.inst.cfg
index 0c35b29fe0..4d4ffa0059 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-petg_0.3mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-petg_0.3mm.inst.cfg
@@ -54,7 +54,7 @@ small_skin_on_surface = False
 small_skin_width = 4
 speed_infill = =speed_print
 speed_ironing = 20
-speed_layer_0 = =speed_roofing
+speed_layer_0 = 30
 speed_prime_tower = =speed_wall_0
 speed_print = 75
 speed_roofing = =math.ceil(speed_wall*(45/100))
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-petg_0.4mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-petg_0.4mm.inst.cfg
index 1c8ba2c88b..5cc6a43e13 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-petg_0.4mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-petg_0.4mm.inst.cfg
@@ -54,7 +54,7 @@ small_skin_on_surface = False
 small_skin_width = 4
 speed_infill = =speed_print
 speed_ironing = 20
-speed_layer_0 = =speed_roofing
+speed_layer_0 = 30
 speed_prime_tower = =speed_wall_0
 speed_print = 50
 speed_roofing = =math.ceil(speed_wall*(45/100))
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-pla_0.2mm.inst.cfg
index f51cd7df60..59f8409483 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-pla_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-pla_0.2mm.inst.cfg
@@ -56,7 +56,7 @@ small_skin_on_surface = False
 small_skin_width = 4
 speed_infill = =speed_print
 speed_ironing = 20
-speed_layer_0 = =speed_roofing
+speed_layer_0 = 30
 speed_prime_tower = =speed_wall_0
 speed_print = 100
 speed_roofing = =math.ceil(speed_wall*(45/100))
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-pla_0.3mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-pla_0.3mm.inst.cfg
index 347f3bd093..a4cdd898f1 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-pla_0.3mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-pla_0.3mm.inst.cfg
@@ -53,7 +53,7 @@ small_skin_on_surface = False
 small_skin_width = 4
 speed_infill = =speed_print
 speed_ironing = 20
-speed_layer_0 = =speed_roofing
+speed_layer_0 = 30
 speed_prime_tower = =speed_wall_0
 speed_print = 65
 speed_roofing = =math.ceil(speed_wall*(45/100))
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-pla_0.4mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-pla_0.4mm.inst.cfg
index 6aaf0461e2..79dc105f86 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-pla_0.4mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-pla_0.4mm.inst.cfg
@@ -53,7 +53,7 @@ small_skin_on_surface = False
 small_skin_width = 4
 speed_infill = =speed_print
 speed_ironing = 20
-speed_layer_0 = =speed_roofing
+speed_layer_0 = 30
 speed_prime_tower = =speed_wall_0
 speed_print = 45
 speed_roofing = =math.ceil(speed_wall*(45/100))
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-tough-pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-tough-pla_0.2mm.inst.cfg
index 4064af789f..a76864a1a3 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-tough-pla_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-tough-pla_0.2mm.inst.cfg
@@ -56,7 +56,7 @@ small_skin_on_surface = False
 small_skin_width = 4
 speed_infill = =speed_print
 speed_ironing = 20
-speed_layer_0 = =speed_roofing
+speed_layer_0 = 26
 speed_prime_tower = =speed_wall_0
 speed_print = 100
 speed_roofing = =math.ceil(speed_wall*(45/100))
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-tough-pla_0.3mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-tough-pla_0.3mm.inst.cfg
index d509a82bb6..d364232726 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-tough-pla_0.3mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-tough-pla_0.3mm.inst.cfg
@@ -53,7 +53,7 @@ small_skin_on_surface = False
 small_skin_width = 4
 speed_infill = =speed_print
 speed_ironing = 20
-speed_layer_0 = =speed_roofing
+speed_layer_0 = 26
 speed_prime_tower = =speed_wall_0
 speed_print = 65
 speed_roofing = =math.ceil(speed_wall*(45/100))
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-tough-pla_0.4mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-tough-pla_0.4mm.inst.cfg
index a6ac3f3895..02a71fa9b7 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-tough-pla_0.4mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-tough-pla_0.4mm.inst.cfg
@@ -53,7 +53,7 @@ small_skin_on_surface = False
 small_skin_width = 4
 speed_infill = =speed_print
 speed_ironing = 20
-speed_layer_0 = =speed_roofing
+speed_layer_0 = 26
 speed_prime_tower = =speed_wall_0
 speed_print = 45
 speed_roofing = =math.ceil(speed_wall*(45/100))
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_abs_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_abs_0.1mm.inst.cfg
index 2e09727a19..d26fe0daee 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.25_abs_0.1mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_abs_0.1mm.inst.cfg
@@ -12,6 +12,7 @@ variant = AA 0.25
 weight = 0
 
 [values]
+cool_fan_speed_0 = 0
 material_print_temperature = =default_material_print_temperature - 20
 speed_topbottom = =math.ceil(speed_print * 30 / 55)
 support_bottom_distance = =support_z_distance
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_um-abs_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_um-abs_0.1mm.inst.cfg
index 1b6c680650..0dc15571d7 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.25_um-abs_0.1mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_um-abs_0.1mm.inst.cfg
@@ -12,6 +12,7 @@ variant = AA 0.25
 weight = 0
 
 [values]
+cool_fan_speed_0 = 0
 material_print_temperature = =default_material_print_temperature - 20
 speed_topbottom = =math.ceil(speed_print * 30 / 55)
 support_bottom_distance = =support_z_distance
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-abs_0.15mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-abs_0.15mm.inst.cfg
index 1085472560..9c7ceca13b 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-abs_0.15mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-abs_0.15mm.inst.cfg
@@ -52,7 +52,7 @@ small_skin_on_surface = False
 small_skin_width = 4
 speed_infill = =speed_print
 speed_ironing = 20
-speed_layer_0 = =speed_roofing
+speed_layer_0 = 30
 speed_prime_tower = =speed_wall_0
 speed_print = 100
 speed_roofing = =math.ceil(speed_wall*(45/100))
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-abs_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-abs_0.2mm.inst.cfg
index 22ef09c921..f430e6bc16 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-abs_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-abs_0.2mm.inst.cfg
@@ -53,7 +53,7 @@ small_skin_on_surface = False
 small_skin_width = 4
 speed_infill = =speed_print
 speed_ironing = 20
-speed_layer_0 = =speed_roofing
+speed_layer_0 = 30
 speed_prime_tower = =speed_wall_0
 speed_print = 100
 speed_roofing = =math.ceil(speed_wall*(45/100))
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-abs_0.3mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-abs_0.3mm.inst.cfg
index 9067d8fb33..98ca8927b6 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-abs_0.3mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-abs_0.3mm.inst.cfg
@@ -53,7 +53,7 @@ small_skin_on_surface = False
 small_skin_width = 4
 speed_infill = =speed_print
 speed_ironing = 20
-speed_layer_0 = =speed_roofing
+speed_layer_0 = 30
 speed_prime_tower = =speed_wall_0
 speed_print = 100
 speed_roofing = =math.ceil(speed_wall*(45/100))
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-petg_0.15mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-petg_0.15mm.inst.cfg
index 8a64a81ab1..201c663d5c 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-petg_0.15mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-petg_0.15mm.inst.cfg
@@ -51,7 +51,7 @@ small_skin_on_surface = False
 small_skin_width = 4
 speed_infill = =speed_print
 speed_ironing = 20
-speed_layer_0 = =speed_roofing
+speed_layer_0 = 30
 speed_prime_tower = =speed_wall_0
 speed_print = 100
 speed_roofing = =math.ceil(speed_wall*(45/100))
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-petg_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-petg_0.2mm.inst.cfg
index 70ee9b0309..55696eccb4 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-petg_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-petg_0.2mm.inst.cfg
@@ -52,7 +52,7 @@ small_skin_on_surface = False
 small_skin_width = 4
 speed_infill = =speed_print
 speed_ironing = 20
-speed_layer_0 = =speed_roofing
+speed_layer_0 = 30
 speed_prime_tower = =speed_wall_0
 speed_print = 100
 speed_roofing = =math.ceil(speed_wall*(45/100))
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-petg_0.3mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-petg_0.3mm.inst.cfg
index 65c8343d85..fe3eeb67ad 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-petg_0.3mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-petg_0.3mm.inst.cfg
@@ -52,7 +52,7 @@ small_skin_on_surface = False
 small_skin_width = 4
 speed_infill = =speed_print
 speed_ironing = 20
-speed_layer_0 = =speed_roofing
+speed_layer_0 = 30
 speed_prime_tower = =speed_wall_0
 speed_print = 100
 speed_roofing = =math.ceil(speed_wall*(45/100))
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.15mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.15mm.inst.cfg
index ac6cce0b10..713f94219f 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.15mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.15mm.inst.cfg
@@ -52,7 +52,7 @@ small_skin_on_surface = False
 small_skin_width = 4
 speed_infill = =speed_print
 speed_ironing = 20
-speed_layer_0 = =speed_roofing
+speed_layer_0 = 30
 speed_prime_tower = =speed_wall_0
 speed_print = 100
 speed_roofing = =math.ceil(speed_wall*(45/100))
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.2mm.inst.cfg
index dbea8c6436..02d22b06b8 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.2mm.inst.cfg
@@ -53,7 +53,7 @@ small_skin_on_surface = False
 small_skin_width = 4
 speed_infill = =speed_print
 speed_ironing = 20
-speed_layer_0 = =speed_roofing
+speed_layer_0 = 30
 speed_prime_tower = =speed_wall_0
 speed_print = 100
 speed_roofing = =math.ceil(speed_wall*(45/100))
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.3mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.3mm.inst.cfg
index dcb2e0c516..b0d5d41d0f 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.3mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.3mm.inst.cfg
@@ -53,7 +53,7 @@ small_skin_on_surface = False
 small_skin_width = 4
 speed_infill = =speed_print
 speed_ironing = 20
-speed_layer_0 = =speed_roofing
+speed_layer_0 = 30
 speed_prime_tower = =speed_wall_0
 speed_print = 100
 speed_roofing = =math.ceil(speed_wall*(45/100))
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.15mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.15mm.inst.cfg
index 59044a7f04..55e724da9d 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.15mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.15mm.inst.cfg
@@ -52,7 +52,7 @@ small_skin_on_surface = False
 small_skin_width = 4
 speed_infill = =speed_print
 speed_ironing = 20
-speed_layer_0 = =speed_roofing
+speed_layer_0 = 26
 speed_prime_tower = =speed_wall_0
 speed_print = 100
 speed_roofing = =math.ceil(speed_wall*(45/100))
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.2mm.inst.cfg
index 74e6d5d972..ee0ee279e6 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.2mm.inst.cfg
@@ -52,7 +52,7 @@ small_skin_on_surface = False
 small_skin_width = 4
 speed_infill = =speed_print
 speed_ironing = 20
-speed_layer_0 = =speed_roofing
+speed_layer_0 = 26
 speed_prime_tower = =speed_wall_0
 speed_print = 100
 speed_roofing = =math.ceil(speed_wall*(45/100))
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.3mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.3mm.inst.cfg
index a9cb1c6865..875bd5a669 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.3mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.3mm.inst.cfg
@@ -53,7 +53,7 @@ small_skin_on_surface = False
 small_skin_width = 4
 speed_infill = =speed_print
 speed_ironing = 20
-speed_layer_0 = =speed_roofing
+speed_layer_0 = 26
 speed_prime_tower = =speed_wall_0
 speed_print = 100
 speed_roofing = =math.ceil(speed_wall*(45/100))
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-abs_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-abs_0.2mm.inst.cfg
index c6e3042130..9ba4a38c6e 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-abs_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-abs_0.2mm.inst.cfg
@@ -56,7 +56,7 @@ small_skin_on_surface = False
 small_skin_width = 4
 speed_infill = =speed_print
 speed_ironing = 20
-speed_layer_0 = =speed_roofing
+speed_layer_0 = 30
 speed_prime_tower = =speed_wall_0
 speed_print = 100
 speed_roofing = =math.ceil(speed_wall*(45/100))
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-abs_0.3mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-abs_0.3mm.inst.cfg
index 764a0cb9ac..4ab74980ef 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-abs_0.3mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-abs_0.3mm.inst.cfg
@@ -53,7 +53,7 @@ small_skin_on_surface = False
 small_skin_width = 4
 speed_infill = =speed_print
 speed_ironing = 20
-speed_layer_0 = =speed_roofing
+speed_layer_0 = 30
 speed_prime_tower = =speed_wall_0
 speed_print = 75
 speed_roofing = =math.ceil(speed_wall*(45/100))
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-abs_0.4mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-abs_0.4mm.inst.cfg
index 1f02428548..269d51dd4b 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-abs_0.4mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-abs_0.4mm.inst.cfg
@@ -53,7 +53,7 @@ small_skin_on_surface = False
 small_skin_width = 4
 speed_infill = =speed_print
 speed_ironing = 20
-speed_layer_0 = =speed_roofing
+speed_layer_0 = 30
 speed_prime_tower = =speed_wall_0
 speed_print = 50
 speed_roofing = =math.ceil(speed_wall*(45/100))
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-petg_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-petg_0.2mm.inst.cfg
index a144394b5a..4f56167ffd 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-petg_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-petg_0.2mm.inst.cfg
@@ -55,7 +55,7 @@ small_skin_on_surface = False
 small_skin_width = 4
 speed_infill = =speed_print
 speed_ironing = 20
-speed_layer_0 = =speed_roofing
+speed_layer_0 = 30
 speed_prime_tower = =speed_wall_0
 speed_print = 100
 speed_roofing = =math.ceil(speed_wall*(45/100))
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-petg_0.3mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-petg_0.3mm.inst.cfg
index 8af2e7c1bb..9fdf9a665b 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-petg_0.3mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-petg_0.3mm.inst.cfg
@@ -54,7 +54,7 @@ small_skin_on_surface = False
 small_skin_width = 4
 speed_infill = =speed_print
 speed_ironing = 20
-speed_layer_0 = =speed_roofing
+speed_layer_0 = 30
 speed_prime_tower = =speed_wall_0
 speed_print = 75
 speed_roofing = =math.ceil(speed_wall*(45/100))
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-petg_0.4mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-petg_0.4mm.inst.cfg
index bd74c294e1..3368ae6e2d 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-petg_0.4mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-petg_0.4mm.inst.cfg
@@ -54,7 +54,7 @@ small_skin_on_surface = False
 small_skin_width = 4
 speed_infill = =speed_print
 speed_ironing = 20
-speed_layer_0 = =speed_roofing
+speed_layer_0 = 30
 speed_prime_tower = =speed_wall_0
 speed_print = 50
 speed_roofing = =math.ceil(speed_wall*(45/100))
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-pla_0.2mm.inst.cfg
index 32cc67a02b..ca93df9dc1 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-pla_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-pla_0.2mm.inst.cfg
@@ -56,7 +56,7 @@ small_skin_on_surface = False
 small_skin_width = 4
 speed_infill = =speed_print
 speed_ironing = 20
-speed_layer_0 = =speed_roofing
+speed_layer_0 = 30
 speed_prime_tower = =speed_wall_0
 speed_print = 100
 speed_roofing = =math.ceil(speed_wall*(45/100))
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-pla_0.3mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-pla_0.3mm.inst.cfg
index 79df2f65f0..4461ae0772 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-pla_0.3mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-pla_0.3mm.inst.cfg
@@ -53,7 +53,7 @@ small_skin_on_surface = False
 small_skin_width = 4
 speed_infill = =speed_print
 speed_ironing = 20
-speed_layer_0 = =speed_roofing
+speed_layer_0 = 30
 speed_prime_tower = =speed_wall_0
 speed_print = 65
 speed_roofing = =math.ceil(speed_wall*(45/100))
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-pla_0.4mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-pla_0.4mm.inst.cfg
index acfbcb1f1e..1acdad53a0 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-pla_0.4mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-pla_0.4mm.inst.cfg
@@ -53,7 +53,7 @@ small_skin_on_surface = False
 small_skin_width = 4
 speed_infill = =speed_print
 speed_ironing = 20
-speed_layer_0 = =speed_roofing
+speed_layer_0 = 30
 speed_prime_tower = =speed_wall_0
 speed_print = 45
 speed_roofing = =math.ceil(speed_wall*(45/100))
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-tough-pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-tough-pla_0.2mm.inst.cfg
index 0ea97ff531..4973ec35bb 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-tough-pla_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-tough-pla_0.2mm.inst.cfg
@@ -56,7 +56,7 @@ small_skin_on_surface = False
 small_skin_width = 4
 speed_infill = =speed_print
 speed_ironing = 20
-speed_layer_0 = =speed_roofing
+speed_layer_0 = 26
 speed_prime_tower = =speed_wall_0
 speed_print = 100
 speed_roofing = =math.ceil(speed_wall*(45/100))
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-tough-pla_0.3mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-tough-pla_0.3mm.inst.cfg
index 0f21a87568..2bcf3fa82d 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-tough-pla_0.3mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-tough-pla_0.3mm.inst.cfg
@@ -53,7 +53,7 @@ small_skin_on_surface = False
 small_skin_width = 4
 speed_infill = =speed_print
 speed_ironing = 20
-speed_layer_0 = =speed_roofing
+speed_layer_0 = 26
 speed_prime_tower = =speed_wall_0
 speed_print = 65
 speed_roofing = =math.ceil(speed_wall*(45/100))
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-tough-pla_0.4mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-tough-pla_0.4mm.inst.cfg
index 70234b8524..3e4693c115 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-tough-pla_0.4mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-tough-pla_0.4mm.inst.cfg
@@ -53,7 +53,7 @@ small_skin_on_surface = False
 small_skin_width = 4
 speed_infill = =speed_print
 speed_ironing = 20
-speed_layer_0 = =speed_roofing
+speed_layer_0 = 26
 speed_prime_tower = =speed_wall_0
 speed_print = 45
 speed_roofing = =math.ceil(speed_wall*(45/100))