diff --git a/lacommunaute/forum/forms.py b/lacommunaute/forum/forms.py
index 24e6ee178..268ba8810 100644
--- a/lacommunaute/forum/forms.py
+++ b/lacommunaute/forum/forms.py
@@ -5,7 +5,6 @@
 
 from lacommunaute.forum.models import Forum
 from lacommunaute.partner.models import Partner
-from lacommunaute.utils.html import wrap_iframe_in_div_tag
 
 
 class ForumForm(forms.ModelForm):
@@ -45,7 +44,6 @@ def __init__(self, *args, **kwargs):
 
     def save(self, commit=True):
         forum = super().save(commit=False)
-        forum.description = wrap_iframe_in_div_tag(self.cleaned_data.get("description"))
 
         if commit:
             forum.save()
diff --git a/lacommunaute/forum/tests/__snapshots__/tests_views.ambr b/lacommunaute/forum/tests/__snapshots__/tests_views.ambr
index 997623353..18b4e423e 100644
--- a/lacommunaute/forum/tests/__snapshots__/tests_views.ambr
+++ b/lacommunaute/forum/tests/__snapshots__/tests_views.ambr
@@ -206,7 +206,13 @@
                   
                       <div class="s-section__row row">
                           <div class="col-12">
-                              <article class="textarea_cms_md"><p>Test description</p></article>
+                              <article class="textarea_cms_md">
+                                  
+  
+      <p>Test description</p>
+  
+  
+                              </article>
                           </div>
                       </div>
                   
diff --git a/lacommunaute/forum/tests/tests_forms.py b/lacommunaute/forum/tests/tests_forms.py
index a99656af6..c71c34f4c 100644
--- a/lacommunaute/forum/tests/tests_forms.py
+++ b/lacommunaute/forum/tests/tests_forms.py
@@ -2,23 +2,6 @@
 from lacommunaute.forum.models import Forum
 
 
-def test_saved_forum_description(db):
-    form = ForumForm(
-        data={
-            "name": "test",
-            "short_description": "test",
-            "description": "Text\n<iframe src='xxx'></iframe>\ntext\n<div><iframe src='yyy'></iframe></div>\nbye",
-        }
-    )
-    assert form.is_valid()
-    form.instance.type = Forum.FORUM_POST
-    forum = form.save()
-    assert forum.description.rendered == (
-        "<p>Text</p>\n\n<div><iframe src='xxx'></iframe></div>\n\n"
-        "<p>text</p>\n\n<div><iframe src='yyy'></iframe></div>\n\n<p>bye</p>"
-    )
-
-
 def test_form_field():
     form = ForumForm()
     assert form.Meta.model == Forum
diff --git a/lacommunaute/forum_conversation/views_htmx.py b/lacommunaute/forum_conversation/views_htmx.py
index d17cfb0b6..ff228a532 100644
--- a/lacommunaute/forum_conversation/views_htmx.py
+++ b/lacommunaute/forum_conversation/views_htmx.py
@@ -19,7 +19,7 @@
 
 
 class TopicContentView(PermissionRequiredMixin, View):
-    template = "forum_conversation/partials/topic_content.html"
+    template = "partials/rendered_md.html"
     permission_required = [
         "can_read_forum",
     ]
@@ -32,6 +32,9 @@ def get_topic(self):
             )
         return self.topic
 
+    def get_content(self):
+        return self.get_topic().first_post.content
+
     def get(self, request, **kwargs):
         topic = self.get_topic()
 
@@ -40,7 +43,7 @@ def get(self, request, **kwargs):
         return render(
             request,
             self.template,
-            context={"topic": topic},
+            context={"content": self.get_content()},
         )
 
     def get_controlled_object(self):
@@ -48,7 +51,8 @@ def get_controlled_object(self):
 
 
 class TopicCertifiedPostView(TopicContentView):
-    template = "forum_conversation/partials/topic_certified_post.html"
+    def get_content(self):
+        return self.get_topic().certified_post.post.content
 
 
 class PostListView(PermissionRequiredMixin, View):
diff --git a/lacommunaute/partner/forms.py b/lacommunaute/partner/forms.py
index e3aae2f5e..6b45bc314 100644
--- a/lacommunaute/partner/forms.py
+++ b/lacommunaute/partner/forms.py
@@ -2,7 +2,6 @@
 from django.conf import settings
 
 from lacommunaute.partner.models import Partner
-from lacommunaute.utils.html import wrap_iframe_in_div_tag
 
 
 class PartnerForm(forms.ModelForm):
@@ -12,15 +11,6 @@ class PartnerForm(forms.ModelForm):
         widget=forms.FileInput(attrs={"accept": settings.SUPPORTED_IMAGE_FILE_TYPES.keys()}),
     )
 
-    def save(self, commit=True):
-        partner = super().save(commit=False)
-        partner.description = wrap_iframe_in_div_tag(self.cleaned_data.get("description"))
-
-        if commit:
-            partner.save()
-
-        return partner
-
     class Meta:
         model = Partner
         fields = ("name", "short_description", "description", "logo", "url")
diff --git a/lacommunaute/partner/tests/__snapshots__/tests_partner_detailview.ambr b/lacommunaute/partner/tests/__snapshots__/tests_partner_detailview.ambr
index 53ad13619..7b873c028 100644
--- a/lacommunaute/partner/tests/__snapshots__/tests_partner_detailview.ambr
+++ b/lacommunaute/partner/tests/__snapshots__/tests_partner_detailview.ambr
@@ -41,9 +41,15 @@
           <div class="s-section__container container">
               <div class="s-section__row row">
                   <div class="col-12">
-                      <article class="textarea_cms_md"><h3>h3 long MD description</h3>
+                      <article class="textarea_cms_md">
+                          
+  
+      <h3>h3 long MD description</h3>
+  
+  <p>lorem ipsum dolor sit amet, consectetur adipiscing elit.</p>
+  
   
-  <p>lorem ipsum dolor sit amet, consectetur adipiscing elit.</p></article>
+                      </article>
                       
                           <div class="mt-3">
                               <a class="has-external-link" href="https://www.best-partner-ever.com" rel="noopener noreferrer" target="_blank">https://www.best-partner-ever.com</a>
@@ -103,9 +109,15 @@
           <div class="s-section__container container">
               <div class="s-section__row row">
                   <div class="col-12">
-                      <article class="textarea_cms_md"><h3>h3 long MD description</h3>
+                      <article class="textarea_cms_md">
+                          
+  
+      <h3>h3 long MD description</h3>
+  
+  <p>lorem ipsum dolor sit amet, consectetur adipiscing elit.</p>
+  
   
-  <p>lorem ipsum dolor sit amet, consectetur adipiscing elit.</p></article>
+                      </article>
                       
                           <div class="mt-3">
                               <a class="has-external-link" href="https://www.best-partner-ever.com" rel="noopener noreferrer" target="_blank">https://www.best-partner-ever.com</a>
@@ -163,9 +175,15 @@
           <div class="s-section__container container">
               <div class="s-section__row row">
                   <div class="col-12">
-                      <article class="textarea_cms_md"><h3>h3 long MD description</h3>
+                      <article class="textarea_cms_md">
+                          
+  
+      <h3>h3 long MD description</h3>
+  
+  <p>lorem ipsum dolor sit amet, consectetur adipiscing elit.</p>
+  
   
-  <p>lorem ipsum dolor sit amet, consectetur adipiscing elit.</p></article>
+                      </article>
                       
                           <div class="mt-3">
                               <a class="has-external-link" href="https://www.best-partner-ever.com" rel="noopener noreferrer" target="_blank">https://www.best-partner-ever.com</a>
@@ -223,9 +241,15 @@
           <div class="s-section__container container">
               <div class="s-section__row row">
                   <div class="col-12">
-                      <article class="textarea_cms_md"><h3>h3 long MD description</h3>
+                      <article class="textarea_cms_md">
+                          
+  
+      <h3>h3 long MD description</h3>
+  
+  <p>lorem ipsum dolor sit amet, consectetur adipiscing elit.</p>
+  
   
-  <p>lorem ipsum dolor sit amet, consectetur adipiscing elit.</p></article>
+                      </article>
                       
                           <div class="mt-3">
                               <a class="has-external-link" href="https://www.best-partner-ever.com" rel="noopener noreferrer" target="_blank">https://www.best-partner-ever.com</a>
diff --git a/lacommunaute/partner/tests/tests_forms.py b/lacommunaute/partner/tests/tests_forms.py
index 21fc7ff29..bfb1e6464 100644
--- a/lacommunaute/partner/tests/tests_forms.py
+++ b/lacommunaute/partner/tests/tests_forms.py
@@ -2,22 +2,6 @@
 from lacommunaute.partner.models import Partner
 
 
-def test_saved_partner_description(db):
-    form = PartnerForm(
-        data={
-            "name": "test",
-            "short_description": "test",
-            "description": "Text\n<iframe src='xxx'></iframe>\ntext\n<div><iframe src='yyy'></iframe></div>\nbye",
-        }
-    )
-    assert form.is_valid()
-    partner = form.save()
-    assert partner.description.rendered == (
-        "<p>Text</p>\n\n<div><iframe src='xxx'></iframe></div>\n\n"
-        "<p>text</p>\n\n<div><iframe src='yyy'></iframe></div>\n\n<p>bye</p>"
-    )
-
-
 def test_form_field():
     form = PartnerForm()
     assert form.Meta.model == Partner
diff --git a/lacommunaute/partner/tests/tests_partner_createview.py b/lacommunaute/partner/tests/tests_partner_createview.py
index e7ce8a435..876d7ff9d 100644
--- a/lacommunaute/partner/tests/tests_partner_createview.py
+++ b/lacommunaute/partner/tests/tests_partner_createview.py
@@ -39,7 +39,7 @@ def test_post_partner(client, db, url, superuser):
     data = {
         "name": "Test",
         "short_description": "Short description",
-        "description": "# Titre\n<iframe src='https://www.example.com'></iframe>",
+        "description": "# Titre\ntext",
         "url": "https://www.example.com",
     }
     response = client.post(url, data)
@@ -47,4 +47,4 @@ def test_post_partner(client, db, url, superuser):
 
     partner = Partner.objects.get()
     assert response.url == reverse("partner:detail", kwargs={"pk": partner.pk, "slug": partner.slug})
-    assert partner.description.raw == "# Titre\n<div><iframe src='https://www.example.com'></iframe></div>"
+    assert partner.description.raw == "# Titre\ntext"
diff --git a/lacommunaute/templates/forum/forum_detail.html b/lacommunaute/templates/forum/forum_detail.html
index c9c20a5c8..cec82303c 100644
--- a/lacommunaute/templates/forum/forum_detail.html
+++ b/lacommunaute/templates/forum/forum_detail.html
@@ -5,7 +5,6 @@
 {% load forum_conversation_tags %}
 {% load forum_permission_tags %}
 {% load forum_tracking_tags %}
-{% load str_filters %}
 {% block title %}{{ forum.name }}{{ block.super }}{% endblock %}
 {% block meta_description %}
     {{ forum.short_description }}
@@ -34,7 +33,9 @@ <h1>{{ forum.name }}</h1>
                 {% if forum.description %}
                     <div class="s-section__row row">
                         <div class="col-12">
-                            <article class="textarea_cms_md">{{ forum.description.rendered|urlizetrunc_target_blank:30|img_fluid }}</article>
+                            <article class="textarea_cms_md">
+                                {% include 'partials/rendered_md.html' with content=forum.description only %}
+                            </article>
                         </div>
                     </div>
                 {% endif %}
diff --git a/lacommunaute/templates/forum/forum_documentation.html b/lacommunaute/templates/forum/forum_documentation.html
index 070683850..2d4e63e29 100644
--- a/lacommunaute/templates/forum/forum_documentation.html
+++ b/lacommunaute/templates/forum/forum_documentation.html
@@ -1,6 +1,5 @@
 {% extends "forum/forum_detail.html" %}
 {% load i18n %}
-{% load str_filters %}
 {% block forum_head_content %}
     <div class="s-section__row row">
         <div class="col-12 col-lg-9">
@@ -27,7 +26,9 @@
                     </div>
                 {% endif %}
                 <div class="col-12 col-sm-auto mt-3">
-                    <article class="textarea_cms_md">{{ forum.description.rendered|urlizetrunc_target_blank:30|img_fluid }}</article>
+                    <article class="textarea_cms_md">
+                        {% include 'partials/rendered_md.html' with content=forum.description only %}
+                    </article>
                 </div>
                 {% if forum.partner %}
                     <div class="col-12 col-sm-auto mt-3" id="partner_area">
diff --git a/lacommunaute/templates/forum/index.html b/lacommunaute/templates/forum/index.html
index 14256719f..079be2360 100644
--- a/lacommunaute/templates/forum/index.html
+++ b/lacommunaute/templates/forum/index.html
@@ -2,7 +2,6 @@
 {% load i18n %}
 {% load mptt_tags %}
 {% load forum_tags %}
-{% load str_filters %}
 {% block title %}
     {% trans "Index" %}{{ block.super }}
 {% endblock %}
@@ -27,7 +26,9 @@ <h3 class="h3 mb-0">
                                 </div>
                             </div>
                             <div class="card-body pt-0">
-                                {% if node.obj.description.rendered %}{{ node.obj.description.rendered|urlizetrunc_target_blank:30 }}{% endif %}
+                                {% if node.obj.description.rendered %}
+                                    {% include 'partials/rendered_md.html' with content=node.obj.description only %}
+                                {% endif %}
                                 {% if node.children %}
                                     <a data-bs-toggle="collapse" href="#collapse{{ node.obj.id }}" role="button" aria-expanded="false" aria-controls="collapse{{ node.obj.id }}" class="btn btn-link pt-0 ps-0">
                                         {% if node.obj.is_forum %}
diff --git a/lacommunaute/templates/forum_conversation/partials/post_certified.html b/lacommunaute/templates/forum_conversation/partials/post_certified.html
index b49e9fee1..ac4907b23 100644
--- a/lacommunaute/templates/forum_conversation/partials/post_certified.html
+++ b/lacommunaute/templates/forum_conversation/partials/post_certified.html
@@ -1,7 +1,6 @@
 {% load i18n %}
 {% load forum_member_tags %}
 {% load forum_permission_tags %}
-{% load str_filters %}
 {% if post %}
     <div class="card post my-3 bg-communaute-lighter border-communaute has-links-inside ms-3">
         <div class="card-body">
@@ -12,7 +11,7 @@
                         <div>{% include "forum_conversation/partials/post_certified_badge.html" %}</div>
                     </div>
                     <div class="post-content" id="showmorecertifiedpostsarea{{ topic.pk }}">
-                        {{ post.content.rendered|urlizetrunc_target_blank:30|img_fluid|truncatechars_html:200 }}
+                        {% include 'partials/rendered_md.html' with content=post.content truncatechars=1 only %}
                         {% if post.content.rendered|length > 200 %}
                             <a hx-get="{% url 'forum_conversation_extension:showmore_certified' topic.forum.slug topic.forum.pk topic.slug topic.pk %}"
                                id="showmorecertified-button{{ topic.pk }}"
diff --git a/lacommunaute/templates/forum_conversation/partials/post_feed.html b/lacommunaute/templates/forum_conversation/partials/post_feed.html
index 62e72d5f8..312f32769 100644
--- a/lacommunaute/templates/forum_conversation/partials/post_feed.html
+++ b/lacommunaute/templates/forum_conversation/partials/post_feed.html
@@ -1,7 +1,6 @@
 {% load i18n %}
 {% load forum_member_tags %}
 {% load forum_permission_tags %}
-{% load str_filters %}
 {% get_permission 'can_download_files' topic.forum request.user as user_can_download_files %}
 <div class="card post my-3 bg-light has-links-inside ms-3">
     <div class="card-body">
@@ -14,7 +13,7 @@
                     {% include "partials/upvotes.html" with obj=post kind="post" %}
                 </div>
                 <div class="post-content">
-                    {{ post.content.rendered|urlizetrunc_target_blank:30|img_fluid }}
+                    {% include 'partials/rendered_md.html' with content=post.content only %}
                     {% include "forum_conversation/forum_attachments/attachments_images.html" %}
                 </div>
                 {% include "forum_conversation/forum_attachments/attachments_detail.html" with post=post user_can_download_files=user_can_download_files %}
diff --git a/lacommunaute/templates/forum_conversation/partials/posts_list.html b/lacommunaute/templates/forum_conversation/partials/posts_list.html
index e4adb5614..26cf3aed9 100644
--- a/lacommunaute/templates/forum_conversation/partials/posts_list.html
+++ b/lacommunaute/templates/forum_conversation/partials/posts_list.html
@@ -1,7 +1,6 @@
 {% load i18n %}
 {% load forum_member_tags %}
 {% load forum_permission_tags %}
-{% load str_filters %}
 {% get_permission 'can_download_files' topic.forum request.user as user_can_download_files %}
 <div id="showmorepostsarea{{ topic.pk }}">
     {% for post in posts %}
@@ -20,7 +19,7 @@
                             </div>
                         </div>
                         <div class="post-content">
-                            {{ post.content.rendered|urlizetrunc_target_blank:30|img_fluid }}
+                            {% include 'partials/rendered_md.html' with content=post.content only %}
                             {% include "forum_conversation/forum_attachments/attachments_images.html" %}
                         </div>
                         {% include "forum_conversation/forum_attachments/attachments_detail.html" with post=post user_can_download_files=user_can_download_files %}
diff --git a/lacommunaute/templates/forum_conversation/partials/topic_certified_post.html b/lacommunaute/templates/forum_conversation/partials/topic_certified_post.html
deleted file mode 100644
index c591ef39c..000000000
--- a/lacommunaute/templates/forum_conversation/partials/topic_certified_post.html
+++ /dev/null
@@ -1,2 +0,0 @@
-{% load str_filters %}
-{{ topic.certified_post.post.content.rendered|urlizetrunc_target_blank:30|img_fluid }}
diff --git a/lacommunaute/templates/forum_conversation/partials/topic_content.html b/lacommunaute/templates/forum_conversation/partials/topic_content.html
deleted file mode 100644
index d88222fcc..000000000
--- a/lacommunaute/templates/forum_conversation/partials/topic_content.html
+++ /dev/null
@@ -1,2 +0,0 @@
-{% load str_filters %}
-{{ topic.first_post.content.rendered|urlizetrunc_target_blank:30|img_fluid }}
diff --git a/lacommunaute/templates/forum_conversation/post_preview.html b/lacommunaute/templates/forum_conversation/post_preview.html
deleted file mode 100644
index 6349cee53..000000000
--- a/lacommunaute/templates/forum_conversation/post_preview.html
+++ /dev/null
@@ -1,22 +0,0 @@
-{% load i18n %}
-{% load forum_markup_tags %}
-{% load str_filters %}
-<div class="mb-3 row preview">
-    <div class="col-12">
-        <div class="card post post-preview">
-            <div class="card-body">
-                <div class="row">
-                    <div class="col-12 post-content-wrapper">
-                        <h3 class="h4 mb-0">Votre {% trans "Preview"|lower %}</h3>
-                        <hr>
-                        <div class="post-content">
-                            {% if post_form.subject.value %}<p class="fw-bold">{{ post_form.subject.value }}</p>{% endif %}
-                            {{ post_form.content.value|safe|rendered|urlizetrunc_target_blank:30 }}
-                        </div>
-                        {% include "forum_conversation/forum_attachments/attachments_preview.html" %}
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
diff --git a/lacommunaute/templates/forum_conversation/topic_detail.html b/lacommunaute/templates/forum_conversation/topic_detail.html
index f0eab84c8..54503c5a5 100644
--- a/lacommunaute/templates/forum_conversation/topic_detail.html
+++ b/lacommunaute/templates/forum_conversation/topic_detail.html
@@ -2,7 +2,6 @@
 {% load i18n %}
 {% load forum_conversation_tags %}
 {% load forum_permission_tags %}
-{% load str_filters %}
 {% block title %}{{ topic.subject }} ({{ topic.forum.name }}){% endblock %}
 {% block meta_description %}
     {{ topic.first_post.content.raw }}
@@ -36,7 +35,7 @@ <h1>{{ topic.subject }}</h1>
                     <div class="card-body pt-0">
                         <div class="row">
                             <div class="col-12 post-content mb-3">
-                                {{ post.content.rendered|urlizetrunc_target_blank:30|img_fluid }}
+                                {% include 'partials/rendered_md.html' with content=post.content only %}
                                 {% include "forum_conversation/forum_attachments/attachments_images.html" %}
                             </div>
                             <div class="col-12 post-content-wrapper">
diff --git a/lacommunaute/templates/forum_conversation/topic_list.html b/lacommunaute/templates/forum_conversation/topic_list.html
index 1a52a9916..594b1b45b 100644
--- a/lacommunaute/templates/forum_conversation/topic_list.html
+++ b/lacommunaute/templates/forum_conversation/topic_list.html
@@ -3,7 +3,6 @@
 {% load forum_member_tags %}
 {% load forum_tracking_tags %}
 {% load forum_permission_tags %}
-{% load str_filters %}
 {% load url_add_query %}
 {% if forum %}
     {% get_permission 'can_download_files' forum request.user as user_can_download_files %}
@@ -49,7 +48,7 @@
                                 </div>
                                 <div class="col-12 post-content">
                                     <div id="showmoretopicsarea{{ topic.pk }}">
-                                        {{ topic.first_post.content.rendered|urlizetrunc_target_blank:30|img_fluid|truncatechars_html:200 }}
+                                        {% include 'partials/rendered_md.html' with content=topic.first_post.content truncatechars=1 only %}
                                         {% if topic.first_post.content.rendered|length > 200 %}
                                             <a hx-get="{% url 'forum_conversation_extension:showmore_topic' topic.forum.slug topic.forum.pk topic.slug topic.pk %}"
                                                id="showmoretopic-button{{ topic.pk }}"
diff --git a/lacommunaute/templates/forum_upvote/upvote_list.html b/lacommunaute/templates/forum_upvote/upvote_list.html
index 305958075..9c32ab661 100644
--- a/lacommunaute/templates/forum_upvote/upvote_list.html
+++ b/lacommunaute/templates/forum_upvote/upvote_list.html
@@ -1,7 +1,6 @@
 {% extends "layouts/base.html" %}
 {% load i18n %}
 {% load date_filters %}
-{% load str_filters %}
 {% block title %}
     {% trans "My UpVotes" %}{{ block.super }}
 {% endblock %}
@@ -56,7 +55,7 @@ <h1>{% trans "My UpVotes" %}</h1>
                                                         </a>
                                                         <br>
                                                         {% include "forum_conversation/partials/poster.html" with post=upvote.content_object topic=upvote.content_object.topic %}
-                                                        <div>{{ upvote.content_object.content.rendered|urlizetrunc_target_blank:30|img_fluid|truncatechars_html:200 }}</div>
+                                                        <div>{% include 'partials/rendered_md.html' with content=upvote.content_object.content truncatechars=1 only %}</div>
                                                     {% endif %}
                                                 </td>
                                             </tr>
diff --git a/lacommunaute/templates/partials/rendered_md.html b/lacommunaute/templates/partials/rendered_md.html
new file mode 100644
index 000000000..9d7d45855
--- /dev/null
+++ b/lacommunaute/templates/partials/rendered_md.html
@@ -0,0 +1,6 @@
+{% load str_filters %}
+{% if truncatechars %}
+    {{ content.rendered|urlizetrunc_target_blank:30|img_fluid|youtube_embed|truncatechars_html:200 }}
+{% else %}
+    {{ content.rendered|urlizetrunc_target_blank:30|img_fluid|youtube_embed }}
+{% endif %}
diff --git a/lacommunaute/templates/partner/detail.html b/lacommunaute/templates/partner/detail.html
index 7910893cb..0c7047c68 100644
--- a/lacommunaute/templates/partner/detail.html
+++ b/lacommunaute/templates/partner/detail.html
@@ -1,5 +1,4 @@
 {% extends "layouts/base.html" %}
-{% load str_filters %}
 {% block title %}{{ partner.name }} {{ block.super }}{% endblock %}
 {% block meta_description %}
     {{ partner.short_description }}
@@ -30,7 +29,9 @@ <h2 class="mt-3">{{ partner.short_description }}</h2>
         <div class="s-section__container container">
             <div class="s-section__row row">
                 <div class="col-12">
-                    <article class="textarea_cms_md">{{ partner.description.rendered|urlizetrunc_target_blank:30|img_fluid }}</article>
+                    <article class="textarea_cms_md">
+                        {% include 'partials/rendered_md.html' with content=partner.description only %}
+                    </article>
                     {% if partner.url %}
                         <div class="mt-3">
                             <a href="{{ partner.url }}" target="_blank" rel="noopener noreferrer" class="has-external-link">{{ partner.url }}</a>
diff --git a/lacommunaute/utils/html.py b/lacommunaute/utils/html.py
deleted file mode 100644
index 2d3644e17..000000000
--- a/lacommunaute/utils/html.py
+++ /dev/null
@@ -1,16 +0,0 @@
-import re
-
-
-def wrap_iframe_in_div_tag(text):
-    """
-    given a markdown text, wrap all iframe tags in a div tag
-    this is required for iframes to be displayed correctly
-    """
-
-    iframe_regex = r"((<div>)?(<iframe[^>]*><\/iframe>)(<\/div>)?)"
-
-    for match, starts_with, iframe, ends_with in re.findall(iframe_regex, text):
-        if not (starts_with and ends_with):
-            text = text.replace(match, f"<div>{iframe}</div>")
-
-    return text
diff --git a/lacommunaute/utils/templatetags/str_filters.py b/lacommunaute/utils/templatetags/str_filters.py
index 77b7a7f43..35027cb5f 100644
--- a/lacommunaute/utils/templatetags/str_filters.py
+++ b/lacommunaute/utils/templatetags/str_filters.py
@@ -2,6 +2,8 @@
 https://docs.djangoproject.com/en/dev/howto/custom-template-tags/
 """
 
+import re
+
 from django import template
 from django.template.defaultfilters import stringfilter
 from django.urls import reverse
@@ -57,3 +59,22 @@ def urlizetrunc_target_blank(value, limit, autoescape=True):
 @stringfilter
 def img_fluid(value):
     return mark_safe(value.replace("<img ", '<img class="img-fluid" '))
+
+
+@register.filter(is_safe=True)
+def youtube_embed(text):
+    pattern = re.compile(r"\[youtube:(\S+?)\]")
+    print(pattern.findall(text), text)
+    for match in pattern.findall(text):
+        text = text.replace(
+            f"[youtube:{match}]",
+            (
+                '<div><iframe width="560" height="315" '
+                f'src="https://www.youtube.com/embed/{match}" '
+                'frameborder="0" allow="accelerometer; autoplay; clipboard-write; '
+                'encrypted-media; gyroscope; picture-in-picture; web-share" '
+                'referrerpolicy="strict-origin-when-cross-origin" allowfullscreen> </iframe></div>'
+            ),
+        )
+
+    return text
diff --git a/lacommunaute/utils/tests/tests_utils.py b/lacommunaute/utils/tests/tests_utils.py
index d90bbeb6e..5912218e8 100644
--- a/lacommunaute/utils/tests/tests_utils.py
+++ b/lacommunaute/utils/tests/tests_utils.py
@@ -24,7 +24,6 @@
 from lacommunaute.stats.models import ForumStat
 from lacommunaute.users.factories import UserFactory
 from lacommunaute.utils.date import get_last_sunday
-from lacommunaute.utils.html import wrap_iframe_in_div_tag
 from lacommunaute.utils.math import percent
 from lacommunaute.utils.matomo import (
     collect_forum_stats_from_matomo_api,
@@ -156,6 +155,29 @@ def test_convert_seconds_into_hours(self, value, expected_result):
         template = Template("{% load date_filters %}{{ value|convert_seconds_into_hours }}")
         assert template.render(Context({"value": value})) == expected_result
 
+    @pytest.mark.parametrize(
+        "text,expected",
+        [
+            (
+                "[youtube:123456abc]",
+                (
+                    "&lt;div&gt;&lt;iframe width=&quot;560&quot; height=&quot;315&quot; src=&quot;"
+                    "https://www.youtube.com/embed/123456abc&quot; frameborder=&quot;0&quot; allow=&quot;"
+                    "accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; "
+                    "web-share&quot; referrerpolicy=&quot;strict-origin-when-cross-origin&quot; allowfullscreen&gt; "
+                    "&lt;/iframe&gt;&lt;/div&gt;"
+                ),
+            ),
+            ("[ youtube:123456abc]", "[ youtube:123456abc]"),
+            ("[youtube:123456abc ]", "[youtube:123456abc ]"),
+            ("[youtube:123456abc youtube:123456abc]", "[youtube:123456abc youtube:123456abc]"),
+        ],
+    )
+    def test_youtube_embed(self, text, expected):
+        template = Template("{% load str_filters %}{{ text|youtube_embed }}")
+        out = template.render(Context({"text": text}))
+        assert out == expected
+
 
 class UtilsTemplateTagsTestCase(TestCase):
     def test_pluralizefr(self):
@@ -717,29 +739,3 @@ class TestTheLastSunday:
     )
     def test_the_last_sunday(self, day, expected_sunday):
         assert get_last_sunday(datetime(2024, 5, day)) == expected_sunday
-
-
-class TestWrapIframeInDiv:
-    @pytest.mark.parametrize(
-        "input,output",
-        [
-            ("<iframe src='xxx'></iframe>", "<div><iframe src='xxx'></iframe></div>"),
-            (
-                "markdown text <iframe src='xxx'></iframe> markdown text",
-                "markdown text <div><iframe src='xxx'></iframe></div> markdown text",
-            ),
-            ("<div><iframe src='xxx'></iframe></div>", "<div><iframe src='xxx'></iframe></div>"),
-            ("<div><iframe src='xxx'></iframe> text", "<div><iframe src='xxx'></iframe></div> text"),
-            ("<iframe src='xxx'></iframe></div>", "<div><iframe src='xxx'></iframe></div>"),
-            (
-                "<iframe src='xxx'></iframe><iframe src='yyy'></iframe>",
-                "<div><iframe src='xxx'></iframe></div><div><iframe src='yyy'></iframe></div>",
-            ),
-            (
-                "<div><iframe src='xxx'></iframe><iframe src='yyy'></iframe></div>",
-                "<div><iframe src='xxx'></iframe></div><div><iframe src='yyy'></iframe></div>",
-            ),
-        ],
-    )
-    def test_wrap_iframe_in_div_tag(self, input, output):
-        assert wrap_iframe_in_div_tag(input) == output