diff --git a/pages/queues/faq.mdx b/pages/queues/faq.mdx
index 24d22d1636..b14882983d 100644
--- a/pages/queues/faq.mdx
+++ b/pages/queues/faq.mdx
@@ -16,11 +16,11 @@ productIcon: SqsProductIcon
## What is Scaleway Queues?
-Scaleway Queues is a product for creating managed message queues based on AWS's SQS protocol. It allows you to implement your message queues without the hassle of managing the infrastructure, scaling or updates. Message queues are ideal for facilitating asynchronous job processing and communication between microservices.
+Scaleway Queues is a product for creating managed message queues, using an in-house implementation of AWS SQS protocol. Queues allows you to implement your message queues without the hassle of managing the infrastructure, scaling or updates. Message queues are ideal for facilitating asynchronous job processing and communication between microservices.
-## What is SQS?
+## What is the relationship between Scaleway Queues and AWS SQS?
-**S**imple **Q**ueue **S**ervice, or SQS, is AWS's distributed message [queuing](#queuing) protocol, that supports programmatic sending of messages via web service applications.
+**S**imple **Q**ueue **S**ervice, or SQS, is AWS's distributed message [queuing](#queuing) service, that supports programmatic sending of messages via web service applications. Scaleway has developed its own service based on AWS SQS protocol. Scaleway Queues does not have any dependencies on the AWS SQS infrastructure or offering, we use our own stack which is fully self-hosted and developed in-house.
## Is the Scaleway Queues gateway compatible with my application, framework or tool?
diff --git a/pages/queues/reference-content/queues-overview.mdx b/pages/queues/reference-content/queues-overview.mdx
index 50b7c05a6a..bb2204055f 100644
--- a/pages/queues/reference-content/queues-overview.mdx
+++ b/pages/queues/reference-content/queues-overview.mdx
@@ -16,16 +16,20 @@ dates:
## What is Scaleway Queues?
-Scaleway Queues is a managed message queuing service that enables decoupling of components within distributed applications. It allows applications to send, queue, store and receive messages between each other asynchronously. Scaleway Queues leverages the SQS protocol.
+Scaleway Queues is a product for creating managed message queues, using an in-house implementation of AWS SQS protocol. Queues allows you to implement your message queues without the hassle of managing the infrastructure, scaling or updates. Message queues are ideal for facilitating asynchronous job processing and communication between microservices.
## What is SQS?
-SQS is a managed messaging service developed by AWS and leveraged by Scaleway Queues.
+**S**imple **Q**ueue **S**ervice, or SQS, is AWS's distributed message [queuing](#queuing) service, that supports programmatic sending of messages via web service applications. It became generally available in 2006, and is a highly scalable queuing service that facilitates the decoupling of software systems.
-SQS (Simple Queue Service) became generally available in 2006. It is a highly scalable [queuing](/queues/concepts#queuing) service that facilitates the decoupling of software systems. Scaleway Queues provides a gateway that enables you to connect your existing applications without having to significantly modify your code baseline.
+## What is the relationship between Scaleway Queues and AWS SQS?
+
+Scaleway has developed its own service based on AWS SQS protocol. Queues does not have any dependencies on the AWS SQS infrastructure or offering, we use our own stack which is fully self-hosted and developed in-house.
+
+Scaleway Queues provides a gateway that enables you to connect any existing SQS-connected applications without having to significantly modify your code baseline.
- Some SQS features are not yet supported. Refer to our [dedicated documentation page](/queues/reference-content/sqs-support/) for more information.
+ Some SQS features are not yet supported. Refer to our [dedicated documentation page](/queues/reference-content/queues-support/) for more information.
## Credentials
@@ -51,7 +55,7 @@ All further actions such as sending messages can be done using the AWS CLI or AW
The following resources may be helpful:
- [How to create a serverless scraping architecture, with Scaleway Queues, Serverless Functions and Managed Databases](/tutorials/create-serverless-scraping/)
- - [Official SQS Documentation](https://docs.aws.amazon.com/sqs/index.html)
+ - [Official AWS SQS Documentation](https://docs.aws.amazon.com/sqs/index.html)
- Further information on supported API features:
- [SQS](/queues/reference-content/queues-support/)
- [Official AWS CLI Documentation](https://aws.amazon.com/cli/)
diff --git a/pages/topics-and-events/faq.mdx b/pages/topics-and-events/faq.mdx
index d4af5d0fce..07ab4874d9 100644
--- a/pages/topics-and-events/faq.mdx
+++ b/pages/topics-and-events/faq.mdx
@@ -12,20 +12,25 @@ productIcon: SnsProductIcon
## What is Topics and Events?
-Scaleway Topics and Events is a product for creating managed messaging topics based on the AWS SNS protocol. Previously, it was part of the Messaging and Queuing product.
+Scaleway Topics and Events is a product for creating managed messaging topics, using an in-house implementation of AWS SNS protocol. Previously, it was part of the Messaging and Queuing product.
-## What is SNS?
+## What is the relationship between Scaleway Topics and Events, and AWS SNS?
-**S**imple **N**otification **S**ervice, or SNS, is a [publish/subscribe](/topics-and-events/concepts/#publishsubscribe) notification service for the mass delivery of messages. SNS acts as a single message bus that can be sent to a variety of devices and platforms through a single code interface. It is also possible to adapt message formats to the particular needs of each platform.
+**S**imple **N**otification **S**ervice, or SNS, is AWS's [publish/subscribe](/topics-and-events/concepts/#publishsubscribe) notification service for the mass delivery of messages. SNS acts as a single message bus that can be sent to a variety of devices and platforms through a single code interface. It is also possible to adapt message formats to the particular needs of each platform.
-## Does Scaleway Topics and Events support all SNS features?
+Scaleway has developed its own service based on AWS SNS protocol. Scaleway Topics and Events does not have any dependencies on the AWS SNS infrastructure or offering, we use our own stack which is fully self-hosted and developed in-house.
+
+## Which subscriber types are supported by Scaleway Topics and Events?
The following subscriber types are supported:
+
- HTTP/S clients
- Serverless Functions and Containers
- Scaleway Queues
-For more details on supported and unsupported Topics and Events features, see our [dedicated page](/topics-and-events/reference-content/topics-and-events-support/).
+## Does Topics and Events support all AWS SNS features?
+
+For full details on supported and unsupported AWS SNS features, see our [dedicated documentation page](/topics-and-events/reference-content/topics-and-events-support/).
## How is Topics and Events billed?
diff --git a/pages/topics-and-events/reference-content/topics-and-events-overview.mdx b/pages/topics-and-events/reference-content/topics-and-events-overview.mdx
index 4b2a92f65f..621eff0f56 100644
--- a/pages/topics-and-events/reference-content/topics-and-events-overview.mdx
+++ b/pages/topics-and-events/reference-content/topics-and-events-overview.mdx
@@ -16,13 +16,17 @@ dates:
## What is Scaleway Topics and Events?
-Scaleway Topics and Events is a managed messaging service that facilitates the sending of notifications or messages to a large number of subscribers, including email addresses, webhooks, and more. Topics and Events leverages the SNS protocol.
+Scaleway Topics and Events is a managed messaging service that facilitates the sending of notifications or messages to a large number of subscribers, including email addresses, webhooks, and more. Topics and Events uses an in-house implementation of AWS SNS protocol
## What is SNS?
-SNS is a managed messaging service developed by AWS and leveraged by Scaleway Topics and Events.
+**S**imple **N**otification **S**ervice, or SNS, is a managed messaging service developed by AWS. It was released in 2010, and enables users to interconnect their applications and systems using a [publish/subscribe](/topics-and-events/concepts#publishsubscribe) pattern. Many publishers can send messages to [topics](/topics-and-events/concepts#topic), while consumers, e.g. applications, can subscribe to topics to receive all (or a subset) of messages sent to this topic.
-SNS (Simple Notification Service) was released in 2010. It enables users to interconnect their applications and systems using a [publish/subscribe](/topics-and-events/concepts#publishsubscribe) pattern. Many publishers can send messages to [topics](/topics-and-events/concepts#topic), while consumers, e.g. applications, can subscribe to topics to receive all (or a subset) of messages sent to this topic. Scaleway Topics and Events makes it easy to migrate your SNS-connected applications by providing a dedicated protocol gateway.
+## What is the relationship between Scaleway Topics and Events, and AWS SNS?
+
+Scaleway has developed its own service based on AWS SNS protocol. Scaleway Topics and Events does not have any dependencies on the AWS SNS infrastructure or offering, we use our own stack which is fully self-hosted and developed in-house.
+
+Scaleway Topics and Events makes it easy to migrate your existing SNS-connected applications by providing a dedicated protocol gateway.
Some SNS features are not yet available with Scaleway Topics and Events. Supported subscribers are currently limited to: