diff --git a/CHANGELOG.md b/CHANGELOG.md
index 03af3e797..33b29ac95 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,18 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [3.36.0](https://github.com/sonata-project/SonataMediaBundle/compare/3.35.1...3.36.0) - 2021-11-04
+### Changed
+- [[#2194](https://github.com/sonata-project/SonataMediaBundle/pull/2194)] Final annotation to methods that will be final on 4.x ([@jordisala1991](https://github.com/jordisala1991))
+
+### Deprecated
+- [[#2187](https://github.com/sonata-project/SonataMediaBundle/pull/2187)] PantherPortal CDN ([@jordisala1991](https://github.com/jordisala1991))
+- [[#2186](https://github.com/sonata-project/SonataMediaBundle/pull/2186)] Using `master` and `slave` for filesystem and cdn configuration, use `primary` and `secondary` instead ([@jordisala1991](https://github.com/jordisala1991))
+
+### Removed
+- [[#2197](https://github.com/sonata-project/SonataMediaBundle/pull/2197)] Conflict against "nelmio/api-doc-bundle" >= 4.0 ([@phansys](https://github.com/phansys))
+- [[#2197](https://github.com/sonata-project/SonataMediaBundle/pull/2197)] The ReST API endpoints and documentation if "nelmio/api-doc-bundle" >= 4.0 is installed ([@phansys](https://github.com/phansys))
+
 ## [3.35.1](https://github.com/sonata-project/SonataMediaBundle/compare/3.35.0...3.35.1) - 2021-10-18
 ### Fixed
 - [[#2175](https://github.com/sonata-project/SonataMediaBundle/pull/2175)] Fixed calling `media_thumbnail` instead of `sonata_thumbnail` ([@jordisala1991](https://github.com/jordisala1991))
diff --git a/src/Admin/BaseMediaAdmin.php b/src/Admin/BaseMediaAdmin.php
index 6de31012f..6461f9a06 100644
--- a/src/Admin/BaseMediaAdmin.php
+++ b/src/Admin/BaseMediaAdmin.php
@@ -139,7 +139,7 @@ public function getPool()
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function getObjectMetadata($object)
     {
diff --git a/src/CDN/PantherPortal.php b/src/CDN/PantherPortal.php
index bf5378975..29f6d7a6c 100644
--- a/src/CDN/PantherPortal.php
+++ b/src/CDN/PantherPortal.php
@@ -33,7 +33,7 @@
 /**
  * NEXT_MAJOR: Remove this class.
  *
- * @deprecated since sonata-project/media-bundle 3.x, to be removed in 4.0.
+ * @deprecated since sonata-project/media-bundle 3.36.0, to be removed in 4.0.
  */
 class PantherPortal implements CDNInterface
 {
diff --git a/src/Listener/BaseMediaEventSubscriber.php b/src/Listener/BaseMediaEventSubscriber.php
index c0508073e..21989460e 100644
--- a/src/Listener/BaseMediaEventSubscriber.php
+++ b/src/Listener/BaseMediaEventSubscriber.php
@@ -41,7 +41,7 @@ public function getPool()
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function postUpdate(EventArgs $args)
     {
@@ -55,7 +55,7 @@ public function postUpdate(EventArgs $args)
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function postRemove(EventArgs $args)
     {
@@ -69,7 +69,7 @@ public function postRemove(EventArgs $args)
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function postPersist(EventArgs $args)
     {
@@ -83,7 +83,7 @@ public function postPersist(EventArgs $args)
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function preUpdate(EventArgs $args)
     {
@@ -102,7 +102,7 @@ public function preUpdate(EventArgs $args)
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function preRemove(EventArgs $args)
     {
@@ -116,7 +116,7 @@ public function preRemove(EventArgs $args)
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function prePersist(EventArgs $args)
     {
@@ -140,7 +140,7 @@ abstract protected function recomputeSingleEntityChangeSet(EventArgs $args);
     abstract protected function getMedia(EventArgs $args);
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      *
      * @return MediaProviderInterface
      */
diff --git a/src/Model/Gallery.php b/src/Model/Gallery.php
index 2eb60f5c2..9b76b3921 100644
--- a/src/Model/Gallery.php
+++ b/src/Model/Gallery.php
@@ -63,7 +63,7 @@ public function __toString()
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function setName($name)
     {
@@ -71,7 +71,7 @@ public function setName($name)
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function getName()
     {
@@ -79,7 +79,7 @@ public function getName()
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function setEnabled($enabled)
     {
@@ -87,7 +87,7 @@ public function setEnabled($enabled)
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function getEnabled()
     {
@@ -95,7 +95,7 @@ public function getEnabled()
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function setUpdatedAt(?\DateTime $updatedAt = null)
     {
@@ -103,7 +103,7 @@ public function setUpdatedAt(?\DateTime $updatedAt = null)
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function getUpdatedAt()
     {
@@ -111,7 +111,7 @@ public function getUpdatedAt()
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function setCreatedAt(?\DateTime $createdAt = null)
     {
@@ -119,7 +119,7 @@ public function setCreatedAt(?\DateTime $createdAt = null)
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function getCreatedAt()
     {
@@ -127,7 +127,7 @@ public function getCreatedAt()
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function setDefaultFormat($defaultFormat)
     {
@@ -135,7 +135,7 @@ public function setDefaultFormat($defaultFormat)
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function getDefaultFormat()
     {
@@ -185,7 +185,7 @@ public function addGalleryHasMedias(GalleryHasMediaInterface $galleryHasMedia)
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function setContext($context)
     {
@@ -193,7 +193,7 @@ public function setContext($context)
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function getContext()
     {
diff --git a/src/Model/Media.php b/src/Model/Media.php
index 00a339135..a20dd17f5 100644
--- a/src/Model/Media.php
+++ b/src/Model/Media.php
@@ -201,7 +201,7 @@ public static function getStatusList()
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function setBinaryContent($binaryContent)
     {
@@ -211,7 +211,7 @@ public function setBinaryContent($binaryContent)
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function resetBinaryContent()
     {
@@ -219,7 +219,7 @@ public function resetBinaryContent()
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function getBinaryContent()
     {
@@ -227,7 +227,7 @@ public function getBinaryContent()
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function getMetadataValue($name, $default = null)
     {
@@ -237,7 +237,7 @@ public function getMetadataValue($name, $default = null)
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function setMetadataValue($name, $value)
     {
@@ -247,7 +247,7 @@ public function setMetadataValue($name, $value)
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function unsetMetadataValue($name)
     {
@@ -257,7 +257,7 @@ public function unsetMetadataValue($name)
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function setName($name)
     {
@@ -265,7 +265,7 @@ public function setName($name)
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function getName()
     {
@@ -273,7 +273,7 @@ public function getName()
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function setDescription($description)
     {
@@ -281,7 +281,7 @@ public function setDescription($description)
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function getDescription()
     {
@@ -289,7 +289,7 @@ public function getDescription()
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function setEnabled($enabled)
     {
@@ -297,7 +297,7 @@ public function setEnabled($enabled)
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function getEnabled()
     {
@@ -305,7 +305,7 @@ public function getEnabled()
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function setProviderName($providerName)
     {
@@ -313,7 +313,7 @@ public function setProviderName($providerName)
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function getProviderName()
     {
@@ -321,7 +321,7 @@ public function getProviderName()
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function setProviderStatus($providerStatus)
     {
@@ -329,7 +329,7 @@ public function setProviderStatus($providerStatus)
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function getProviderStatus()
     {
@@ -337,7 +337,7 @@ public function getProviderStatus()
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function setProviderReference($providerReference)
     {
@@ -345,7 +345,7 @@ public function setProviderReference($providerReference)
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function getProviderReference()
     {
@@ -353,7 +353,7 @@ public function getProviderReference()
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function setProviderMetadata(array $providerMetadata = [])
     {
@@ -361,7 +361,7 @@ public function setProviderMetadata(array $providerMetadata = [])
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function getProviderMetadata()
     {
@@ -369,7 +369,7 @@ public function getProviderMetadata()
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function setWidth($width)
     {
@@ -377,7 +377,7 @@ public function setWidth($width)
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function getWidth()
     {
@@ -385,7 +385,7 @@ public function getWidth()
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function setHeight($height)
     {
@@ -393,7 +393,7 @@ public function setHeight($height)
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function getHeight()
     {
@@ -401,7 +401,7 @@ public function getHeight()
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function setLength($length)
     {
@@ -409,7 +409,7 @@ public function setLength($length)
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function getLength()
     {
@@ -417,7 +417,7 @@ public function getLength()
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function setCopyright($copyright)
     {
@@ -425,7 +425,7 @@ public function setCopyright($copyright)
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function getCopyright()
     {
@@ -433,7 +433,7 @@ public function getCopyright()
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function setAuthorName($authorName)
     {
@@ -441,7 +441,7 @@ public function setAuthorName($authorName)
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function getAuthorName()
     {
@@ -449,7 +449,7 @@ public function getAuthorName()
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function setContext($context)
     {
@@ -457,7 +457,7 @@ public function setContext($context)
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function getContext()
     {
@@ -465,7 +465,7 @@ public function getContext()
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function setCdnIsFlushable($cdnIsFlushable)
     {
@@ -473,7 +473,7 @@ public function setCdnIsFlushable($cdnIsFlushable)
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function getCdnIsFlushable()
     {
@@ -481,7 +481,7 @@ public function getCdnIsFlushable()
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function setCdnFlushIdentifier($cdnFlushIdentifier)
     {
@@ -489,7 +489,7 @@ public function setCdnFlushIdentifier($cdnFlushIdentifier)
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function getCdnFlushIdentifier()
     {
@@ -497,7 +497,7 @@ public function getCdnFlushIdentifier()
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function setCdnFlushAt(?\DateTime $cdnFlushAt = null)
     {
@@ -505,7 +505,7 @@ public function setCdnFlushAt(?\DateTime $cdnFlushAt = null)
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function getCdnFlushAt()
     {
@@ -513,7 +513,7 @@ public function getCdnFlushAt()
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function setUpdatedAt(?\DateTime $updatedAt = null)
     {
@@ -521,7 +521,7 @@ public function setUpdatedAt(?\DateTime $updatedAt = null)
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function getUpdatedAt()
     {
@@ -529,7 +529,7 @@ public function getUpdatedAt()
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function setCreatedAt(?\DateTime $createdAt = null)
     {
@@ -537,7 +537,7 @@ public function setCreatedAt(?\DateTime $createdAt = null)
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function getCreatedAt()
     {
@@ -545,7 +545,7 @@ public function getCreatedAt()
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function setContentType($contentType)
     {
@@ -553,7 +553,7 @@ public function setContentType($contentType)
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function getContentType()
     {
@@ -561,7 +561,7 @@ public function getContentType()
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function getExtension()
     {
@@ -575,7 +575,7 @@ public function getExtension()
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function setSize($size)
     {
@@ -583,7 +583,7 @@ public function setSize($size)
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function getSize()
     {
@@ -591,7 +591,7 @@ public function getSize()
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function setCdnStatus($cdnStatus)
     {
@@ -599,7 +599,7 @@ public function setCdnStatus($cdnStatus)
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function getCdnStatus()
     {
@@ -607,7 +607,7 @@ public function getCdnStatus()
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function getBox()
     {
@@ -625,7 +625,7 @@ public function getGalleryHasMedias()
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function getPreviousProviderReference()
     {
@@ -656,7 +656,7 @@ public function isStatusErroneous($context)
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      *
      * @return CategoryInterface
      */
diff --git a/src/Provider/BaseProvider.php b/src/Provider/BaseProvider.php
index cef667a41..5e60ee404 100644
--- a/src/Provider/BaseProvider.php
+++ b/src/Provider/BaseProvider.php
@@ -91,7 +91,7 @@ final public function transform(MediaInterface $media): void
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function flushCdn(MediaInterface $media)
     {
@@ -136,7 +136,7 @@ public function flushCdn(MediaInterface $media)
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function addFormat($name, $format)
     {
@@ -144,7 +144,7 @@ public function addFormat($name, $format)
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function getFormat($name)
     {
@@ -152,7 +152,7 @@ public function getFormat($name)
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function requireThumbnails()
     {
@@ -160,7 +160,7 @@ public function requireThumbnails()
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function generateThumbnails(MediaInterface $media)
     {
@@ -168,7 +168,7 @@ public function generateThumbnails(MediaInterface $media)
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function removeThumbnails(MediaInterface $media, $formats = null)
     {
@@ -176,7 +176,7 @@ public function removeThumbnails(MediaInterface $media, $formats = null)
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function getFormatName(MediaInterface $media, $format)
     {
@@ -228,7 +228,7 @@ public function postRemove(MediaInterface $media)
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function generatePath(MediaInterface $media)
     {
@@ -236,7 +236,7 @@ public function generatePath(MediaInterface $media)
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function getFormats()
     {
@@ -244,7 +244,7 @@ public function getFormats()
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function setName($name)
     {
@@ -252,7 +252,7 @@ public function setName($name)
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function getName()
     {
@@ -260,7 +260,7 @@ public function getName()
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function setTemplates(array $templates)
     {
@@ -268,7 +268,7 @@ public function setTemplates(array $templates)
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function getTemplates()
     {
@@ -276,7 +276,7 @@ public function getTemplates()
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function getTemplate($name)
     {
@@ -284,7 +284,7 @@ public function getTemplate($name)
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function getResizer()
     {
@@ -292,7 +292,7 @@ public function getResizer()
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function getFilesystem()
     {
@@ -300,7 +300,7 @@ public function getFilesystem()
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function getCdn()
     {
@@ -308,7 +308,7 @@ public function getCdn()
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function getCdnPath($relativePath, $isFlushable)
     {
@@ -316,7 +316,7 @@ public function getCdnPath($relativePath, $isFlushable)
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function setResizer(ResizerInterface $resizer)
     {
diff --git a/src/Provider/BaseVideoProvider.php b/src/Provider/BaseVideoProvider.php
index 6f5f119c3..acc71c84f 100644
--- a/src/Provider/BaseVideoProvider.php
+++ b/src/Provider/BaseVideoProvider.php
@@ -101,7 +101,7 @@ public function getProviderMetadata()
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function getReferenceImage(MediaInterface $media)
     {
@@ -109,7 +109,7 @@ public function getReferenceImage(MediaInterface $media)
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function getReferenceFile(MediaInterface $media)
     {
@@ -131,7 +131,7 @@ public function getReferenceFile(MediaInterface $media)
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function generatePublicUrl(MediaInterface $media, $format)
     {
@@ -144,7 +144,7 @@ public function generatePublicUrl(MediaInterface $media, $format)
     }
 
     /**
-     * @final since sonata-project/media-bundle 3.x
+     * @final since sonata-project/media-bundle 3.36.0
      */
     public function generatePrivateUrl(MediaInterface $media, $format)
     {