diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1245c1d07..5908b10e7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 All notable changes to this project will be documented in this file. This project adheres to Semantic Versioning.
 
+### 7.6.0
+* Deprecate MySQL as message queue provider, the extension now uses RabbitMQ as the default message queue provider
+* Add command to clear the Nosto message queue
+* Move Nosto logfiles to its own files nosto-debug.log(debug), nosto-system.log(info) and nosto-exception.log(error)
+
 ### 7.5.1
 * Upgrade SDK to 7.4
 * Remove PII information from Order Export
diff --git a/Console/Command/NostoClearQueueCommand.php b/Console/Command/NostoClearQueueCommand.php
new file mode 100644
index 000000000..87febbca3
--- /dev/null
+++ b/Console/Command/NostoClearQueueCommand.php
@@ -0,0 +1,110 @@
+<?php
+
+namespace Nosto\Tagging\Console\Command;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\MessageQueue\Consumer\ConfigInterface as ConsumerConfig;
+use Magento\Framework\MessageQueue\QueueRepository;
+use RuntimeException;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Style\SymfonyStyle;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class NostoClearQueueCommand extends Command
+{
+    /**
+     * Nosto Product Sync Update label.
+     *
+     * @var string
+     */
+    public const NOSTO_UPDATE_SYNC_MESSAGE_QUEUE = 'nosto_product_sync.update';
+
+    /**
+     * Nosto Product Sync Delete label.
+     *
+     * @var string
+     */
+    public const NOSTO_DELETE_MESSAGE_QUEUE = 'nosto_product_sync.delete';
+
+    /**
+     * @var ConsumerConfig
+     */
+    private $consumerConfig;
+
+    /**
+     * @var QueueRepository
+     */
+    private $queueRepository;
+
+    private array $consumers = [
+        self::NOSTO_DELETE_MESSAGE_QUEUE,
+        self::NOSTO_UPDATE_SYNC_MESSAGE_QUEUE,
+    ];
+
+    /**
+     * NostoClearQueueCommand constructor.
+     *
+     * @param ConsumerConfig $consumerConfig
+     * @param QueueRepository $queueRepository
+     */
+    public function __construct(
+        ConsumerConfig $consumerConfig,
+        QueueRepository $queueRepository
+    ) {
+        $this->consumerConfig = $consumerConfig;
+        $this->queueRepository = $queueRepository;
+        parent::__construct();
+    }
+
+    /**
+     * Configure the command and the arguments
+     */
+    protected function configure()
+    {
+        $this->setName('nosto:clear:message-queue')
+            ->setDescription('Clear all message queues for Nosto product sync topics.');
+        parent::configure();
+    }
+
+    /**
+     * @inheritDoc
+     */
+    protected function execute(InputInterface $input, OutputInterface $output): int
+    {
+        $io = new SymfonyStyle($input, $output);
+
+        try {
+            foreach ($this->consumers as $queueName) {
+                $this->clearQueue($io, $queueName);
+            }
+            $io->success('Successfully cleared message queues.');
+        } catch (RuntimeException|LocalizedException $e) {
+            $io->error('An error occurred while clearing message queues: ' . $e->getMessage());
+            return 1;
+        }
+        return 0;
+    }
+
+    /**
+     * Clear message queues by consumer name.
+     *
+     * @param SymfonyStyle $io
+     * @param string $consumerName
+     * @return void
+     * @throws LocalizedException
+     */
+    private function clearQueue(SymfonyStyle $io, string $consumerName): void
+    {
+        $io->writeln(sprintf('Clearing messages from %s', $consumerName));
+        $io->createProgressBar();
+        $io->progressStart();
+        $consumerConfig = $this->consumerConfig->getConsumer($consumerName);
+        $queue = $this->queueRepository->get($consumerConfig->getConnection(), $consumerConfig->getQueue());
+        while ($message = $queue->dequeue()) {
+            $io->progressAdvance(1);
+            $queue->acknowledge($message);
+        }
+        $io->progressFinish();
+    }
+}
diff --git a/Logger/DebugHandler.php b/Logger/DebugHandler.php
new file mode 100644
index 000000000..64d9568b8
--- /dev/null
+++ b/Logger/DebugHandler.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright (c) 2020, Nosto Solutions Ltd
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * 3. Neither the name of the copyright holder nor the names of its contributors
+ * may be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @author Nosto Solutions Ltd <contact@nosto.com>
+ * @copyright 2020 Nosto Solutions Ltd
+ * @license http://opensource.org/licenses/BSD-3-Clause BSD 3-Clause
+ *
+ */
+
+namespace Nosto\Tagging\Logger;
+
+use Magento\Framework\Logger\Handler\Base;
+use Monolog\Logger;
+
+class DebugHandler extends Base
+{
+    protected $fileName = '/var/log/nosto-debug.log';
+    protected $loggerType = Logger::DEBUG;
+}
diff --git a/Logger/ExceptionHandler.php b/Logger/ExceptionHandler.php
new file mode 100644
index 000000000..267facc47
--- /dev/null
+++ b/Logger/ExceptionHandler.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright (c) 2020, Nosto Solutions Ltd
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * 3. Neither the name of the copyright holder nor the names of its contributors
+ * may be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @author Nosto Solutions Ltd <contact@nosto.com>
+ * @copyright 2020 Nosto Solutions Ltd
+ * @license http://opensource.org/licenses/BSD-3-Clause BSD 3-Clause
+ *
+ */
+
+namespace Nosto\Tagging\Logger;
+
+use Magento\Framework\Logger\Handler\Base;
+use Monolog\Logger;
+
+class ExceptionHandler extends Base
+{
+    protected $fileName = '/var/log/nosto-exception.log';
+    protected $loggerType = Logger::INFO;
+}
diff --git a/Logger/SystemHandler.php b/Logger/SystemHandler.php
new file mode 100644
index 000000000..2c3e961b6
--- /dev/null
+++ b/Logger/SystemHandler.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright (c) 2020, Nosto Solutions Ltd
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * 3. Neither the name of the copyright holder nor the names of its contributors
+ * may be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @author Nosto Solutions Ltd <contact@nosto.com>
+ * @copyright 2020 Nosto Solutions Ltd
+ * @license http://opensource.org/licenses/BSD-3-Clause BSD 3-Clause
+ *
+ */
+
+namespace Nosto\Tagging\Logger;
+
+use Magento\Framework\Logger\Handler\Base;
+use Monolog\Logger;
+
+class SystemHandler extends Base
+{
+    protected $fileName = '/var/log/nosto-system.log';
+    protected $loggerType = Logger::INFO;
+}
diff --git a/composer.json b/composer.json
index 1adf6dbfc..4a128c076 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
   "name": "nosto/module-nostotagging",
   "description": "Increase your conversion rate and average order value by delivering your customers personalized product recommendations throughout their shopping journey.",
   "type": "magento2-module",
-  "version": "7.5.1",
+  "version": "7.6.0",
   "require-dev": {
     "phpmd/phpmd": "^2.5",
     "sebastian/phpcpd": "*",
diff --git a/composer.lock b/composer.lock
index 3510127d3..db586637f 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "9dcdb02accf946756f26a0c83c6deb7a",
+    "content-hash": "c08b01fdc7786f36fb6b4536c44379ea",
     "packages": [
         {
             "name": "brick/math",
@@ -284,16 +284,16 @@
         },
         {
             "name": "composer/composer",
-            "version": "2.2.23",
+            "version": "2.2.24",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/composer.git",
-                "reference": "d1542e89636abf422fde328cb28d53752efb69e5"
+                "reference": "91d9d38ebc274267f952ee1fd3892dc7962075f4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/composer/zipball/d1542e89636abf422fde328cb28d53752efb69e5",
-                "reference": "d1542e89636abf422fde328cb28d53752efb69e5",
+                "url": "https://api.github.com/repos/composer/composer/zipball/91d9d38ebc274267f952ee1fd3892dc7962075f4",
+                "reference": "91d9d38ebc274267f952ee1fd3892dc7962075f4",
                 "shasum": ""
             },
             "require": {
@@ -363,7 +363,7 @@
             "support": {
                 "irc": "ircs://irc.libera.chat:6697/composer",
                 "issues": "https://github.com/composer/composer/issues",
-                "source": "https://github.com/composer/composer/tree/2.2.23"
+                "source": "https://github.com/composer/composer/tree/2.2.24"
             },
             "funding": [
                 {
@@ -379,7 +379,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-02-08T14:08:53+00:00"
+            "time": "2024-06-10T20:51:52+00:00"
         },
         {
             "name": "composer/metadata-minifier",
@@ -1128,12 +1128,12 @@
             "version": "v5.2.13",
             "source": {
                 "type": "git",
-                "url": "https://github.com/justinrainbow/json-schema.git",
+                "url": "https://github.com/jsonrainbow/json-schema.git",
                 "reference": "fbbe7e5d79f618997bc3332a6f49246036c45793"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/fbbe7e5d79f618997bc3332a6f49246036c45793",
+                "url": "https://api.github.com/repos/jsonrainbow/json-schema/zipball/fbbe7e5d79f618997bc3332a6f49246036c45793",
                 "reference": "fbbe7e5d79f618997bc3332a6f49246036c45793",
                 "shasum": ""
             },
@@ -1188,8 +1188,8 @@
                 "schema"
             ],
             "support": {
-                "issues": "https://github.com/justinrainbow/json-schema/issues",
-                "source": "https://github.com/justinrainbow/json-schema/tree/v5.2.13"
+                "issues": "https://github.com/jsonrainbow/json-schema/issues",
+                "source": "https://github.com/jsonrainbow/json-schema/tree/v5.2.13"
             },
             "time": "2023-09-26T02:20:38+00:00"
         },
@@ -4702,16 +4702,16 @@
         },
         {
             "name": "symfony/filesystem",
-            "version": "v5.4.38",
+            "version": "v5.4.40",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
-                "reference": "899330a01056077271e2f614c7b28b0379a671eb"
+                "reference": "26dd9912df6940810ea00f8f53ad48d6a3424995"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/899330a01056077271e2f614c7b28b0379a671eb",
-                "reference": "899330a01056077271e2f614c7b28b0379a671eb",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/26dd9912df6940810ea00f8f53ad48d6a3424995",
+                "reference": "26dd9912df6940810ea00f8f53ad48d6a3424995",
                 "shasum": ""
             },
             "require": {
@@ -4720,6 +4720,9 @@
                 "symfony/polyfill-mbstring": "~1.8",
                 "symfony/polyfill-php80": "^1.16"
             },
+            "require-dev": {
+                "symfony/process": "^5.4|^6.4"
+            },
             "type": "library",
             "autoload": {
                 "psr-4": {
@@ -4746,7 +4749,7 @@
             "description": "Provides basic utilities for the filesystem",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/filesystem/tree/v5.4.38"
+                "source": "https://github.com/symfony/filesystem/tree/v5.4.40"
             },
             "funding": [
                 {
@@ -4762,20 +4765,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-03-21T08:05:07+00:00"
+            "time": "2024-05-31T14:33:22+00:00"
         },
         {
             "name": "symfony/finder",
-            "version": "v5.4.35",
+            "version": "v5.4.40",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "abe6d6f77d9465fed3cd2d029b29d03b56b56435"
+                "reference": "f51cff4687547641c7d8180d74932ab40b2205ce"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/abe6d6f77d9465fed3cd2d029b29d03b56b56435",
-                "reference": "abe6d6f77d9465fed3cd2d029b29d03b56b56435",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/f51cff4687547641c7d8180d74932ab40b2205ce",
+                "reference": "f51cff4687547641c7d8180d74932ab40b2205ce",
                 "shasum": ""
             },
             "require": {
@@ -4809,7 +4812,7 @@
             "description": "Finds files and directories via an intuitive fluent interface",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/finder/tree/v5.4.35"
+                "source": "https://github.com/symfony/finder/tree/v5.4.40"
             },
             "funding": [
                 {
@@ -4825,7 +4828,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-23T13:51:25+00:00"
+            "time": "2024-05-31T14:33:22+00:00"
         },
         {
             "name": "symfony/http-client-contracts",
@@ -12392,5 +12395,5 @@
         "ext-json": "*"
     },
     "platform-dev": [],
-    "plugin-api-version": "2.1.0"
+    "plugin-api-version": "2.6.0"
 }
diff --git a/etc/di.xml b/etc/di.xml
index 3f85137fd..cccf6dccd 100644
--- a/etc/di.xml
+++ b/etc/di.xml
@@ -76,8 +76,9 @@
         <arguments>
             <argument name="name" xsi:type="string">nosto</argument>
             <argument name="handlers" xsi:type="array">
-                <item name="system" xsi:type="object">Magento\Framework\Logger\Handler\System</item>
-                <item name="debug" xsi:type="object">Magento\Framework\Logger\Handler\Debug</item>
+                <item name="system" xsi:type="object">Nosto\Tagging\Logger\SystemHandler</item>
+                <item name="debug" xsi:type="object">Nosto\Tagging\Logger\DebugHandler</item>
+                <item name="exception" xsi:type="object">Nosto\Tagging\Logger\ExceptionHandler</item>
             </argument>
         </arguments>
     </type>
@@ -98,6 +99,9 @@
                 <item name="nosto_generate_customer_reference_command" xsi:type="object">
                     Nosto\Tagging\Console\Command\NostoGenerateCustomerReferenceCommand
                 </item>
+                <item name="nosto_clear_queue_command" xsi:type="object">
+                    Nosto\Tagging\Console\Command\NostoClearQueueCommand
+                </item>
             </argument>
         </arguments>
     </type>
@@ -234,4 +238,4 @@
             <argument name="batchSize" xsi:type="number">500</argument>
         </arguments>
     </type>
-</config>
+</config>
\ No newline at end of file
diff --git a/etc/module.xml b/etc/module.xml
index 933a24fbf..d7070be90 100755
--- a/etc/module.xml
+++ b/etc/module.xml
@@ -37,5 +37,5 @@
 <!--suppress XmlUnboundNsPrefix -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Nosto_Tagging" setup_version="7.5.1"/>
+    <module name="Nosto_Tagging" setup_version="7.6.0"/>
 </config>
diff --git a/etc/queue.xml b/etc/queue.xml
index 95666bc8a..f8ad78b09 100644
--- a/etc/queue.xml
+++ b/etc/queue.xml
@@ -35,13 +35,13 @@
   -->
 <!--suppress XmlUnboundNsPrefix -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/queue.xsd">
-    <broker topic="nosto_product_sync.update" exchange="magento-db" type="db">
+    <broker topic="nosto_product_sync.update" exchange="magento-amqp" type="amqp">
         <queue name="nosto_product_sync.update"
                consumer="nosto_product_sync.update"
                consumerInstance="Magento\Framework\MessageQueue\Consumer"
                handler="Nosto\Tagging\Model\Service\Sync\Upsert\AsyncBulkConsumer::process"/>
     </broker>
-    <broker topic="nosto_product_sync.delete" exchange="magento-db" type="db">
+    <broker topic="nosto_product_sync.delete" exchange="magento-amqp" type="amqp">
         <queue name="nosto_product_sync.delete"
                consumer="nosto_product_sync.delete"
                consumerInstance="Magento\Framework\MessageQueue\Consumer"
diff --git a/etc/queue_consumer.xml b/etc/queue_consumer.xml
index d6c596e3c..ea59ccd0b 100644
--- a/etc/queue_consumer.xml
+++ b/etc/queue_consumer.xml
@@ -37,13 +37,13 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/consumer.xsd">
     <consumer name="nosto_product_sync.update"
               queue="nosto_product_sync.update"
-              connection="db"
+              connection="amqp"
               maxMessages="20"
               consumerInstance="Magento\Framework\MessageQueue\Consumer"
               handler="Nosto\Tagging\Model\Service\Sync\Upsert\AsyncBulkConsumer::processOperation"/>
     <consumer name="nosto_product_sync.delete"
               queue="nosto_product_sync.delete"
-              connection="db"
+              connection="amqp"
               maxMessages="100"
               consumerInstance="Magento\Framework\MessageQueue\Consumer"
               handler="Nosto\Tagging\Model\Service\Sync\Delete\AsyncBulkConsumer::processOperation"/>
diff --git a/etc/queue_publisher.xml b/etc/queue_publisher.xml
index 0d044bc71..1194a0372 100644
--- a/etc/queue_publisher.xml
+++ b/etc/queue_publisher.xml
@@ -36,9 +36,9 @@
 <!--suppress XmlUnboundNsPrefix -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/publisher.xsd">
     <publisher topic="nosto_product_sync.update">
-        <connection name="db" exchange="magento-db"/>
+        <connection name="amqp" exchange="magento-amqp"/>
     </publisher>
     <publisher topic="nosto_product_sync.delete">
-        <connection name="db" exchange="magento-db"/>
+        <connection name="amqp" exchange="magento-amqp"/>
     </publisher>
 </config>
diff --git a/etc/queue_topology.xml b/etc/queue_topology.xml
index 8f70a8190..2b929aa7b 100644
--- a/etc/queue_topology.xml
+++ b/etc/queue_topology.xml
@@ -35,7 +35,7 @@
   -->
 <!--suppress XmlUnboundNsPrefix -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/topology.xsd">
-    <exchange name="magento-db" type="topic" connection="db">
+    <exchange name="magento-amqp" type="topic" connection="amqp">
         <binding id="updateBindingUpsert" topic="nosto_product_sync.update" destinationType="queue" destination="nosto_product_sync.update"/>
         <binding id="updateBindingDelete" topic="nosto_product_sync.delete" destinationType="queue" destination="nosto_product_sync.delete"/>
     </exchange>