diff --git a/attachment_queue/README.rst b/attachment_queue/README.rst
index 1ba66a5d60c..287cbce2168 100644
--- a/attachment_queue/README.rst
+++ b/attachment_queue/README.rst
@@ -1,7 +1,3 @@
-.. image:: https://odoo-community.org/readme-banner-image
-   :target: https://odoo-community.org/get-involved?utm_source=readme
-   :alt: Odoo Community Association
-
 ================
 Attachment Queue
 ================
@@ -17,7 +13,7 @@ Attachment Queue
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
     :target: https://odoo-community.org/page/development-status
     :alt: Beta
-.. |badge2| image:: https://img.shields.io/badge/license-AGPL--3-blue.png
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
     :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
     :alt: License: AGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fserver--tools-lightgray.png?logo=github
diff --git a/attachment_queue/__manifest__.py b/attachment_queue/__manifest__.py
index dc0e6feb260..be6af97c8c6 100644
--- a/attachment_queue/__manifest__.py
+++ b/attachment_queue/__manifest__.py
@@ -16,6 +16,7 @@
         "security/ir.model.access.csv",
         "data/mail_template.xml",
         "data/queue_job_channel.xml",
+        "data/queue_job_function.xml",
         "wizards/attachement_queue_reschedule.xml",
     ],
     "demo": ["demo/attachment_queue.xml"],
diff --git a/attachment_queue/data/queue_job_function.xml b/attachment_queue/data/queue_job_function.xml
new file mode 100644
index 00000000000..d56ad727995
--- /dev/null
+++ b/attachment_queue/data/queue_job_function.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo noupdate="1">
+    <record id="job_function_run_attachment_queue" model="queue.job.function">
+        <field name="model_id" ref="attachment_queue.model_attachment_queue" />
+        <field name="method">run_as_job</field>
+        <field name="channel_id" ref="attachment_queue.attachment_queue_job_channel" />
+        <field name="allow_commit" eval="True" />
+    </record>
+</odoo>
diff --git a/attachment_queue/models/attachment_queue.py b/attachment_queue/models/attachment_queue.py
index 0b56936cfc7..e8fbc3bc0e1 100644
--- a/attachment_queue/models/attachment_queue.py
+++ b/attachment_queue/models/attachment_queue.py
@@ -54,7 +54,7 @@ class AttachmentQueue(models.Model):
     def _job_attrs(self):
         # Override this method to have file type specific job attributes
         self.ensure_one()
-        return {"channel": "root.attachment_queue"}
+        return {}
 
     def _schedule_jobs(self):
         for el in self:
diff --git a/attachment_queue/static/description/index.html b/attachment_queue/static/description/index.html
index d4154a6aeb1..8943bf704bd 100644
--- a/attachment_queue/static/description/index.html
+++ b/attachment_queue/static/description/index.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta name="generator" content="Docutils: https://docutils.sourceforge.io/" />
-<title>README.rst</title>
+<title>Attachment Queue</title>
 <style type="text/css">
 
 /*
@@ -360,21 +360,16 @@
 </style>
 </head>
 <body>
-<div class="document">
+<div class="document" id="attachment-queue">
+<h1 class="title">Attachment Queue</h1>
 
-
-<a class="reference external image-reference" href="https://odoo-community.org/get-involved?utm_source=readme">
-<img alt="Odoo Community Association" src="https://odoo-community.org/readme-banner-image" />
-</a>
-<div class="section" id="attachment-queue">
-<h1>Attachment Queue</h1>
 <!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! source digest: sha256:fafc8b3a64f141a0b20e65bb4f01c86fc26516c598bff7bfe20b3bf5c97ed8da
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/license-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/server-tools/tree/18.0/attachment_queue"><img alt="OCA/server-tools" src="https://img.shields.io/badge/github-OCA%2Fserver--tools-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/server-tools-18-0/server-tools-18-0-attachment_queue"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/server-tools&amp;target_branch=18.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/server-tools/tree/18.0/attachment_queue"><img alt="OCA/server-tools" src="https://img.shields.io/badge/github-OCA%2Fserver--tools-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/server-tools-18-0/server-tools-18-0-attachment_queue"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/server-tools&amp;target_branch=18.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This module adds async processing capabilities to attachments by
 implementing a new model attachment.queue that wraps attachments and
 stores additional information so that it can be processed in an
@@ -395,7 +390,7 @@ <h1>Attachment Queue</h1>
 </ul>
 </div>
 <div class="section" id="usage">
-<h2><a class="toc-backref" href="#toc-entry-1">Usage</a></h2>
+<h1><a class="toc-backref" href="#toc-entry-1">Usage</a></h1>
 <p>Go the menu Settings &gt; Technical &gt; Database Structure &gt; Attachments
 Queue</p>
 <p>You can create / see standard attachments with additional fields</p>
@@ -409,7 +404,7 @@ <h2><a class="toc-backref" href="#toc-entry-1">Usage</a></h2>
 <p><img alt="form view" src="https://raw.githubusercontent.com/OCA/server-tools/18.0/attachment_queue/static/description/form.png" /></p>
 </div>
 <div class="section" id="bug-tracker">
-<h2><a class="toc-backref" href="#toc-entry-2">Bug Tracker</a></h2>
+<h1><a class="toc-backref" href="#toc-entry-2">Bug Tracker</a></h1>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/server-tools/issues">GitHub Issues</a>.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us to smash it by providing a detailed and welcomed
@@ -417,15 +412,15 @@ <h2><a class="toc-backref" href="#toc-entry-2">Bug Tracker</a></h2>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
-<h2><a class="toc-backref" href="#toc-entry-3">Credits</a></h2>
+<h1><a class="toc-backref" href="#toc-entry-3">Credits</a></h1>
 <div class="section" id="authors">
-<h3><a class="toc-backref" href="#toc-entry-4">Authors</a></h3>
+<h2><a class="toc-backref" href="#toc-entry-4">Authors</a></h2>
 <ul class="simple">
 <li>Akretion</li>
 </ul>
 </div>
 <div class="section" id="contributors">
-<h3><a class="toc-backref" href="#toc-entry-5">Contributors</a></h3>
+<h2><a class="toc-backref" href="#toc-entry-5">Contributors</a></h2>
 <ul class="simple">
 <li>Valentin CHEMIERE &lt;<a class="reference external" href="mailto:valentin.chemiere&#64;akretion.com">valentin.chemiere&#64;akretion.com</a>&gt;</li>
 <li>Florian da Costa &lt;<a class="reference external" href="mailto:florian.dacosta&#64;akretion.com">florian.dacosta&#64;akretion.com</a>&gt;</li>
@@ -435,7 +430,7 @@ <h3><a class="toc-backref" href="#toc-entry-5">Contributors</a></h3>
 </ul>
 </div>
 <div class="section" id="maintainers">
-<h3><a class="toc-backref" href="#toc-entry-6">Maintainers</a></h3>
+<h2><a class="toc-backref" href="#toc-entry-6">Maintainers</a></h2>
 <p>This module is maintained by the OCA.</p>
 <a class="reference external image-reference" href="https://odoo-community.org">
 <img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
@@ -450,6 +445,5 @@ <h3><a class="toc-backref" href="#toc-entry-6">Maintainers</a></h3>
 </div>
 </div>
 </div>
-</div>
 </body>
 </html>
diff --git a/attachment_queue/tests/test_attachment_queue.py b/attachment_queue/tests/test_attachment_queue.py
index acad15a62b4..57a014cb2f2 100644
--- a/attachment_queue/tests/test_attachment_queue.py
+++ b/attachment_queue/tests/test_attachment_queue.py
@@ -40,6 +40,12 @@ def setUp(self):
 
         self.loader.update_registry((AttachmentQueue,))
         self.aq_model = self.env["attachment.queue"]
+        # allow_commit option is not really compatible with tests because we create
+        # the attachment queue in the test and if the job opens a new cursor, the
+        # created attachment does not exist yet.
+        self.env.ref("attachment_queue.job_function_run_attachment_queue").write(
+            {"allow_commit": False}
+        )
 
     def tearDown(self):
         super().tearDown()
