diff --git a/clearml/automation/controller.py b/clearml/automation/controller.py
index b487e0e9..5d3d16cd 100644
--- a/clearml/automation/controller.py
+++ b/clearml/automation/controller.py
@@ -3632,7 +3632,8 @@ class PipelineDecorator(PipelineController):
         :param args_map: Map arguments to their specific configuration section. Arguments not included in this map
             will default to `Args` section. For example, for the following code:
 
-            .. code-block:: python
+            .. code-block:: py
+
                 @PipelineDecorator.pipeline(args_map={'sectionA':['paramA'], 'sectionB:['paramB','paramC']
                 def executing_pipeline(paramA, paramB, paramC, paramD):
                     pass
@@ -3965,7 +3966,7 @@ class PipelineDecorator(PipelineController):
         Add support for multiple pipeline function calls,
         enabling execute multiple instances of the same pipeline from a single script.
 
-        .. code-block:: python
+        .. code-block:: py
 
             @PipelineDecorator.pipeline(
                 multi_instance_support=True, name="custom pipeline logic", project="examples", version="1.0")
diff --git a/clearml/task.py b/clearml/task.py
index 53190229..a615fcc1 100644
--- a/clearml/task.py
+++ b/clearml/task.py
@@ -416,6 +416,7 @@ class Task(_Task):
                }
 
             .. code-block:: py
+
                 auto_connect_frameworks={'tensorboard': {'report_hparams': False}}
 
         :param bool auto_resource_monitoring: Automatically create machine resource monitoring plots
diff --git a/clearml/utilities/requests_toolbelt/multipart/encoder.py b/clearml/utilities/requests_toolbelt/multipart/encoder.py
index 2d539617..5aa6dab5 100644
--- a/clearml/utilities/requests_toolbelt/multipart/encoder.py
+++ b/clearml/utilities/requests_toolbelt/multipart/encoder.py
@@ -30,7 +30,7 @@ class MultipartEncoder(object):
 
     The basic usage is:
 
-    .. code-block:: python
+    .. code-block:: py
 
         import requests
         from requests_toolbelt import MultipartEncoder
@@ -43,7 +43,7 @@ class MultipartEncoder(object):
     If you do not need to take advantage of streaming the post body, you can
     also do:
 
-    .. code-block:: python
+    .. code-block:: py
 
         r = requests.post('https://httpbin.org/post',
                           data=encoder.to_string(),
@@ -52,7 +52,7 @@ class MultipartEncoder(object):
     If you want the encoder to use a specific order, you can use an
     OrderedDict or more simply, a list of tuples:
 
-    .. code-block:: python
+    .. code-block:: py
 
         encoder = MultipartEncoder([('field', 'value'),
                                     ('other_field', 'other_value')])
@@ -62,7 +62,7 @@ class MultipartEncoder(object):
     You can also provide tuples as part values as you would provide them to
     requests' ``files`` parameter.
 
-    .. code-block:: python
+    .. code-block:: py
 
         encoder = MultipartEncoder({
             'field': ('file_name', b'{"a": "b"}', 'application/json',
@@ -333,7 +333,7 @@ class MultipartEncoderMonitor(object):
     To use this monitor, you construct your :class:`MultipartEncoder` as you
     normally would.
 
-    .. code-block:: python
+    .. code-block:: py
 
         from requests_toolbelt import (MultipartEncoder,
                                        MultipartEncoderMonitor)
@@ -352,7 +352,7 @@ class MultipartEncoderMonitor(object):
     Alternatively, if your use case is very simple, you can use the following
     pattern.
 
-    .. code-block:: python
+    .. code-block:: py
 
         from requests_toolbelt import MultipartEncoderMonitor
         import requests
@@ -585,7 +585,8 @@ class FileFromURLWrapper(object):
     You can use the :class:`FileFromURLWrapper` without a session or with
     a session as demonstated by the examples below:
 
-    .. code-block:: python
+    .. code-block:: py
+
         # no session
 
         import requests
@@ -602,7 +603,8 @@ class FileFromURLWrapper(object):
             headers={'Content-Type': streaming_encoder.content_type}
         )
 
-    .. code-block:: python
+    .. code-block:: py
+
         # using a session
 
         import requests