diff --git a/src/content/docs/aws/capabilities/state-management/cloud-pods.mdx b/src/content/docs/aws/capabilities/state-management/cloud-pods.mdx
index ff928163..db0443f5 100644
--- a/src/content/docs/aws/capabilities/state-management/cloud-pods.mdx
+++ b/src/content/docs/aws/capabilities/state-management/cloud-pods.mdx
@@ -7,6 +7,7 @@ sidebar:
 ---
 
 import { Tabs, TabItem, FileTree } from '@astrojs/starlight/components';
+import { Badge } from '@astrojs/starlight/components';
 
 ## Introduction
 
@@ -522,7 +523,7 @@ This needs to be done with the `localstack pod remote add ...` command.
 This commands creates a configuration file for the remote in the [LocalStack volume directory](/aws/capabilities/config/filesystem/#localstack-volume-directory).
 :::
 
-## End-to-End Encryption (Enterprise)
+## End-to-End Encryption <Badge text="Enterprise" size="large" />
 
 Cloud Pods artifacts are stored in S3 buckets when using the LocalStack platform as the storage remote.
 By default, Amazon S3 encrypts all objects before saving them on disks, while the opposite operation happens at download time.
diff --git a/src/content/docs/aws/integrations/app-frameworks/spring-cloud-function.mdx b/src/content/docs/aws/integrations/app-frameworks/spring-cloud-function.mdx
index 08803029..71a27128 100644
--- a/src/content/docs/aws/integrations/app-frameworks/spring-cloud-function.mdx
+++ b/src/content/docs/aws/integrations/app-frameworks/spring-cloud-function.mdx
@@ -6,6 +6,7 @@ sidebar:
     order: 4
 ---
 import { Tabs, TabItem } from '@astrojs/starlight/components';
+import { Badge } from '@astrojs/starlight/components';
 
 ## Overview
 
@@ -39,7 +40,7 @@ any other JVM setup.
   - [Add Request/Response utilities](#add-requestresponse-utilities)
   - [Creating a sample Model / DTO](#creating-a-sample-model--dto)
   - [Creating Rest API endpoints](#creating-rest-api-endpoints)
-    - [Cold Start and Warmup (Pro)](#cold-start-and-warmup-pro)
+    - [Cold Start and Warmup](#cold-start-and-warmup)
   - [Creating other lambda Handlers](#creating-other-lambda-handlers)
 - [Setting up Deployment](#setting-up-deployment)
 - [Testing, Debugging and Hot Reloading](#testing-debugging-and-hot-reloading)
@@ -467,7 +468,7 @@ class SampleApi(private val objectMapper: ObjectMapper) {
 Note how we used Spring's dependency injection to inject `ObjectMapper` Bean we
 configured earlier.
 
-#### Cold Start and Warmup (Pro)
+#### Cold Start and Warmup <Badge text="Pro" size="large" />
 
 We know Java's cold start is always a pain.
 To minimize this pain, we will try to define a pre-warming endpoint within the Rest API.
diff --git a/src/content/docs/aws/services/apigateway.mdx b/src/content/docs/aws/services/apigateway.mdx
index b81d6b81..d61a345f 100644
--- a/src/content/docs/aws/services/apigateway.mdx
+++ b/src/content/docs/aws/services/apigateway.mdx
@@ -6,6 +6,7 @@ persistence: supported
 ---
 
 import FeatureCoverage from "../../../../components/feature-coverage/FeatureCoverage";
+import { Badge } from '@astrojs/starlight/components';
 
 ## Introduction
 
@@ -327,7 +328,7 @@ http://localhost:4566/restapis/<apiId>/<stageName>/_user_request_/<path>
 ```
 :::
 
-### WebSocket APIs (Pro)
+### WebSocket APIs <Badge text="Pro" size="large" />
 
 WebSocket APIs provide real-time communication channels between a client and a server.
 To use WebSockets in LocalStack, you can define a WebSocket route in your Serverless configuration:
@@ -423,7 +424,7 @@ Setting the API Gateway ID via `_custom_id_` works only on the creation of the r
 Ensure that you set the `_custom_id_` tag on creation of the resource.
 :::
 
-## Custom Domain Names with API Gateway (Pro)
+## Custom Domain Names with API Gateway <Badge text="Pro" size="large" />
 
 You can use custom domain names with API Gateway [REST APIs](https://docs.aws.amazon.com/apigateway/latest/developerguide/how-to-custom-domains.html) and [HTTP APIs](https://docs.aws.amazon.com/apigateway/latest/developerguide/http-api-custom-domain-names.html).
 
diff --git a/src/content/docs/aws/services/cloudwatchlogs.mdx b/src/content/docs/aws/services/cloudwatchlogs.mdx
index 65d9755f..918d294e 100644
--- a/src/content/docs/aws/services/cloudwatchlogs.mdx
+++ b/src/content/docs/aws/services/cloudwatchlogs.mdx
@@ -6,6 +6,7 @@ persistence: supported
 ---
 
 import FeatureCoverage from "../../../../components/feature-coverage/FeatureCoverage";
+import { Badge } from '@astrojs/starlight/components';
 
 ## Introduction
 
@@ -61,7 +62,7 @@ record=$(awslocal kinesis get-records --limit 10 --shard-iterator $shard_iterato
 echo $record | base64 -d | zcat
 ```
 
-## Filter Pattern (Pro only)
+## Filter Pattern <Badge text="Pro" size="large" />
 
 [Filter patterns](https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/FilterAndPatternSyntax.html) can be used to select certain logs only.
 
diff --git a/src/content/docs/aws/services/ecs.mdx b/src/content/docs/aws/services/ecs.mdx
index 9ec1e7ee..346d5dc4 100644
--- a/src/content/docs/aws/services/ecs.mdx
+++ b/src/content/docs/aws/services/ecs.mdx
@@ -5,6 +5,7 @@ description: Get started with Elastic Container Service (ECS) on LocalStack
 persistence: supported
 ---
 
+import { Badge } from '@astrojs/starlight/components';
 import FeatureCoverage from "../../../../components/feature-coverage/FeatureCoverage";
 
 ## Introduction
@@ -342,12 +343,7 @@ services:
 
 Alternatively, you can download the image from the private registry before using it or employ an [Initialization Hook](/aws/capabilities/config/initialization-hooks) to install the Docker client and use these credentials to download the image.
 
-## Firelens for ECS Tasks
-
-:::note
-Firelens emulation is currently available as part of the **LocalStack Enterprise** plan.
-If you'd like to try it out, please [contact us](https://www.localstack.cloud/demo) to request access.
-:::
+## Firelens for ECS Tasks <Badge text="Enterprise" size="large" />
 
 LocalStack's ECS emulation supports custom log routing via FireLens.
 FireLens allows the ECS service to manage the configuration of the logging driver of application containers, and to create the proper configuration for the `fluentbit`/`fluentd` logging layer.
diff --git a/src/content/docs/aws/services/lambda.mdx b/src/content/docs/aws/services/lambda.mdx
index b2760b91..59eb6be1 100644
--- a/src/content/docs/aws/services/lambda.mdx
+++ b/src/content/docs/aws/services/lambda.mdx
@@ -6,7 +6,7 @@ persistence: supported with limitations
 ---
 
 import FeatureCoverage from "../../../../components/feature-coverage/FeatureCoverage";
-
+import { Badge } from '@astrojs/starlight/components';
 import { Tabs, TabItem } from '@astrojs/starlight/components';
 
 ## Introduction
@@ -431,7 +431,7 @@ import { Table, TableHeader, TableBody, TableHead, TableRow, TableCell } from '@
 
 Create a [GitHub issue](https://github.com/localstack/localstack/issues/new/choose) or reach out to [LocalStack support](/aws/getting-started/help-support) if you experience any challenges.
 
-## Lambda Layers (Pro)
+## Lambda Layers <Badge text="Pro" size="large" />
 
 [Lambda layers](https://docs.aws.amazon.com/lambda/latest/dg/configuration-layers.html) let you include additional code and dependencies in your Lambda functions.
 With a valid LocalStack license, you can deploy Lambda Layers locally to streamline your development and testing process.