diff --git a/docs/configuration/yaml.rst b/docs/configuration/yaml.rst
index 3c669656..297ed975 100644
--- a/docs/configuration/yaml.rst
+++ b/docs/configuration/yaml.rst
@@ -166,8 +166,7 @@ Examples
 Based on the three types explained above, quite complex data structures are possible (whitespace made visible to
 help track indentation):
 
-.. code-block-ext:: yaml
-   :whitespace:
+.. code-block:: yaml
 
    general:
      some_setting: some_value
@@ -205,8 +204,7 @@ just playing a trick on you due to the list's dashes ``-`` being on the same lev
 also just add two more spaces to your identation and write that part like this, which makes the structure a bit
 clearer (whitespace again made visible to help track indentation):
 
-.. code-block-ext:: yaml
-   :whitespace:
+.. code-block:: yaml
 
    general:
        some_setting: some_value
diff --git a/docs/features/custom_controls.rst b/docs/features/custom_controls.rst
index 31235233..f9cf81fb 100644
--- a/docs/features/custom_controls.rst
+++ b/docs/features/custom_controls.rst
@@ -24,7 +24,7 @@ The following example defines a control for enabling the cooling fan with a vari
 feedback evaluation for the result of the M114 "Get Position" gcode inside a section named "Reporting" and finally
 a GCODE script including user input.
 
-.. code-block-ext:: yaml
+.. code-block:: yaml
 
    controls:
      - name: Fan
@@ -167,7 +167,7 @@ Controls
        additional input fields. ``command``/``commands`` may contain placeholders to be replaced by the values obtained
        from the user for the defined input fields:
 
-       .. code-block-ext:: yaml
+       .. code-block:: yaml
 
           name: Enable Fan
           command: M106 S%(speed)s
@@ -226,7 +226,7 @@ Examples
 Parameterized GCODE Script
 ..........................
 
-.. code-block-ext:: yaml
+.. code-block:: yaml
    :caption: Control definition in ~/.octoprint/config.yaml
    :name: code-features-custom_controls-example-gcode_script-config_yaml
 
@@ -241,7 +241,7 @@ Parameterized GCODE Script
        min: 1
        step: 1
 
-.. code-block-ext:: jinja
+.. code-block:: jinja
    :caption: ~/.octoprint/scripts/gcode/custom/dance.gco
    :name: code-features-custom_controls-example-gcode_script-dance_gco