diff --git a/src/components/feature-coverage/FeatureCoverage.tsx b/src/components/feature-coverage/FeatureCoverage.tsx
index e90199da..f746aa4c 100644
--- a/src/components/feature-coverage/FeatureCoverage.tsx
+++ b/src/components/feature-coverage/FeatureCoverage.tsx
@@ -51,13 +51,6 @@ const columns: ColumnDef<any>[] = [
     enableSorting: true,
     enableResizing: false,
   },
-  {
-    id: 'image',
-    accessorFn: (row) => row[Object.keys(row)[0]].availability,
-    header: () => 'Image',
-    enableSorting: false,
-    enableResizing: false,
-  },
   {
     id: 'k8s_support',
     accessorFn: (row) => row[Object.keys(row)[0]].k8s_test_suite,
@@ -66,8 +59,9 @@ const columns: ColumnDef<any>[] = [
     enableSorting: false,
     enableResizing: false,
     meta: {
-      tooltip: 'Indicates whether this operation has passed our internal integration test suite running against a LocalStack pod deployed on a Kubernetes cluster.'
-    }
+      tooltip:
+        'Indicates whether this operation has passed our internal integration test suite running against a LocalStack pod deployed on a Kubernetes cluster.',
+    },
   },
 ];
 
@@ -78,7 +72,7 @@ export default function PersistenceCoverage({ service }: { service: string }) {
     { id: 'operation', desc: false },
   ]);
   const [columnFilters, setColumnFilters] = React.useState<ColumnFiltersState>(
-    []
+    [],
   );
 
   React.useEffect(() => {
@@ -94,8 +88,8 @@ export default function PersistenceCoverage({ service }: { service: string }) {
   const table = useReactTable({
     data: coverage,
     columns,
-    state: { 
-      sorting, 
+    state: {
+      sorting,
       columnFilters,
     },
     onSortingChange: setSorting,
@@ -122,7 +116,7 @@ export default function PersistenceCoverage({ service }: { service: string }) {
           }
           className="border rounded px-2 py-1 w-full max-w-xs"
           style={{
-            color:  '#707385',
+            color: '#707385',
             fontFamily: 'AeonikFono',
             fontSize: '14px',
             fontStyle: 'normal',
@@ -133,9 +127,9 @@ export default function PersistenceCoverage({ service }: { service: string }) {
         />
       </div>
       <div className="p-2 block max-w-full overflow-x-scroll overflow-y-hidden">
-        <Table 
-          className="w-full" 
-          style={{ 
+        <Table
+          className="w-full"
+          style={{
             borderCollapse: 'collapse',
             tableLayout: 'fixed',
             width: '100%',
@@ -146,22 +140,20 @@ export default function PersistenceCoverage({ service }: { service: string }) {
               <TableRow key={headerGroup.id}>
                 {headerGroup.headers.map((header, index) => {
                   const canSort = header.column.getCanSort();
-                  
+
                   const getColumnWidth = (columnId: string) => {
                     switch (columnId) {
                       case 'operation':
                         return '90%';
                       case 'implemented':
                         return '15%';
-                      case 'image':
-                        return '15%';
                       case 'k8s_support':
                         return '15%';
                       default:
                         return '15%';
                     }
                   };
-                  
+
                   return (
                     <TableHead
                       key={header.id}
@@ -173,7 +165,8 @@ export default function PersistenceCoverage({ service }: { service: string }) {
                       className={canSort ? 'cursor-pointer select-none' : ''}
                       style={{
                         width: getColumnWidth(header.id),
-                        textAlign: header.id === 'operation' ? 'left' : 'center',
+                        textAlign:
+                          header.id === 'operation' ? 'left' : 'center',
                         border: '1px solid #999CAD',
                         background: '#AFB2C2',
                         color: 'var(--sl-color-gray-1)',
@@ -188,29 +181,29 @@ export default function PersistenceCoverage({ service }: { service: string }) {
                     >
                       {flexRender(
                         header.column.columnDef.header,
-                        header.getContext()
+                        header.getContext(),
                       )}
                       {header.column.columnDef.meta?.tooltip && (
-                          <span
-                            title={header.column.columnDef.meta.tooltip}
-                            style={{
-                                cursor: 'help',
-                                display: 'inline-flex',
-                            }}
-                          >
-                            <CircleHelp
-                              size={20}
-                              className="text-gray-500 dark:text-gray-200 hover:text-gray-300"
-                            />
-                          </span>
+                        <span
+                          title={header.column.columnDef.meta.tooltip}
+                          style={{
+                            cursor: 'help',
+                            display: 'inline-flex',
+                          }}
+                        >
+                          <CircleHelp
+                            size={20}
+                            className="text-gray-500 dark:text-gray-200 hover:text-gray-300"
+                          />
+                        </span>
                       )}
                       {canSort && (
                         <span>
                           {header.column.getIsSorted() === 'asc'
                             ? ' ▲'
                             : header.column.getIsSorted() === 'desc'
-                            ? ' ▼'
-                            : ''}
+                              ? ' ▼'
+                              : ''}
                         </span>
                       )}
                     </TableHead>
@@ -219,15 +212,17 @@ export default function PersistenceCoverage({ service }: { service: string }) {
               </TableRow>
             ))}
           </TableHeader>
-          <TableBody  style={{
-                        color: 'var(--sl-color-gray-1)',
-                        fontFamily: 'AeonikFono',
-                        fontSize: '14px',
-                        fontStyle: 'normal',
-                        fontWeight: '400',
-                        lineHeight: '16px',
-                        letterSpacing: '-0.15px',
-                      }}>
+          <TableBody
+            style={{
+              color: 'var(--sl-color-gray-1)',
+              fontFamily: 'AeonikFono',
+              fontSize: '14px',
+              fontStyle: 'normal',
+              fontWeight: '400',
+              lineHeight: '16px',
+              letterSpacing: '-0.15px',
+            }}
+          >
             {table.getRowModel().rows.map((row) => (
               <TableRow key={row.id}>
                 {row.getVisibleCells().map((cell) => {
@@ -235,17 +230,19 @@ export default function PersistenceCoverage({ service }: { service: string }) {
                     <TableCell
                       key={cell.id}
                       style={{
-                        textAlign: cell.column.id === 'operation' ? 'left' : 'center',
+                        textAlign:
+                          cell.column.id === 'operation' ? 'left' : 'center',
                         border: '1px solid #999CAD',
                         padding: '12px 8px',
                         overflow: 'hidden',
                         textOverflow: 'ellipsis',
-                        whiteSpace: cell.column.id === 'operation' ? 'normal' : 'nowrap',
+                        whiteSpace:
+                          cell.column.id === 'operation' ? 'normal' : 'nowrap',
                       }}
                     >
                       {flexRender(
                         cell.column.columnDef.cell,
-                        cell.getContext()
+                        cell.getContext(),
                       )}
                     </TableCell>
                   );
@@ -259,7 +256,7 @@ export default function PersistenceCoverage({ service }: { service: string }) {
         <button
           className="px-3 py-1 border rounded disabled:opacity-50"
           style={{
-            color:  'var(--sl-color-gray-1)',
+            color: 'var(--sl-color-gray-1)',
             fontFamily: 'AeonikFono',
             fontSize: '14px',
             fontStyle: 'normal',
@@ -279,7 +276,7 @@ export default function PersistenceCoverage({ service }: { service: string }) {
         <button
           className="px-3 py-1 border rounded disabled:opacity-50"
           style={{
-            color:  'var(--sl-color-gray-1)',
+            color: 'var(--sl-color-gray-1)',
             fontFamily: 'AeonikFono',
             fontSize: '14px',
             fontStyle: 'normal',
diff --git a/src/content/docs/aws/capabilities/chaos-engineering/chaos-api.md b/src/content/docs/aws/capabilities/chaos-engineering/chaos-api.md
index b37e0ca4..06b470e5 100644
--- a/src/content/docs/aws/capabilities/chaos-engineering/chaos-api.md
+++ b/src/content/docs/aws/capabilities/chaos-engineering/chaos-api.md
@@ -33,7 +33,8 @@ If you'd like to try it out, please [contact us](https://www.localstack.cloud/de
 
 The prerequisites for this guide are:
 
-- LocalStack Pro with [LocalStack CLI](/aws/getting-started/installation/) & [LocalStack Auth Token](/aws/getting-started/auth-token/)
+- LocalStack for AWS and [LocalStack CLI](/aws/getting-started/installation/) 
+- [LocalStack Auth Token](/aws/getting-started/auth-token/)
 - [Docker](https://docs.docker.com/get-docker/) and [Docker Compose](https://docs.docker.com/compose/install/)
 - [Python](https://www.python.org/downloads/)
 
diff --git a/src/content/docs/aws/capabilities/cloud-sandbox/ephemeral-instances.md b/src/content/docs/aws/capabilities/cloud-sandbox/ephemeral-instances.md
index 60d92477..6f78205f 100644
--- a/src/content/docs/aws/capabilities/cloud-sandbox/ephemeral-instances.md
+++ b/src/content/docs/aws/capabilities/cloud-sandbox/ephemeral-instances.md
@@ -192,4 +192,4 @@ Currently, for every 1 credit, you can run an Ephemeral Instance for 1 minute.
 You can view the available minutes under the **Lifetime in minutes** slider when creating an Ephemeral Instance.
 You can also see the credit consumption in the **Credit Consumption** section of the Ephemeral Instance page.
 
-![Credit Consumption](/images/aws/credit-consumption.png)
\ No newline at end of file
+![Credit Consumption](/images/aws/credit-consumption.png)
diff --git a/src/content/docs/aws/capabilities/config/configuration.md b/src/content/docs/aws/capabilities/config/configuration.md
index a92990ca..1e144ce8 100644
--- a/src/content/docs/aws/capabilities/config/configuration.md
+++ b/src/content/docs/aws/capabilities/config/configuration.md
@@ -28,7 +28,6 @@ Options that affect the core LocalStack system.
 | - | - | - |
 | `DEBUG` | `0` (default) \|`1`| Flag to increase log level and print more verbose logs (useful for troubleshooting issues)|
 | `IMAGE_NAME`| `localstack/localstack` (default), `localstack/localstack:0.11.0` | Specific name and tag of LocalStack Docker image to use.|
-| `GATEWAY_LISTEN`| `0.0.0.0:4566` (default in Docker mode) `127.0.0.1:4566` (default in host mode) | Configures the bind addresses of LocalStack. It has the form `<ip address>:<port>(,<ip address>:<port>)*`. LocalStack Pro adds port `443`. |
 | `LOCALSTACK_HOST`| `localhost.localstack.cloud:4566` (default) | This is interpolated into URLs and addresses that are returned by LocalStack. It has the form `<hostname>:<port>`. |
 | `USE_SSL` | `0` (default) | Whether to return URLs using HTTP (`0`) or HTTPS (`1`). Changed with 3.0.0. In earlier versions this was toggling SSL support on or off. |
 | `PERSISTENCE` | `0` (default) | Enable persistence. See [Persistence Mechanism](/aws/capabilities/state-management/persistence) and [Filesystem Layout](/aws/capabilities/config/filesystem). |
@@ -182,7 +181,7 @@ This section covers configuration options that are specific to certain AWS servi
 | - | - | - |
 | `EC2_DOCKER_FLAGS` | `--privileged` | Additional flags passed to Docker when launching containerized instances. Same restrictions as `LAMBDA_DOCKER_FLAGS`. |
 | `EC2_DOCKER_INIT` | `0`\|`1` (default) | Start container instances with docker-init system, learn more [here](https://docs.docker.com/reference/cli/docker/container/run/#init). Disable this if you want to use a custom init system. |
-| `EC2_DOWNLOAD_DEFAULT_IMAGES` | `0`\|`1` (default) | At startup, LocalStack Pro downloads latest Ubuntu images from Docker Hub for use as AMIs. This can be disabled for security reasons. |
+| `EC2_DOWNLOAD_DEFAULT_IMAGES` | `0`\|`1` (default) | At startup, LocalStack for AWS downloads latest Ubuntu images from Docker Hub for use as AMIs. This can be disabled for security reasons. |
 | `EC2_EBS_MAX_VOLUME_SIZE` | `1000` (default) | Maximum size (in MiBs) of user-specified EBS block devices mounted into EC2 container instances. |
 | `EC2_HYPERVISOR_URI` | `qemu:///system` (default) | [Libvirt connection URI](https://libvirt.org/uri.html#remote-uris) that indicates the hypervisor host. Only QEMU drivers are supported at this time. |
 | `EC2_LIBVIRT_NETWORK` | `default` (default) | Name of the Libvirt network to use for all instances when using the Libvirt VM manager. |
@@ -190,7 +189,7 @@ This section covers configuration options that are specific to certain AWS servi
 | `EC2_MOUNT_BLOCK_DEVICES` | `1`\|`0` (default) | Whether to create and mount user-specified EBS block devices into EC2 container instances. |
 | `EC2_REFERENCE_DOMAIN` | `my-template-vm` | Name of a shut-off Libvirt domain whose configuration will be cloned for all new VMs created by LocalStack. If unset or the domain is not found/not shut-off, LocalStack uses a generic configuration. |
 | `EC2_REMOVE_CONTAINERS` | `0`\|`1` (default) | Controls whether created Docker containers are removed at instance termination or LocalStack shuts down. Disable this if there is a need to examine the container filesystem for debugging. |
-| `EC2_VM_MANAGER` | `docker`(default)\|`libvirt`\|`mock` | Emulation method to use in LocalStack Pro. This option is not available in LocalStack community. |
+| `EC2_VM_MANAGER` | `docker`(default)\|`libvirt`\|`mock` | Emulation method to use in LocalStack for AWS. |
 
 ### EKS
 
@@ -461,13 +460,13 @@ To learn more about these configuration options, see [DNS Server](/aws/tooling/d
 | - | - | - |
 | `DISABLE_TRANSPARENT_ENDPOINT_INJECTION` | `0` (default in Pro) \| `1` | Whether to disable DNS resolution of AWS hostnames to the LocalStack container. Pro feature. (see [Transparent Endpoint Injection](/aws/capabilities/networking/transparent-endpoint-injection))
 
-## LocalStack Pro
+## LocalStack for AWS
 
 | Variable             | Example Values | Description |
 |----------------------|----------------|-------------|
 | `ACTIVATE_PRO`       | `0` \| `1`&nbsp;(default)    | Whether Pro should be activated or not. This is set to true by default if using the `localstack/localstack-pro` container image. If set to `1`, LocalStack will fail to start if the license key activation did not work. If set to `0`, an attempt is made to start LocalStack without Pro features. |
-| `LOCALSTACK_AUTH_TOKEN` |             | [Auth token](/aws/getting-started/auth-token) to activate LocalStack Pro. |
-| `LOCALSTACK_API_KEY` |                | **Deprecated since 3.0.0** API key to activate LocalStack Pro.<br/> **Use the `LOCALSTACK_AUTH_TOKEN` instead (except for [CI environments](/aws/integrations/continuous-integration/)).** |
+| `LOCALSTACK_AUTH_TOKEN` |             | [Auth token](/aws/getting-started/auth-token) to activate LocalStack for AWS. |
+| `LOCALSTACK_API_KEY` |                | **Deprecated since 3.0.0** API key to activate LocalStack for AWS.<br/> **Use the `LOCALSTACK_AUTH_TOKEN` instead (except for [CI environments](/aws/integrations/continuous-integration/)).** |
 | `LOG_LICENSE_ISSUES` | `0` \| `1`&nbsp;(default)    | Whether to log issues with the license activation to the console. |
 
 ## Legacy
@@ -484,7 +483,7 @@ These configurations have already been removed and **won't have any effect** on
 | `PROVIDER_OVERRIDE_STEPFUNCTIONS` | 4.0.0 | `v2` (default) \| `legacy` | The new LocalStack-native StepFunctions provider (v2) is active by default since LocalStack 3.0. |
 | `STEPFUNCTIONS_LAMBDA_ENDPOINT` | 4.0.0 | `default` | This is only supported for the `legacy` provider. URL to use as the Lambda service endpoint in Step Functions. By default this is the LocalStack Lambda endpoint. Use default to select the original AWS Lambda endpoint. |
 | `LOCAL_PORT_STEPFUNCTIONS` | 4.0.0 | `8083` (default) | This is only supported for the legacy provider. It defines the local port to which Step Functions traffic is redirected. By default, LocalStack routes Step Functions traffic to its internal runtime. Use this variable only if you need to redirect traffic to a different local Step Functions runtime. |
-| `S3_DIR` | 4.0.0 | `/path/to/root` | This was only supported for the `legacy_v2` provider. Configure a global parent directory that contains all buckets as sub-directories (`S3_DIR=/path/to/root`) or an individual directory that will get mounted as special bucket names (`S3_DIR=/path/to/root/bucket1:bucket1`). Only available for Localstack Pro.
+| `S3_DIR` | 4.0.0 | `/path/to/root` | This was only supported for the `legacy_v2` provider. Configure a global parent directory that contains all buckets as sub-directories (`S3_DIR=/path/to/root`) or an individual directory that will get mounted as special bucket names (`S3_DIR=/path/to/root/bucket1:bucket1`). Only available for LocalStack for AWS.
 | `<SERVICE>_BACKEND` | 3.0.0 | `http://localhost:7577` |  Custom endpoint URL to use for a specific service, where `<SERVICE>` is the uppercase service name. |
 | `<SERVICE>_PORT_EXTERNAL` | 3.0.0 | `4567` | Port number to expose a specific service externally . `SQS_PORT_EXTERNAL`, e.g. , is used when returning queue URLs from the SQS service to the client. |
 | `ACTIVATE_NEW_POD_CLIENT` | 3.0.0 | `0`\|`1` (default) |  Whether to use the new Cloud Pods client leveraging LocalStack container's APIs. |
@@ -535,8 +534,6 @@ These configurations have already been removed and **won't have any effect** on
 | `SYNCHRONOUS_SNS_EVENTS` | 2.0.0 | `1`  \| `0` (default) | Whether or not to handle SNS Lambda event sources as synchronous invocations. |
 | `TMPDIR`| 2.0.0 | `/tmp` (default) |  Temporary folder on the host running the CLI and inside the LocalStack container .|
 | `USE_LIGHT_IMAGE` | 2.0.0 | `1` (default) | Whether to use the light-weight Docker image. Overwritten by `IMAGE_NAME`.|
-| `LEGACY_PERSISTENCE` | 1.0.0 | `true` (default) | Whether to enable legacy persistence mechanism based on API calls record & replay. Only relevant for Community image, not relevant for advanced persistence mechanism in Pro. |
-| `PERSISTENCE_SINGLE_FILE` | 1.0.0 | `true` (default)| Specify if persistence files should be combined (only relevant for legacy persistence in Community image, not relevant for advanced persistence in Pro version). |
 | `PORT_WEB_UI` | 0.12.8 | `8080` (default) | Port for the legacy Web UI. Replaced by our [Web Application](https://app.localstack.cloud) |
 
 ## Profiles
diff --git a/src/content/docs/aws/capabilities/config/docker-images.md b/src/content/docs/aws/capabilities/config/docker-images.md
index b91e6660..adc4bd32 100644
--- a/src/content/docs/aws/capabilities/config/docker-images.md
+++ b/src/content/docs/aws/capabilities/config/docker-images.md
@@ -7,43 +7,24 @@ template: doc
 LocalStack functions as a local “mini-cloud” operating system that runs inside a Docker container.
 LocalStack has multiple components, which include process management, file system abstraction, event processing, schedulers, and more.
 Running inside a Docker container, LocalStack exposes external network ports for integrations, SDKs, or CLI interfaces to connect to LocalStack APIs.
-The LocalStack & LocalStack Pro Docker images have been downloaded over 130+ million times and provide a multi-arch build compatible with AMD/x86 and ARM-based CPU architectures.
+The LocalStack & LocalStack for AWS Docker images have been downloaded over 130+ million times and provide a multi-arch build compatible with AMD/x86 and ARM-based CPU architectures.
 This section will cover the different Docker images available for LocalStack and how to use them.
 
-## LocalStack Community image
+## LocalStack for AWS image
 
-The LocalStack Community image (`localstack/localstack`) contains the community and open-source version of our [core cloud emulator](https://github.com/localstack/localstack).
-To use the LocalStack Community image, you can pull the image from Docker Hub:
+LocalStack for AWS contains various advanced extensions to the LocalStack base platform.
+With LocalStack for AWS image, you can access all the emulated AWS cloud services running entirely on your local machine.
+To use the LocalStack for AWS image, you can pull the image from Docker Hub:
 
 ```bash
 docker pull localstack/localstack:latest
 ```
 
-To use the LocalStack Community image, you don't need to sign-up for an account on [LocalStack Web Application](https://app.localstack.cloud).
-The Community image is free to use and does not require a license to run.
-The Community image can be used to run [local AWS services](/aws/services/) with [integrations](/aws/integrations/) on your local machine or in your [continuous integration pipelines](/aws/integrations/continuous-integration/).
+To use the LocalStack for AWS image, you must configure an environment variable named `LOCALSTACK_AUTH_TOKEN` to contain your Auth Token.
+The LocalStack for AWS image will display a warning if you do not set an Auth Token (or if the license is invalid/expired) and will not activate the Pro features.
+LocalStack for AWS gives you access to the complete set of LocalStack features, including the [LocalStack Web Application](https://app.localstack.cloud) and [dedicated customer support](/aws/getting-started/help-support/#enterprise-support).
 
-The Community image also covers a limited set of [LocalStack Tools](/aws/tooling/) to make your life as a cloud developer easier.
-You can use [LocalStack Desktop](/aws/capabilities/web-app/localstack-desktop/) or [LocalStack Docker Extension](/aws/tooling/localstack-docker-extension) to use LocalStack with a graphical user interface.
-
-You can use the Community image to start your LocalStack container using various [installation methods](/aws/getting-started/installation/).
-While configuring to run LocalStack with Docker or Docker Compose, run the `localstack/localstack` image with the appropriate tag you have pulled (if not `latest`).
-
-## LocalStack Pro image
-
-LocalStack Pro contains various advanced extensions to the LocalStack base platform.
-With LocalStack Pro image, you can access all the emulated AWS cloud services running entirely on your local machine.
-To use the LocalStack Pro image, you can pull the image from Docker Hub:
-
-```bash
-docker pull localstack/localstack-pro:latest
-```
-
-To use the LocalStack Pro image, you must configure an environment variable named `LOCALSTACK_AUTH_TOKEN` to contain your Auth Token.
-The LocalStack Pro image will display a warning if you do not set an Auth Token (or if the license is invalid/expired) and will not activate the Pro features.
-LocalStack Pro gives you access to the complete set of LocalStack features, including the [LocalStack Web Application](https://app.localstack.cloud) and [dedicated customer support](/aws/getting-started/help-support/#enterprise-support).
-
-You can use the Pro image to start your LocalStack container using various [installation methods](/aws/getting-started/installation/).
+You can use the LocalStack for AWS image to start your LocalStack container using various [installation methods](/aws/getting-started/installation/).
 While configuring to run LocalStack with Docker or Docker Compose, run the `localstack/localstack-pro` image with the appropriate tag you have pulled (if not `latest`).
 
 :::note
@@ -59,4 +40,4 @@ To ensure that we move quickly and steadily, we run nightly builds, where all ou
 We intend to announce more significant features and enhancements during major & minor releases.
 We occasionally create patch releases for minor bug fixes and enhancements, to ensure that we can deliver changes quickly while not breaking your existing workflows (in case you prefer not to use `latest`).
 
-To check out the various tags available for LocalStack, you can visit the [LocalStack Community](https://hub.docker.com/r/localstack/localstack/tags?page=1&ordering=last_updated) & [LocalStack Pro](https://hub.docker.com/r/localstack/localstack-pro/tags?page=1&ordering=last_updated) Docker Hub pages.
+Visit the [LocalStack for AWS tag](https://hub.docker.com/r/localstack/localstack-pro/tags?page=1&ordering=last_updated) in Docker Hub pages.
diff --git a/src/content/docs/aws/capabilities/config/initialization-hooks.mdx b/src/content/docs/aws/capabilities/config/initialization-hooks.mdx
index 9cf8793a..00d4c793 100644
--- a/src/content/docs/aws/capabilities/config/initialization-hooks.mdx
+++ b/src/content/docs/aws/capabilities/config/initialization-hooks.mdx
@@ -186,7 +186,7 @@ Environment = "Dev"
 }
 ```
 
-Start LocalStack Pro with mounted `main.tf`:
+Start LocalStack for AWS with mounted `main.tf`:
 
 <Tabs>
 <TabItem value="docker-compose.yml" label="docker-compose.yml">
@@ -194,11 +194,11 @@ Start LocalStack Pro with mounted `main.tf`:
 services:
   localstack:
     container_name: "localstack-main"
-    image: localstack/localstack-pro  # required for Pro
+    image: localstack/localstack-pro
     ports:
       - "127.0.0.1:4566:4566"            # LocalStack Gateway
     environment:
-# Activate LocalStack Pro: https://docs.localstack.cloud/getting-started/auth-token/
+# Activate LocalStack for AWS: https://docs.localstack.cloud/getting-started/auth-token/
       - LOCALSTACK_AUTH_TOKEN=${LOCALSTACK_AUTH_TOKEN:?}
       - EXTENSION_AUTO_INSTALL=localstack-extension-terraform-init
     volumes:
diff --git a/src/content/docs/aws/capabilities/config/usage-tracking.md b/src/content/docs/aws/capabilities/config/usage-tracking.md
index f2c92bf7..862ad7be 100644
--- a/src/content/docs/aws/capabilities/config/usage-tracking.md
+++ b/src/content/docs/aws/capabilities/config/usage-tracking.md
@@ -7,7 +7,7 @@ template: doc
 ## Overview
 
 For license activations, we track the timestamp and the licensing credentials.
-We need to do this to make CI credits work.
+
 It is tracked regardless of whether the user disables event tracking since we collect this in the backend, not the client.
 
 ## LocalStack usage statistics
@@ -80,8 +80,6 @@ Here is an example of AWS API call metadata:
 }
 ```
 
-For the community image, we only track service, operation, status code, and how often the combination of those occurred.
-
 ### CLI invocations
 
 We collect an anonymized event if a CLI command was invoked, but do not collect any of the parameter values.
diff --git a/src/content/docs/aws/capabilities/networking/transparent-endpoint-injection.md b/src/content/docs/aws/capabilities/networking/transparent-endpoint-injection.md
index dd3a1b22..20f4e04b 100644
--- a/src/content/docs/aws/capabilities/networking/transparent-endpoint-injection.md
+++ b/src/content/docs/aws/capabilities/networking/transparent-endpoint-injection.md
@@ -48,7 +48,7 @@ This section explains the most important configuration options summarized under
 
 ### Disable transparent endpoint injection
 
-If you do not wish to use Transparent Endpoint Injection in LocalStack Pro, opt out using:
+If you do not wish to use Transparent Endpoint Injection in LocalStack for AWS, opt out using:
 
 ```bash
 DISABLE_TRANSPARENT_ENDPOINT_INJECTION=1
@@ -56,7 +56,7 @@ DISABLE_TRANSPARENT_ENDPOINT_INJECTION=1
 
 This option disables DNS resolution of AWS domains to the LocalStack container and prevents Lambda from disabling SSL validation.
 If Transparent Endpoint Injection is _not_ used, the AWS SDK within Lambda functions might connect to the real AWS API.
-Transparent Endpoint Injection is only available in LocalStack Pro.
+Transparent Endpoint Injection is only available in LocalStack for AWS.
 
 Alternatively, specific AWS endpoints can be resolved to AWS while continuing to use Transparent Endpoint Injection.
 Refer to the [DNS server configuration](/aws/tooling/dns-server#system-dns-configuration) for skipping selected domain name patterns.
@@ -67,7 +67,7 @@ Use this configuration with caution because we generally do not recommend connec
 
 ## Self-signed certificates
 
-In LocalStack Pro and Lambda, Transparent Endpoint Injection automatically disables SSL certificate validation of the AWS SDK for the
+In LocalStack for AWS and Lambda, Transparent Endpoint Injection automatically disables SSL certificate validation of the AWS SDK for the
 most common Lambda runtimes including Python, Node.js, and Java (SDK v1).
 For other services and unsupported Lambda runtimes, you may have to configure your AWS clients to accept self-signed certificates because
 we are repointing AWS domain names (e.g., `*.amazonaws.com`) to `localhost.localstack.cloud`.
@@ -135,7 +135,6 @@ You need to make two changes:
 
 For more details, see your [DNS server documentation](/aws/tooling/dns-server).
 
-For the community image of LocalStack, you can employ your own DNS server to achieve a similar outcome, but it won't be managed by LocalStack.
 Note that in both cases, SSL verification must be disabled.
 
 ### From a lambda function
diff --git a/src/content/docs/aws/capabilities/state-management/cli-commands.md b/src/content/docs/aws/capabilities/state-management/cli-commands.md
index e7e971a6..9cedb76a 100644
--- a/src/content/docs/aws/capabilities/state-management/cli-commands.md
+++ b/src/content/docs/aws/capabilities/state-management/cli-commands.md
@@ -207,7 +207,7 @@ Usage: pod list [OPTIONS] [REMOTE]
   A public Cloud Pod is available across the boundary of a user one/or
   organization.
   In other words, any public Cloud Pod can be injected by any
-  other user holding a LocalStack Pro (or above) license.
+  other user holding a LocalStack for AWS license.
 
 Options:
   -p, --public               List all the available public Cloud Pods
diff --git a/src/content/docs/aws/enterprise/kubernetes/deploy-helm-chart.md b/src/content/docs/aws/enterprise/kubernetes/deploy-helm-chart.md
index 4c072d8b..19061882 100644
--- a/src/content/docs/aws/enterprise/kubernetes/deploy-helm-chart.md
+++ b/src/content/docs/aws/enterprise/kubernetes/deploy-helm-chart.md
@@ -47,7 +47,7 @@ helm install localstack localstack/localstack
 
 This creates the LocalStack resources in your cluster using the chart defaults.
 
-### Install LocalStack Pro
+### Install LocalStack for AWS
 
 If you want to use the `localstack-pro` image, create a `values.yaml` file:
 
diff --git a/src/content/docs/aws/enterprise/kubernetes/index.md b/src/content/docs/aws/enterprise/kubernetes/index.md
index d7583d8d..13e6cb91 100644
--- a/src/content/docs/aws/enterprise/kubernetes/index.md
+++ b/src/content/docs/aws/enterprise/kubernetes/index.md
@@ -40,7 +40,7 @@ The table below compares these methods.
 | Deployment approach | Pros | Cons |
 |---------------------|------|------|
 | **Operator** | · Declarative, self-managed control plane<br> · Built-in validation, defaulting, and reconciliation logic | · Requires in-cluster component (controller) |
-| **Helm chart** | · Simplifies deployment using templates and `values.yaml`<br> · Supports versioning, upgrades, and rollbacks<br> · Supports both LocalStack Community and Pro images | · Customization is limited to chart values and overrides |
+| **Helm chart** | · Simplifies deployment using templates and `values.yaml`<br> · Supports versioning, upgrades, and rollbacks<br> · Supports LocalStack for AWS under all Licences | · Customization is limited to chart values and overrides |
 | **DIY (YAML manifests)** | · Full control over Kubernetes configuration and resources | · Time-consuming to set up and maintain<br> · Manual updates and lifecycle management |
 
 ## Limitations
@@ -55,20 +55,9 @@ The table below compares these methods.
 | `EC2` | Partial | Core EC2 functionality is supported. User data scripts may not behave identically to AWS — full parity is not guaranteed. |
 | `RDS` | Partial | Most database engines are supported. MySQL 5.7 is not supported. Persistence across pod restarts is not supported, except for PostgreSQL and MariaDB. |
 
-
-## Licensing
-
-While the LocalStack Community image can be deployed in Kubernetes, it does not support containerized service functionality required for full cloud-like behavior. Services such as Lambda, which require spawning and managing compute containers at runtime, only support pod creation with the LocalStack Pro image. The Community edition lacks the runtime capabilities needed to dynamically instantiate and orchestrate workloads in Kubernetes.
-
 ## Help & Support
 
 LocalStack Enterprise (or additional purchase of the Kubernetes pack add-on) is the only version that provides: 
 
 - Official support and integration for Kubernetes environments.
 - Dynamic pod creation by services like Lambda, ECS, RDS, etc.
-
-Community image users:
-
-- Can be deployed in Kubernetes cluster for basic service emulation (e.g., S3, SQS).
-- Do not receive official Kubernetes support.
-- Cannot use features like Lambda execution.
diff --git a/src/content/docs/aws/enterprise/kubernetes/kubernetes-operator.mdx b/src/content/docs/aws/enterprise/kubernetes/kubernetes-operator.mdx
index de27f995..00e104ba 100644
--- a/src/content/docs/aws/enterprise/kubernetes/kubernetes-operator.mdx
+++ b/src/content/docs/aws/enterprise/kubernetes/kubernetes-operator.mdx
@@ -274,6 +274,5 @@ Ensure that:
 :::note
 * The LocalStack Operator is available **only with licenses that include Kubernetes features**
 * Each LocalStack instance requires its **own auth token**
-* The Operator supports **LocalStack Pro images only**
 * DNS integration and Cloud Pod automation are Operator-exclusive features
 :::
diff --git a/src/content/docs/aws/getting-started/auth-token.mdx b/src/content/docs/aws/getting-started/auth-token.mdx
index 6881f352..b71c45a1 100644
--- a/src/content/docs/aws/getting-started/auth-token.mdx
+++ b/src/content/docs/aws/getting-started/auth-token.mdx
@@ -10,7 +10,7 @@ import { Code, Tabs, TabItem } from '@astrojs/starlight/components';
 
 ## Introduction
 
-The Auth Token identifies and authenticates users outside the LocalStack Web Application to activate the LocalStack core cloud emulator.
+The Auth Token is required to activate the LocalStack for AWS core cloud emulator. It identifies and authenticates users outside the LocalStack Web Application.
 It primarily accesses your workspace and advanced services & features.
 
 Auth tokens come in two types: a **Developer Auth Token** and a **CI Auth Token**:
@@ -24,11 +24,12 @@ Auth tokens come in two types: a **Developer Auth Token** and a **CI Auth Token*
 Both the **Developer Auth Token** and **CI Auth Token** can be managed on the [Auth Tokens page](https://app.localstack.cloud/workspace/auth-tokens).
 
 :::danger
+
 - It's crucial to keep your Auth Token confidential.
   Do not include it in source code management systems, such as Git repositories.
 - Be aware that if an Auth Token is committed to a public repository, it is at risk of exposure, and could remain in the repository's history, even if attempts are made to rewrite it.
 - In case your Auth Token is accidentally published, immediately rotate it on the [Auth Token page](https://app.localstack.cloud/workspace/auth-tokens).
-:::
+  :::
 
 ## Managing your License
 
@@ -67,11 +68,12 @@ You can configure your Auth Token in several ways, depending on your use case.
 The following sections describe the various methods of setting your Auth Token.
 
 :::danger
+
 - It's crucial to keep your Auth Token confidential.
   Do not include it in source code management systems, such as Git repositories.
 - Be aware that if an Auth Token is committed to a public repository, it's at risk of exposure, and could remain in the repository's history, even if attempts are made to rewrite it.
 - In case your Auth Token is accidentally published, immediately rotate it on the [Auth Token page](https://app.localstack.cloud/workspace/auth-tokens).
-:::
+  :::
 
 ### LocalStack CLI
 
@@ -79,25 +81,32 @@ You should set the `LOCALSTACK_AUTH_TOKEN` environment variable either before or
 
 <Tabs>
   <TabItem label="macOS/Linux">
-    <Code code={`localstack auth set-token <YOUR_AUTH_TOKEN>\nlocalstack start`} lang="shell" />
+    <Code
+      code={`localstack auth set-token <YOUR_AUTH_TOKEN>\nlocalstack start`}
+      lang="shell"
+    />
   </TabItem>
   <TabItem label="Windows">
-    <Code code={`localstack auth set-token <YOUR_AUTH_TOKEN>\nlocalstack start`} lang="powershell" />
+    <Code
+      code={`localstack auth set-token <YOUR_AUTH_TOKEN>\nlocalstack start`}
+      lang="powershell"
+    />
   </TabItem>
 </Tabs>
 
 :::note
+
 1. You can alternatively set the `LOCALSTACK_AUTH_TOKEN` environment variable in your shell session.
-  This ensures the Auth Token is transmitted to your LocalStack container, enabling key activation.
+   This ensures the Auth Token is transmitted to your LocalStack container, enabling key activation.
 2. The `localstack auth set-token` command is only available for `localstack` CLI and cannot be used with a Docker/Docker Compose setup.
-:::
+   :::
 
 You have the option to run your LocalStack container in the background by appending the `-d` flag to the `localstack start` command.
 
 The `localstack` CLI automatically detects the Auth Token and appropriately conveys it to the LocalStack container.
 
 :::note
-If you are using LocalStack with an Auth Token, it's necessary to download the [LocalStack Pro image](/aws/capabilities/config/docker-images#localstack-pro-image), which includes Pro services and several advanced features.
+If you are using LocalStack with an Auth Token, it's necessary to download the [LocalStack for AWS image](/aws/capabilities/config/docker-images#localstack-for-aws-image), which includes Pro services and several advanced features.
 :::
 
 ### Docker
@@ -150,7 +159,7 @@ To rotate your Auth Token, go to the [Auth Token page](https://app.localstack.cl
 ## Licensing configuration & activation checkup
 
 To avoid logging any licensing-related error messages, set `LOG_LICENSE_ISSUES=0` in your environment.
-Refer to our [configuration guide](/aws/capabilities/config/configuration/#localstack-pro) for more information.
+Refer to our [configuration guide](/aws/capabilities/config/configuration/#localstack-for-aws) for more information.
 
 The simplest method to verify if LocalStack is active is by querying the health endpoint for a list of running services:
 
@@ -185,9 +194,9 @@ The following output would be retrieved:
   "server_time_utc": "2023-11-21T05:41:33",
   "uptime": 161
 }
-````
+```
 
-You can notice the `edition` field is set to `pro` and the `is_license_activated` field is set to `true`.
+The `edition` field is always `pro` and the `is_license_activated` field is set to `true`.
 Another way to confirm this is by checking the logs of the LocalStack container for a message indicating successful license activation:
 
 ```bash
@@ -226,7 +235,7 @@ License activation failed! 🔑❌
 
 Reason: The credentials defined in your environment are invalid. Please make sure to either set the LOCALSTACK_AUTH_TOKEN variable to a valid auth token, or the LOCALSTACK_API_KEY variable to a valid LocalStack API key. You can find your Auth Token or API key in the LocalStack web app https://app.localstack.cloud.
 
-Due to this error, Localstack has quit. LocalStack pro features can only be used with a valid license.
+Due to this error, Localstack has quit. LocalStack for AWS features can only be used with a valid license.
 
 - Please check that your credentials are set up correctly and that you have an active license.
   You can find your credentials in our webapp at https://app.localstack.cloud.
@@ -237,7 +246,7 @@ The key activation in LocalStack may fail for several reasons, and the most comm
 
 ### Missing Credentials
 
-You need to provide either an Auth Token to start the LocalStack Pro image successfully.
+You need to provide either an Auth Token to start the LocalStack for AWS image successfully.
 You can find your Auth Token on the [Auth Tokens page](https://app.localstack.cloud/workspace/auth-tokens) in the LocalStack Web Application.
 
 If you are using the `localstack` CLI, you can set the `LOCALSTACK_AUTH_TOKEN` environment variable to your Auth Token or use the following command to set it up:
@@ -264,4 +273,4 @@ If the result shows a status other than `status: NOERROR`, your machine is unabl
 Certain corporate DNS servers may filter requests to specific domains.
 Kindly reach out to your network administrator to safelist `localstack.cloud` domain.
 
-If you have any further problems concerning your license activation, or if the steps do not help, do not hesitate to [contact us](https://localstack.cloud/contact/).
\ No newline at end of file
+If you have any further problems concerning your license activation, or if the steps do not help, do not hesitate to [contact us](https://localstack.cloud/contact/).
diff --git a/src/content/docs/aws/getting-started/faq.mdx b/src/content/docs/aws/getting-started/faq.mdx
index 0a511f77..80b66f89 100644
--- a/src/content/docs/aws/getting-started/faq.mdx
+++ b/src/content/docs/aws/getting-started/faq.mdx
@@ -1,6 +1,6 @@
 ---
 title: FAQ
-description: Frequently asked questions about LocalStack Pro, Enterprise, and Community Editions.
+description: Frequently asked questions about LocalStack for AWS, Enterprise, and Community Editions.
 template: doc
 sidebar:
   order: 5
@@ -275,13 +275,13 @@ Pushing and pulling a Cloud Pod from our Web Application is facilitated by using
 
 ### How do I check if my license is valid and activated?
 
-The easiest way to check if LocalStack Pro or Enterprise is activated is to check the health endpoint of LocalStack for a list of the running services:
+The easiest way to check if LocalStack for AWS is activated is to check the health endpoint of LocalStack for a list of the running services:
 
 ```bash
 curl localhost:4566/_localstack/health | jq
 ```
 
-If a Pro-only service -- like [XRay](/aws/services/xray) -- is running, LocalStack Pro or Enterprise has started successfully.
+If a service like [XRay](/aws/services/xray) is running, LocalStack for AWS has started successfully.
 If your Auth Token is invalid, you will see an error message like this in the logs of LocalStack:
 
 ```bash
@@ -292,13 +292,6 @@ If this error occurs, something is wrong with your Auth Token or license.
 Make sure your Auth Token is set correctly (check for typos!) and your license is valid.
 If the Auth Token still does not work, please [contact us](https://localstack.cloud/contact/).
 
-### How are CI credits in LocalStack calculated?
-
-A CI Auth Token allows you to use LocalStack in your CI environment.
-Every activation with a CI Auth Token consumes one CI credit.
-This means that with every build triggered through the LocalStack container you will consume one credit.
-To understand the CI pricing across our product tiers, follow up with our [LocalStack in CI](/aws/integrations/continuous-integration/) documentation.
-
 ### What should I do if I cannot connect to LocalStack API?
 
 If your log output contains lines like:
@@ -333,7 +326,7 @@ If the result has some other status than `status: NOERROR,` your machine cannot
 Some corporate DNS servers might filter requests to certain domains.
 Contact your network administrator to safelist `localstack.cloud` domains.
 
-### How does LocalStack Pro handle security patches and bug fixes?
+### How does LocalStack for AWS handle security patches and bug fixes?
 
 We take security seriously and respond to any emergency vulnerabilities as soon as possible.
 Our cloud provider (AWS) handles most of the infrastructure maintenance for us.
diff --git a/src/content/docs/aws/getting-started/index.md b/src/content/docs/aws/getting-started/index.md
index be2786f4..017debdb 100644
--- a/src/content/docs/aws/getting-started/index.md
+++ b/src/content/docs/aws/getting-started/index.md
@@ -14,7 +14,7 @@ Whether you are testing complex CDK applications or Terraform configurations, or
 
 LocalStack supports a growing number of [AWS services](/aws/services/)
 , like [Lambda](/aws/services/lambda), [S3](/aws/services/s3), [DynamoDB](/aws/services/dynamodb), [Kinesis](/aws/services/kinesis), [SQS](/aws/services/sqs), [SNS](/aws/services/sns), and more!
-[LocalStack Pro](https://localstack.cloud/pricing) supports additional APIs and advanced features to make your cloud development experience a breeze!
+[LocalStack for AWS](https://localstack.cloud/pricing) also supports APIs and advanced features to make your cloud development experience a breeze.
 
 You can find a comprehensive list of supported APIs on each AWS service page.
 
diff --git a/src/content/docs/aws/getting-started/installation.mdx b/src/content/docs/aws/getting-started/installation.mdx
index 1ebfb91d..048255d8 100644
--- a/src/content/docs/aws/getting-started/installation.mdx
+++ b/src/content/docs/aws/getting-started/installation.mdx
@@ -139,7 +139,12 @@ To verify that the LocalStack CLI was installed correctly, you can check the ver
 
 You are all set!
 
-You can now start LocalStack with the following command:
+
+:::note
+To start LocalStack, you must first [set up your auth token](/aws/getting-started/auth-token).
+:::
+
+Once you've set up your auth token, you can start LocalStack with the following command:
 
 ```bash
 localstack start # start localstack in background with -d flag
@@ -162,10 +167,6 @@ localstack start # start localstack in background with -d flag
 [12:47:15] detaching                                                   bootstrap.py:1262
 ```
 
-:::note
-To use all of LocalStack's features we recommend to [get a LocalStack account and set up your auth token](/aws/getting-started/auth-token).
-Afterwards, check out our [Quickstart guide](/aws/getting-started/quickstart) to start your local development cloud!
-:::
 
 ### Updating LocalStack CLI
 
@@ -275,7 +276,7 @@ services:
       - "127.0.0.1:4510-4559:4510-4559"  # external services port range
       - "127.0.0.1:443:443"              # LocalStack HTTPS Gateway (Pro)
     environment:
-      # Activate LocalStack Pro: https://docs.localstack.cloud/getting-started/auth-token/
+      # Activate LocalStack for AWS: https://docs.localstack.cloud/getting-started/auth-token/
       - LOCALSTACK_AUTH_TOKEN=${LOCALSTACK_AUTH_TOKEN:?}  # required for Pro
       # LocalStack configuration: https://docs.localstack.cloud/references/configuration/
       - DEBUG=${DEBUG:-0}
diff --git a/src/content/docs/aws/getting-started/quickstart.mdx b/src/content/docs/aws/getting-started/quickstart.mdx
index ea98511c..7774291f 100644
--- a/src/content/docs/aws/getting-started/quickstart.mdx
+++ b/src/content/docs/aws/getting-started/quickstart.mdx
@@ -46,7 +46,7 @@ An internal SES LocalStack testing endpoint (`/_localstack/aws/ses`) is configur
 - `jq`, `zip` & `curl`
 
 You can start LocalStack using the `localstack` CLI.
-Start the LocalStack Pro container with your `LOCALSTACK_AUTH_TOKEN` pre-configured:
+Start the LocalStack for AWS container with your `LOCALSTACK_AUTH_TOKEN` pre-configured:
 
 <Tabs>
   <TabItem label="macOS/Linux">
diff --git a/src/content/docs/aws/integrations/app-frameworks/serverless-framework.md b/src/content/docs/aws/integrations/app-frameworks/serverless-framework.md
index ebd8dc37..1e2d352f 100644
--- a/src/content/docs/aws/integrations/app-frameworks/serverless-framework.md
+++ b/src/content/docs/aws/integrations/app-frameworks/serverless-framework.md
@@ -125,7 +125,7 @@ else:
 ...
 ```
 
-In LocalStack Pro, no code changes are required using our [Transparent Endpoint Injection](/aws/capabilities/networking/transparent-endpoint-injection).
+In LocalStack for AWS, no code changes are required using our [Transparent Endpoint Injection](/aws/capabilities/networking/transparent-endpoint-injection).
 
 ## Deploying to LocalStack
 
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 da0e4ce7..73474e99 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
@@ -609,7 +609,7 @@ functions:
           path: /{proxy+}
           method: ANY
           cors: true
-      # Please, note that events are a LocalStack PRO feature
+      # Please, note that events are a LocalStack for AWS feature
       - schedule:
           rate: rate(10 minutes)
           enabled: true
@@ -679,7 +679,6 @@ class ApplicationStack(parent: Construct, name: String) : Stack(parent, name) {
             .event(RuleTargetInput.fromObject(mapOf("httpMethod" to "SCHEDULE", "path" to "warmup")))
             .build()
 
-        // Please note that events is a LocalStack PRO feature
         warmupRule.addTarget(warmupTarget)
 
         SingletonFunction.Builder.create(this, "ExampleFunctionOne")
diff --git a/src/content/docs/aws/integrations/containers/devcontainers.mdx b/src/content/docs/aws/integrations/containers/devcontainers.mdx
index 516e8bd1..150ea794 100644
--- a/src/content/docs/aws/integrations/containers/devcontainers.mdx
+++ b/src/content/docs/aws/integrations/containers/devcontainers.mdx
@@ -153,7 +153,7 @@ The `devcontainer.json` will look similar to the following:
  "image": "mcr.microsoft.com/devcontainers/base:bullseye",
 
  "remoteEnv": {
-  // Activate LocalStack Pro: https://docs.localstack.cloud/getting-started/auth-token/
+  // Activate LocalStack for AWS: https://docs.localstack.cloud/getting-started/auth-token/
   "LOCALSTACK_AUTH_TOKEN": "${localEnv:LOCALSTACK_AUTH_TOKEN}",  // required for Pro, not processed via template due to security reasons
   "LOCALSTACK_API_KEY": "${localEnv:LOCALSTACK_API_KEY}",
   // LocalStack configuration: https://docs.localstack.cloud/references/configuration/
@@ -410,7 +410,7 @@ FROM mcr.microsoft.com/devcontainers/base:bookworm
 </TabItem>
 <TabItem label=".env">
 ```bash showshowLineNumbers
-# Activate LocalStack Pro: https://docs.localstack.cloud/getting-started/auth-token/
+# Activate LocalStack for AWS: https://docs.localstack.cloud/getting-started/auth-token/
 LOCALSTACK_AUTH_TOKEN=${LOCALSTACK_AUTH_TOKEN:-}  # required for Pro, not processed via template due to security reasons
 LOCALSTACK_API_KEY=${LOCALSTACK_API_KEY:-}
 # LocalStack configuration: https://docs.localstack.cloud/references/configuration/
diff --git a/src/content/docs/aws/integrations/containers/openshift.md b/src/content/docs/aws/integrations/containers/openshift.md
index d5c2826a..e432e67c 100644
--- a/src/content/docs/aws/integrations/containers/openshift.md
+++ b/src/content/docs/aws/integrations/containers/openshift.md
@@ -21,11 +21,6 @@ For example, a valid license might be necessary for each user who interacts with
 If you have any questions or uncertainties regarding the licensing implications, we encourage you to [contact us](https://localstack.cloud/contact) for further details.
 :::
 
-:::note
-LocalStack on OpenShift can be used in conjunction with the [LocalStack Community image](https://hub.docker.com/r/localstack/localstack).
-However, specific features such as execution of Lambda functions as OpenShift pods and other container workloads is only available in the [LocalStack Pro image](https://hub.docker.com/r/localstack/localstack-pro).
-:::
-
 ## Getting started
 
 This guide is designed for users new to LocalStack and assumes basic knowledge of the AWS CLI and our [`awslocal`](https://github.com/localstack/awscli-local) wrapper script.
diff --git a/src/content/docs/aws/integrations/continuous-integration/bitbucket.md b/src/content/docs/aws/integrations/continuous-integration/bitbucket.md
index 375cff6d..37365118 100644
--- a/src/content/docs/aws/integrations/continuous-integration/bitbucket.md
+++ b/src/content/docs/aws/integrations/continuous-integration/bitbucket.md
@@ -55,7 +55,7 @@ pipelines:
 
 ## Configuring a CI Auth Token
 
-You can enable LocalStack Pro by using the `localstack/localstack-pro` image and adding your CI Auth Token to the project's environment variables.
+You can enable LocalStack for AWS by using the `localstack/localstack-pro` image and adding your CI Auth Token to the project's environment variables.
 The LocalStack container will automatically pick it up and activate the Pro features.
 
 Go to the [CI Auth Token page](https://app.localstack.cloud/workspace/auth-tokens) and copy your CI Auth Token.
diff --git a/src/content/docs/aws/integrations/continuous-integration/circleci.md b/src/content/docs/aws/integrations/continuous-integration/circleci.md
index 5adfa03c..b4fdd683 100644
--- a/src/content/docs/aws/integrations/continuous-integration/circleci.md
+++ b/src/content/docs/aws/integrations/continuous-integration/circleci.md
@@ -89,7 +89,7 @@ jobs:
 
 ### Configuring a CI Auth Token
 
-To enable LocalStack Pro+, you need to add your LocalStack CI Auth Token to the project's environment variables.
+To enable LocalStack for AWS, you need to add your LocalStack CI Auth Token to the project's environment variables.
 The LocalStack container will automatically pick it up and activate the licensed features.
 
 Go to the [CI Auth Token page](https://app.localstack.cloud/workspace/auth-tokens) and copy your CI Auth Token.
diff --git a/src/content/docs/aws/integrations/continuous-integration/codebuild.md b/src/content/docs/aws/integrations/continuous-integration/codebuild.md
index c1298585..b38ff82d 100644
--- a/src/content/docs/aws/integrations/continuous-integration/codebuild.md
+++ b/src/content/docs/aws/integrations/continuous-integration/codebuild.md
@@ -95,7 +95,7 @@ phases:
 
 ### Configuring a CI Auth Token
 
-To enable LocalStack Pro features, you need to add your LocalStack CI Auth Token to the project's environment variables.
+To enable LocalStack for AWS features, you need to add your LocalStack CI Auth Token to the project's environment variables.
 The LocalStack container will automatically pick it up and activate the licensed features.
 
 Go to the [CI Auth Token page](https://app.localstack.cloud/workspace/auth-tokens) and copy your CI Auth Token.
diff --git a/src/content/docs/aws/integrations/continuous-integration/github-actions.md b/src/content/docs/aws/integrations/continuous-integration/github-actions.md
index 65795cd6..af985046 100644
--- a/src/content/docs/aws/integrations/continuous-integration/github-actions.md
+++ b/src/content/docs/aws/integrations/continuous-integration/github-actions.md
@@ -38,7 +38,7 @@ You can add extra configuration options by separating them with a comma.
 
 ### Configure a CI Auth Token
 
-To enable LocalStack Pro, you need to add your LocalStack CI Auth Token to the project's environment variables.
+To enable LocalStack for AWS, you need to add your LocalStack CI Auth Token to the project's environment variables.
 The LocalStack container will automatically pick it up and activate the licensed features.
 
 Go to the [CI Auth Token page](https://app.localstack.cloud/workspace/auth-tokens) and copy your CI Auth Token.
diff --git a/src/content/docs/aws/integrations/continuous-integration/gitlab-ci.md b/src/content/docs/aws/integrations/continuous-integration/gitlab-ci.md
index 85c47269..bb419f98 100644
--- a/src/content/docs/aws/integrations/continuous-integration/gitlab-ci.md
+++ b/src/content/docs/aws/integrations/continuous-integration/gitlab-ci.md
@@ -79,7 +79,7 @@ job:
 
 ### Configure a CI Auth Token
 
-You can easily enable LocalStack Pro by using the `localstack/localstack-pro` image and adding your [CI Auth Token](https://app.localstack.cloud/workspace/auth-tokens) to the repository's environment variables as `LOCALSTACK_AUTH_TOKEN`.
+You can easily enable LocalStack for AWS by using the `localstack/localstack-pro` image and adding your [CI Auth Token](https://app.localstack.cloud/workspace/auth-tokens) to the repository's environment variables as `LOCALSTACK_AUTH_TOKEN`.
 Go to your project's **Settings > CI/CD** and expand the **Variables** section.
 Select the **Add Variable** button and fill in the necessary details with `LOCALSTACK_AUTH_TOKEN` as the key and your CI Auth Token as the value.
 After you create the variable, you can use it in the `.gitlab-ci.yml` file.
diff --git a/src/content/docs/aws/integrations/continuous-integration/travis-ci.md b/src/content/docs/aws/integrations/continuous-integration/travis-ci.md
index d7fdae38..05905869 100644
--- a/src/content/docs/aws/integrations/continuous-integration/travis-ci.md
+++ b/src/content/docs/aws/integrations/continuous-integration/travis-ci.md
@@ -49,7 +49,7 @@ script:
 
 ## Configuring a CI Auth Token
 
-You can easily enable LocalStack Pro by using the `localstack/localstack-pro` image and adding your [CI Auth Token](https://app.localstack.cloud/workspace/auth-tokens) to the project's environment variables as `LOCALSTACK_AUTH_TOKEN`.
+You can easily enable LocalStack for AWS by using the `localstack/localstack-pro` image and adding your [CI Auth Token](https://app.localstack.cloud/workspace/auth-tokens) to the project's environment variables as `LOCALSTACK_AUTH_TOKEN`.
 The LocalStack CLI will automatically detect it and activate the Pro features.
 
 To configure this in Travis CI, go to the project settings (`More options` → `Settings`), scroll down to the `Environment Variables` section, and add your CI Auth Token as `LOCALSTACK_AUTH_TOKEN`.
diff --git a/src/content/docs/aws/integrations/messaging/docker-compose.yml b/src/content/docs/aws/integrations/messaging/docker-compose.yml
index ec9b3034..09503c27 100644
--- a/src/content/docs/aws/integrations/messaging/docker-compose.yml
+++ b/src/content/docs/aws/integrations/messaging/docker-compose.yml
@@ -51,7 +51,7 @@ services:
 
   localstack:
     container_name: "${LOCALSTACK_DOCKER_NAME-localstack-main}"
-    image: localstack/localstack-pro  # required for Pro
+    image: localstack/localstack-pro
     ports:
       - "127.0.0.1:4566:4566"            # LocalStack Gateway
       - "127.0.0.1:4510-4559:4510-4559"  # external services port range
diff --git a/src/content/docs/aws/integrations/messaging/selfmanaged-kafka-cluster.md b/src/content/docs/aws/integrations/messaging/selfmanaged-kafka-cluster.md
index 8fc3022c..fb209fc4 100644
--- a/src/content/docs/aws/integrations/messaging/selfmanaged-kafka-cluster.md
+++ b/src/content/docs/aws/integrations/messaging/selfmanaged-kafka-cluster.md
@@ -6,9 +6,8 @@ sidebar:
     order: 1
 ---
 
-LocalStack Pro supports [AWS Managed Streaming for Kafka (MSK)](/aws/services/kafka) and you can create Kafka clusters directly through the MSK API that will run in LocalStack.
+LocalStack for AWS supports [AWS Managed Streaming for Kafka (MSK)](/aws/services/kafka) and you can create Kafka clusters directly through the MSK API that will run in LocalStack.
 In some cases, you may want to run your own self-managed Kafka cluster and integrate it with your applications, like triggering Lambdas from a Kafka stream running in your own cluster.
-The Lambda integration with self-managed Kafka clusters is also a LocalStack Pro feature.
 
 ## Running self-managed Kafka
 
diff --git a/src/content/docs/aws/integrations/testing/lambdatest-hyperexecute.md b/src/content/docs/aws/integrations/testing/lambdatest-hyperexecute.md
index b402fd38..fde2c8c8 100644
--- a/src/content/docs/aws/integrations/testing/lambdatest-hyperexecute.md
+++ b/src/content/docs/aws/integrations/testing/lambdatest-hyperexecute.md
@@ -50,7 +50,7 @@ pre:
 The above minimal configuration file starts LocalStack and creates an S3 bucket, SQS queue, and SNS topic.
 
 :::note
-To use the LocalStack Pro image, configure a LocalStack Auth Token by appending `LOCALSTACK_AUTH_TOKEN=${{ .secrets.LOCALSTACK_AUTH_TOKEN }}` to the `localstack start` command.
+To use the LocalStack for AWS image, configure a LocalStack Auth Token by appending `LOCALSTACK_AUTH_TOKEN=${{ .secrets.LOCALSTACK_AUTH_TOKEN }}` to the `localstack start` command.
 Subsequently, you need to add your LocalStack Auth Token to your HyperExecute Portal as a secret.
 :::
 
@@ -125,4 +125,4 @@ jobs:
 
 Add your username and access key to your GitHub repository secrets.
 You can find your access key in the HyperExecute Portal.
-If you are using the LocalStack Pro image, you need to add your LocalStack Auth Token to your GitHub repository secrets.
\ No newline at end of file
+You need to add your LocalStack Auth Token to your GitHub repository secrets.
\ No newline at end of file
diff --git a/src/content/docs/aws/licensing.md b/src/content/docs/aws/licensing.md
index 4b12ca01..5ea14a18 100644
--- a/src/content/docs/aws/licensing.md
+++ b/src/content/docs/aws/licensing.md
@@ -8,15 +8,22 @@ description: Service availability and licensing details across LocalStack for AW
 This document outlines the features, emulated AWS services, and enhancements included in each LocalStack for AWS tier.
 It also clarifies how licensing works across workspaces and users.
 
-As of **September 18, 2025**, LocalStack for AWS is offered in five tiers:
+As of **March 23rd, 2026**, LocalStack for AWS offers the following subscriptions that provide licenses for commercial use::
 
-- Free
 - Base
 - Ultimate
-- Enterprise (custom offering available via Sales only)
-- Student (requires a verified GitHub Education student account)
+- Enterprise 
 
-If you purchased a LocalStack license **before May 8, 2025**, [click here to learn about your available features and legacy entitlements](#legacy-plans).
+Customers looking to purchase LocalStack for use primarily in automated environments or through shared infrastructure, such as an internal developer platform are encouraged to reach out to our sales team. For more information, please refer to our fair use policy. 
+
+We provide the following subscription for non-commercial use:
+- Hobby
+
+We offer special subscriptions for select segments:
+- Student, requires a verified GitHub Education student account
+- OSS project sponsorship, requires approval from LocalStack. Applications can be submitted here.
+
+If you purchased a LocalStack license **before May 8, 2025**, [click here to learn about your available features and legacy entitlements](#legacy-plan-usage-allocations).
 
 ### Licensing & Access Rules
 
@@ -35,12 +42,9 @@ For unique licensing needs across teams or environments, please contact Sales.
 
 All paid tiers include a fixed allocation of:
 
-- CI credits (monthly pool)
-- Ephemeral Instance minutes (monthly pool)
-- Cloud Pod storage (per contract, shared across all users)
+- Cloud Sandbox (Ephemeral Instance) minutes (monthly pool)
+- State Management (Cloud Pod) storage (per contract, shared across all users)
 
-We will soon support self-service purchasing of additional credits, minutes, and storage.
-Until then, please reach out to Sales if you need to expand your usage.
 
 ### Service Coverage Clarification
 
@@ -49,156 +53,159 @@ It does not indicate the level of API coverage or feature availability.
 
 To learn more about how a service behaves in LocalStack, refer to that individual service page or contact Support.
 
-| AWS Services | Free | Base | Ultimate | Student |
-| -------- | ------- | ------- | ------- | ------- |
-| Analytics |  |  |  |  |
-| [](https://docs.localstack.cloud/user-guide/aws/es/)[Amazon ElasticSearch](https://docs.localstack.cloud/user-guide/aws/es/) | ✅ | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_kinesis/)[Amazon Kinesis Streams](https://docs.localstack.cloud/references/coverage/coverage_kinesis/) | ✅ | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_firehose/)[Amazon Kinesis Data Firehose](https://docs.localstack.cloud/references/coverage/coverage_firehose/) | ✅ | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_opensearch/)[Amazon OpenSearch](https://docs.localstack.cloud/references/coverage/coverage_opensearch/) | ✅ | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_redshift/)[Amazon Redshift](https://docs.localstack.cloud/references/coverage/coverage_redshift/) | ✅ | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_athena/)[Amazon Athena](https://docs.localstack.cloud/references/coverage/coverage_athena/) | ❌ | ❌ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_emr/)[Amazon EMR](https://docs.localstack.cloud/references/coverage/coverage_emr/) | ❌ | ❌ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_emr-serverless/)[Amazon EMR Serverless](https://docs.localstack.cloud/references/coverage/coverage_emr-serverless/) | ❌ | ❌ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_glue/)[AWS Glue](https://docs.localstack.cloud/references/coverage/coverage_glue/) | ❌ | ❌ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_redshift-data/)[Amazon Redshift Data API](https://docs.localstack.cloud/references/coverage/coverage_redshift-data/) | ❌ | ❌ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_lakeformation/)[AWS Lake Formation](https://docs.localstack.cloud/references/coverage/coverage_lakeformation/) | ❌ | ❌ | ✅ |
-| [](https://docs.localstack.cloud/user-guide/aws/msk/)[Amazon Managed Streaming for Apache Kafka](https://docs.localstack.cloud/user-guide/aws/msk/) | ❌ | ❌ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/user-guide/aws/kinesisanalyticsv2/)[Amazon Managed Service for Apache Flink](https://docs.localstack.cloud/user-guide/aws/kinesisanalyticsv2/) | ❌ | ❌ | ✅ | ✅ |
-| Application Integration |  |  |  |  |
-| [](https://docs.localstack.cloud/user-guide/aws/swf/)[Amazon Simple Workflow Service (SWF)](https://docs.localstack.cloud/user-guide/aws/swf/) | ✅ | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/user-guide/aws/sns/)[Amazon Simple Notification Service (SNS)](https://docs.localstack.cloud/user-guide/aws/sns/) | ✅ | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/user-guide/aws/sqs/)[Amazon Simple Queue Service (SQS)](https://docs.localstack.cloud/user-guide/aws/sqs/) | ✅ | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/user-guide/aws/stepfunctions/)[AWS Step Functions](https://docs.localstack.cloud/user-guide/aws/stepfunctions/) | ✅ | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/user-guide/aws/events/)[Amazon EventBridge](https://docs.localstack.cloud/user-guide/aws/events/) | ✅ | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/user-guide/aws/scheduler/)[Amazon EventBridge Scheduler](https://docs.localstack.cloud/user-guide/aws/scheduler/) | ✅ | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/user-guide/aws/mq/)[Amazon MQ](https://docs.localstack.cloud/user-guide/aws/mq/) | ❌ | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/user-guide/aws/pipes/)[Amazon EventBridge Pipes](https://docs.localstack.cloud/user-guide/aws/pipes/) | ❌ | ❌ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/user-guide/aws/mwaa/)[Amazon Managed Workflows for Apache Airflow](https://docs.localstack.cloud/user-guide/aws/mwaa/) | ❌ | ❌ | ✅ | ✅ |
-| BlockChain |  |  |  |  |
-| [](https://docs.localstack.cloud/user-guide/aws/managedblockchain/)[Amazon Managed Blockchain](https://docs.localstack.cloud/user-guide/aws/managedblockchain/) | ❌ | ❌ | ✅ | ✅ |
-| Business Applications |  |  |  |  |
-| [](https://docs.localstack.cloud/user-guide/aws/ses/)[Amazon Simple Email Service (SES)](https://docs.localstack.cloud/user-guide/aws/ses/) | ✅ | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/user-guide/aws/ses/)[Amazon Simple Email Service API V2 (SES)](https://docs.localstack.cloud/user-guide/aws/ses/) | ❌ | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/user-guide/aws/pinpoint/)[Amazon Pinpoint](https://docs.localstack.cloud/user-guide/aws/pinpoint/) | ❌ | ❌ | ✅ | ✅ |
-| Cloud Financial Management |  |  |  |  |
-| [](https://docs.localstack.cloud/user-guide/aws/ce/)[AWS Cost Explorer](https://docs.localstack.cloud/user-guide/aws/ce/) | ❌ | ❌ | ✅ | ✅ |
-| Compute |  |  |  |
-| [](https://docs.localstack.cloud/user-guide/aws/ec2/)[Amazon Elastic Compute Cloud (EC2)](https://docs.localstack.cloud/user-guide/aws/ec2/) | ✅ | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/user-guide/aws/lambda/)[AWS Lambda](https://docs.localstack.cloud/user-guide/aws/lambda/) | ✅ | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/user-guide/aws/batch/)[AWS Batch](https://docs.localstack.cloud/user-guide/aws/batch/) | ❌ | ❌ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/user-guide/aws/elasticbeanstalk/)[AWS Elastic Beanstalk](https://docs.localstack.cloud/user-guide/aws/elasticbeanstalk/) | ❌ | ❌ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/user-guide/aws/serverlessrepo/)[AWS Serverless Application Repository](https://docs.localstack.cloud/user-guide/aws/serverlessrepo/) | ❌ | ❌ | ✅ | ✅ |
-| Containers |  |  |  |  |
-| [](https://docs.localstack.cloud/user-guide/aws/ecr/)[Amazon Elastic Container Registry (ECR)](https://docs.localstack.cloud/user-guide/aws/ecr/) | ❌ | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/user-guide/aws/ecr/)[Amazon Elastic Container Service (ECS)](https://docs.localstack.cloud/user-guide/aws/ecr/) | ❌ | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/user-guide/aws/eks/)[Amazon Elastic Kubernetes Service (EKS)](https://docs.localstack.cloud/user-guide/aws/eks/) | ❌ | ❌ | ✅ | ✅ |
+| AWS Services | Hobby | Base | Ultimate | Enterprise | Student |
+| --- | --- | --- | --- | --- | --- |
+| Analytics |  |  |  |  |  |
+| [Amazon ElasticSearch](https://docs.localstack.cloud/user-guide/aws/es/) | ✅ | ✅ | ✅ | ✅ | ✅ |
+| [Amazon Kinesis Streams](https://docs.localstack.cloud/references/coverage/coverage_kinesis/) | ✅ | ✅ | ✅ | ✅ | ✅ |
+| [Amazon Kinesis Data Firehose](https://docs.localstack.cloud/references/coverage/coverage_firehose/) | ✅ | ✅ | ✅ | ✅ | ✅ |
+| [Amazon OpenSearch](https://docs.localstack.cloud/references/coverage/coverage_opensearch/) | ✅ | ✅ | ✅ | ✅ | ✅ |
+| [Amazon Redshift](https://docs.localstack.cloud/references/coverage/coverage_redshift/) | ✅ | ✅ | ✅ | ✅ | ✅ |
+| [Amazon Athena](https://docs.localstack.cloud/references/coverage/coverage_athena/) | ❌ | ❌ | ✅ | ✅ | ✅ |
+| [Amazon EMR](https://docs.localstack.cloud/references/coverage/coverage_emr/) | ❌ | ❌ | ✅ | ✅ | ✅ |
+| [Amazon EMR Serverless](https://docs.localstack.cloud/references/coverage/coverage_emr-serverless/) | ❌ | ❌ | ✅ | ✅ | ✅ |
+| [AWS Glue](https://docs.localstack.cloud/references/coverage/coverage_glue/) | ❌ | ❌ | ✅ | ✅ | ✅ |
+| [Amazon Redshift Data API](https://docs.localstack.cloud/references/coverage/coverage_redshift-data/) | ❌ | ❌ | ✅ | ✅ | ✅ |
+| [AWS Lake Formation](https://docs.localstack.cloud/references/coverage/coverage_lakeformation/) | ❌ | ❌ | ✅ | ✅ | ✅ |
+| [Amazon Managed Streaming for Apache Kafka](https://docs.localstack.cloud/user-guide/aws/msk/) | ❌ | ❌ | ✅ | ✅ | ✅ |
+| [Amazon Managed Service for Apache Flink](https://docs.localstack.cloud/user-guide/aws/kinesisanalyticsv2/) | ❌ | ❌ | ✅ | ✅ | ✅ |
+| Application Integration |  |  |  |  |  |
+| [Amazon Simple Workflow Service (SWF)](https://docs.localstack.cloud/user-guide/aws/swf/) | ✅ | ✅ | ✅ | ✅ | ✅ |
+| [Amazon Simple Notification Service (SNS)](https://docs.localstack.cloud/user-guide/aws/sns/) | ✅ | ✅ | ✅ | ✅ | ✅ |
+| [Amazon Simple Queue Service (SQS)](https://docs.localstack.cloud/user-guide/aws/sqs/) | ✅ | ✅ | ✅ | ✅ | ✅ |
+| [AWS Step Functions](https://docs.localstack.cloud/user-guide/aws/stepfunctions/) | ✅ | ✅ | ✅ | ✅ | ✅ |
+| [Amazon EventBridge](https://docs.localstack.cloud/user-guide/aws/events/) | ✅ | ✅ | ✅ | ✅ | ✅ |
+| [Amazon EventBridge Scheduler](https://docs.localstack.cloud/user-guide/aws/scheduler/) | ✅ | ✅ | ✅ | ✅ | ✅ |
+| [Amazon MQ](https://docs.localstack.cloud/user-guide/aws/mq/) | ❌ | ✅ | ✅ | ✅ | ✅ |
+| [Amazon EventBridge Pipes](https://docs.localstack.cloud/user-guide/aws/pipes/) | ❌ | ❌ | ✅ | ✅ | ✅ |
+| [Amazon Managed Workflows for Apache Airflow](https://docs.localstack.cloud/user-guide/aws/mwaa/) | ❌ | ❌ | ✅ | ✅ | ✅ |
+| BlockChain |  |  |  |  |  |
+| [Amazon Managed Blockchain](https://docs.localstack.cloud/user-guide/aws/managedblockchain/) | ❌ | ❌ | ✅ | ✅ | ✅ |
+| Business Applications |  |  |  |  |  |
+| [Amazon Simple Email Service (SES)](https://docs.localstack.cloud/user-guide/aws/ses/) | ✅ | ✅ | ✅ | ✅ | ✅ |
+| [Amazon Simple Email Service API V2 (SES)](https://docs.localstack.cloud/user-guide/aws/ses/) | ❌ | ✅ | ✅ | ✅ | ✅ |
+| [Amazon Pinpoint](https://docs.localstack.cloud/user-guide/aws/pinpoint/) | ❌ | ❌ | ✅ | ✅ | ✅ |
+| Cloud Financial Management |  |  |  |  |  |
+| [AWS Cost Explorer](https://docs.localstack.cloud/user-guide/aws/ce/) | ❌ | ❌ | ✅ | ✅ | ✅ |
+| Compute |  |  |  |  |  |
+| [Amazon Elastic Compute Cloud (EC2)](https://docs.localstack.cloud/user-guide/aws/ec2/) | ✅ | ✅ | ✅ | ✅ | ✅ |
+| [AWS Lambda](https://docs.localstack.cloud/user-guide/aws/lambda/) | ✅ | ✅ | ✅ | ✅ | ✅ |
+| [AWS Batch](https://docs.localstack.cloud/user-guide/aws/batch/) | ❌ | ❌ | ✅ | ✅ | ✅ |
+| [AWS Elastic Beanstalk](https://docs.localstack.cloud/user-guide/aws/elasticbeanstalk/) | ❌ | ❌ | ✅ | ✅ | ✅ |
+| [AWS Serverless Application Repository](https://docs.localstack.cloud/user-guide/aws/serverlessrepo/) | ❌ | ❌ | ✅ | ✅ | ✅ |
+| Containers |  |  |  |  |  |
+| [Amazon Elastic Container Registry (ECR)](https://docs.localstack.cloud/user-guide/aws/ecr/) | ❌ | ✅ | ✅ | ✅ | ✅ |
+| [Amazon Elastic Container Service (ECS)](https://docs.localstack.cloud/user-guide/aws/ecr/) | ❌ | ✅ | ✅ | ✅ | ✅ |
+| [Amazon Elastic Kubernetes Service (EKS)](https://docs.localstack.cloud/user-guide/aws/eks/) | ❌ | ❌ | ✅ | ✅ | ✅ |
 | Customer Enablement |  |  |  |  |
-| [](https://docs.localstack.cloud/user-guide/aws/support/)[AWS Support API](https://docs.localstack.cloud/user-guide/aws/support/) | ✅ | ✅ | ✅ | ✅ |
-| DataBases |  |  |  |  |
-| [](https://docs.localstack.cloud/user-guide/aws/dynamodb/)[Amazon DynamoDB](https://docs.localstack.cloud/user-guide/aws/dynamodb/) | ✅ | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/user-guide/aws/dynamodbstreams/)[Amazon DynamoDB Streams](https://docs.localstack.cloud/user-guide/aws/dynamodbstreams/) | ✅ | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/user-guide/aws/elasticache/)[Amazon ElastiCache](https://docs.localstack.cloud/user-guide/aws/elasticache/) | ❌ | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/user-guide/aws/rds/)[Amazon Relational Database Service (RDS)](https://docs.localstack.cloud/user-guide/aws/rds/) | ❌ | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_rds-data/)[Amazon RDS Data API](https://docs.localstack.cloud/references/coverage/coverage_rds-data/) | ❌ | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/user-guide/aws/docdb/)[Amazon DocumentDB](https://docs.localstack.cloud/user-guide/aws/docdb/) | ❌ | ❌ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/user-guide/aws/memorydb/)[Amazon MemoryDB](https://docs.localstack.cloud/user-guide/aws/memorydb/) | ❌ | ❌ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/user-guide/aws/neptune/)[Amazon Neptune](https://docs.localstack.cloud/user-guide/aws/neptune/) | ❌ | ❌ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/user-guide/aws/timestream/)[Amazon Timestream](https://docs.localstack.cloud/user-guide/aws/timestream/) | ❌ | ❌ | ✅ | ✅ |
-| Developer Tools |  |  |  |  |
-| [](https://docs.localstack.cloud/references/coverage/coverage_codecommit/)[AWS CodeCommit](https://docs.localstack.cloud/references/coverage/coverage_codecommit/) | ❌ | ✅ | ✅ | ✅ |
-| AWS CodeArtifact | ❌ | ✅ | ✅ | ✅ |
-| AWS CodeBuild | ❌ | ✅ | ✅ | ✅ |
-| AWS CodeConnections | ❌ | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/user-guide/aws/fis/)[AWS Fault Injection Service](https://docs.localstack.cloud/user-guide/aws/fis/) | ❌ | ❌ | ✅ | ✅ |
-| AWS CodeDeploy | ❌ | ❌ | ✅ | ✅ |
-| AWS CodePipeline | ❌ | ❌ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/user-guide/aws/xray/)[AWS X-Ray](https://docs.localstack.cloud/user-guide/aws/xray/) | ❌ | ❌ | ✅ | ✅ |
-| Frontend Web & Mobile Services |  |  |  |  |
-| [](https://docs.localstack.cloud/user-guide/aws/amplify/)[AWS Amplify](https://docs.localstack.cloud/user-guide/aws/amplify/) | ❌ | ❌ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/user-guide/aws/appsync/)[AWS AppSync](https://docs.localstack.cloud/user-guide/aws/appsync/) | ❌ | ❌ | ✅ | ✅ |
-| IoT |  |  |  |  |
-| [](https://docs.localstack.cloud/user-guide/aws/iot/)[AWS IoT](https://docs.localstack.cloud/user-guide/aws/iot/) | ❌ | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/user-guide/aws/iotwireless/)[AWS IoT Wireless](https://docs.localstack.cloud/user-guide/aws/iotwireless/) | ❌ | ❌ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/user-guide/aws/iotdata/)[AWS IoT Data](https://docs.localstack.cloud/user-guide/aws/iotdata/) | ❌ | ❌ | ✅ | ✅ |
-| Management & Governance |  |  |  |  |
-| [](https://docs.localstack.cloud/user-guide/aws/cloudformation/)[AWS CloudFormation](https://docs.localstack.cloud/user-guide/aws/cloudformation/) | ✅ | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/user-guide/aws/cloudwatch/)[Amazon CloudWatch Metrics](https://docs.localstack.cloud/user-guide/aws/cloudwatch/) | ✅ | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/user-guide/aws/logs/)[Amazon CloudWatch Logs](https://docs.localstack.cloud/user-guide/aws/logs/) | ✅ | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/user-guide/aws/resource_groups/)[AWS Resource Groups](https://docs.localstack.cloud/user-guide/aws/resource_groups/) | ✅ | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_ssm/)[AWS Systems Manager Parameter Store](https://docs.localstack.cloud/references/coverage/coverage_ssm/) | ✅ | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_cloudcontrol/)[AWS Cloud Control](https://docs.localstack.cloud/references/coverage/coverage_cloudcontrol/) | ✅ | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_application-autoscaling/)[AWS Application Auto Scaling](https://docs.localstack.cloud/references/coverage/coverage_application-autoscaling/) | ❌ | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_autoscaling/)[Amazon EC2 Auto Scaling](https://docs.localstack.cloud/references/coverage/coverage_autoscaling/) | ❌ | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_config/)[AWS Config](https://docs.localstack.cloud/references/coverage/coverage_config/) | ✅ | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_appconfig/)[AWS AppConfig](https://docs.localstack.cloud/references/coverage/coverage_appconfig/) | ❌ | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_cloudtrail/)[AWS CloudTrail](https://docs.localstack.cloud/references/coverage/coverage_cloudtrail/) | ❌ | ❌ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_account/)[AWS Account Management](https://docs.localstack.cloud/references/coverage/coverage_account/) | ❌ | ❌ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_organizations/)[AWS Organizations](https://docs.localstack.cloud/references/coverage/coverage_organizations/) | ❌ | ❌ | ✅ | ✅ |
-| Media |  |  |  |  |
-| [](https://docs.localstack.cloud/references/coverage/coverage_mediaconvert/)[AWS Elemental MediaConvert](https://docs.localstack.cloud/references/coverage/coverage_mediaconvert/) | ❌ | ❌ | ✅ | ✅ |
-| Migration & Transfer |  |  |  |  |
-| [](https://docs.localstack.cloud/references/coverage/coverage_transfer/)[AWS Transfer Family](https://docs.localstack.cloud/references/coverage/coverage_transfer/) | ❌ | ❌ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_dms/)[AWS Database Migration Service](https://docs.localstack.cloud/references/coverage/coverage_dms/) | ❌ | ❌ | ✅ | ✅ |
-| Machine Learning |  |  |  |  |
-| [](https://docs.localstack.cloud/references/coverage/coverage_transcribe/)[Amazon Transcribe](https://docs.localstack.cloud/references/coverage/coverage_transcribe/) | ✅ | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_textract/)[Amazon Textract](https://docs.localstack.cloud/references/coverage/coverage_textract/) | ❌ | ❌ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_sagemaker/)[Amazon SageMaker AI](https://docs.localstack.cloud/references/coverage/coverage_sagemaker/) | ❌ | ❌ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_sagemaker-runtime/)[Amazon SageMaker Runtime](https://docs.localstack.cloud/references/coverage/coverage_sagemaker-runtime/) | ❌ | ❌ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_bedrock/)[Amazon Bedrock](https://docs.localstack.cloud/references/coverage/coverage_bedrock/) | ❌ | ❌ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_bedrock-runtime/)[Amazon Bedrock Runtime](https://docs.localstack.cloud/references/coverage/coverage_bedrock-runtime/) | ❌ | ❌ | ✅ | ✅ |
-| Networking & Content Delivery |  |  |  |  |
-| [](https://docs.localstack.cloud/references/coverage/coverage_route53/)[Amazon Route 53](https://docs.localstack.cloud/references/coverage/coverage_route53/) | ✅ | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/user-guide/aws/route53resolver/)[Amazon Route 53 Resolver](https://docs.localstack.cloud/user-guide/aws/route53resolver/) | ✅ | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_apigateway/)[Amazon API Gateway REST API](https://docs.localstack.cloud/references/coverage/coverage_apigateway/) | ✅ | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_apigatewayv2/)[Amazon API Gateway HTTP and WebSocket API](https://docs.localstack.cloud/references/coverage/coverage_apigatewayv2/) | ❌ | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_apigatewaymanagementapi/)[Amazon API Gateway Management API](https://docs.localstack.cloud/references/coverage/coverage_apigatewaymanagementapi/) | ❌ | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_elb/)[Elastic Load Balancing](https://docs.localstack.cloud/references/coverage/coverage_elb/) | ❌ | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_elbv2/)[Elastic Load Balancing v2 (Application, Network)](https://docs.localstack.cloud/references/coverage/coverage_elbv2/) | ❌ | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_cloudfront/)[Amazon CloudFront](https://docs.localstack.cloud/references/coverage/coverage_cloudfront/) | ❌ | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_servicediscovery/)[AWS Cloud Map](https://docs.localstack.cloud/references/coverage/coverage_servicediscovery/) | ❌ | ❌ | ✅ | ✅ |
-| Security, Identity & Compliance |  |  |  |  |
-| [](https://docs.localstack.cloud/references/coverage/coverage_kms/)[AWS Key Management Service (KMS)](https://docs.localstack.cloud/references/coverage/coverage_kms/) | ✅ | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_secretsmanager/)[AWS Secrets Manager](https://docs.localstack.cloud/references/coverage/coverage_secretsmanager/) | ✅ | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_sts/)[AWS Security Token Service](https://docs.localstack.cloud/references/coverage/coverage_sts/) | ✅ | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_acm/)[AWS Certificate Manager](https://docs.localstack.cloud/references/coverage/coverage_acm/) | ✅ | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_cognito-identity/)[Amazon Cognito Identity Pools](https://docs.localstack.cloud/references/coverage/coverage_cognito-identity/) | ❌ | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_cognito-idp/)[Amazon Cognito User Pools](https://docs.localstack.cloud/references/coverage/coverage_cognito-idp/) | ❌ | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/aws/services/verifiedpermissions/)[Amazon Verified Permissions](https://docs.localstack.cloud/aws/services/verifiedpermissions/) | ❌ | ❌ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_acm-pca/)[AWS Private Certificate Authority](https://docs.localstack.cloud/references/coverage/coverage_acm-pca/) | ❌ | ❌ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_wafv2/)[AWS Web Application Firewall (WAF)](https://docs.localstack.cloud/references/coverage/coverage_wafv2/) | ❌ | ❌ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_iam/)[AWS Identity and Access Management (IAM)](https://docs.localstack.cloud/references/coverage/coverage_iam/) | ✅ | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_identitystore/)[AWS IAM Identity Store API](https://docs.localstack.cloud/references/coverage/coverage_identitystore/) | ❌ | ❌ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_sso-admin/)[AWS IAM Identity Center](https://docs.localstack.cloud/references/coverage/coverage_sso-admin/) | ❌ | ❌ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_ram/)[AWS Resource Access Manager (RAM)](https://docs.localstack.cloud/references/coverage/coverage_ram/) | ❌ | ❌ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_shield/)[AWS Shield](https://docs.localstack.cloud/references/coverage/coverage_shield/) | ❌ | ❌ | ✅ | ✅ |
-| Storage |  |  |  |  |
-| [](https://docs.localstack.cloud/references/coverage/coverage_s3/)[Amazon S3](https://docs.localstack.cloud/references/coverage/coverage_s3/) | ✅ | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_s3control/)[Amazon S3 Control](https://docs.localstack.cloud/references/coverage/coverage_s3control/) | ✅ | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_glacier/)[Amazon S3 Glacier](https://docs.localstack.cloud/references/coverage/coverage_glacier/) | ❌ | ❌ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/user-guide/aws/backup/)[AWS Backup](https://docs.localstack.cloud/user-guide/aws/backup/) | ❌ | ❌ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_efs/)[Amazon EFS](https://docs.localstack.cloud/references/coverage/coverage_efs/) | ❌ | ❌ | ✅ | ✅ |
-| Emulator Enhancements |  |  |  |  |
-| [Extensions](/aws/tooling/extensions/) | ✅ | ✅ | ✅ | ✅ |
-| CI Credits | ❌ | ✅ 300 credits monthly per workspace | ✅ 1000 credits monthly per workspace | ✅ 1,000 CI/CD credits / month |
-| Stack Insights | ❌ | ✅ For all supported services | ✅ For all supported services | ✅ For all supported services |
-| Local state persistence | ❌ | ✅ | ✅ | ✅ |
-| Cloud-based state persistence via Cloud pods | ❌ | ✅ 300 MB, lifetime per workspace | ✅ 3 GB, lifetime per workspace | ✅ 500 MB cloud pod storage (lifetime) |
-| [Cloud Sandbox](https://docs.localstack.cloud/user-guide/cloud-sandbox/) previews & ephemeral instances | ❌ | ✅ 100 minutes monthly per workspace | ✅ 500 minutes monthly per workspace | ❌ |
-| AWS Replicator | ❌ | ❌ | ✅ | ✅ |
-| IAM Policy Enforcement | ❌ | ✅ | ✅ | ✅ |
-| IAM Policy Streams | ❌ | ❌ | ✅ | ✅ |
-| Emulator Compliance Pack | ❌ | ❌ | ❌ | ❌ |
-| User Security Pack | ❌ | ❌ | ❌ | ❌ |
-| [Chaos Engineering](https://docs.localstack.cloud/user-guide/chaos-engineering/) | ❌ | ❌ | ✅ Add-on | ✅ |
-| Kubernetes Pack ([Operator](https://docs.localstack.cloud/user-guide/localstack-enterprise/k8s-operator/) & [Executor](https://docs.localstack.cloud/user-guide/localstack-enterprise/kubernetes-executor/)) | ❌ | ❌ | ✅ Add-on | ✅ |
+| [AWS Support API](https://docs.localstack.cloud/user-guide/aws/support/) | ✅ | ✅ | ✅ | ✅ | ✅ |
+| DataBases |  |  |  |  |  |
+| [Amazon DynamoDB](https://docs.localstack.cloud/user-guide/aws/dynamodb/) | ✅ | ✅ | ✅ | ✅ |
+| [Amazon DynamoDB Streams](https://docs.localstack.cloud/user-guide/aws/dynamodbstreams/) | ✅ | ✅ | ✅ | ✅ | ✅ |
+| [Amazon ElastiCache](https://docs.localstack.cloud/user-guide/aws/elasticache/) | ❌ | ✅ | ✅ | ✅ | ✅ |
+| [Amazon Relational Database Service (RDS)](https://docs.localstack.cloud/user-guide/aws/rds/) | ❌ | ✅ | ✅ | ✅ | ✅ |
+| [Amazon RDS Data API](https://docs.localstack.cloud/references/coverage/coverage_rds-data/) | ❌ | ✅ | ✅ | ✅ | ✅ |
+| [Amazon DocumentDB](https://docs.localstack.cloud/user-guide/aws/docdb/) | ❌ | ❌ | ✅ | ✅ | ✅ |
+| [Amazon MemoryDB](https://docs.localstack.cloud/user-guide/aws/memorydb/) | ❌ | ❌ | ✅ | ✅ | ✅ |
+| [Amazon Neptune](https://docs.localstack.cloud/user-guide/aws/neptune/) | ❌ | ❌ | ✅ | ✅ | ✅ |
+| [Amazon Timestream](https://docs.localstack.cloud/user-guide/aws/timestream/) | ❌ | ❌ | ✅ | ✅ | ✅ |
+| Developer Tools |  |  |  |  |  |
+| [AWS CodeCommit](https://docs.localstack.cloud/references/coverage/coverage_codecommit/) | ❌ | ✅ | ✅ | ✅ | ✅ |
+| AWS CodeArtifact | ❌ | ✅ | ✅ | ✅ | ✅ |
+| AWS CodeBuild | ❌ | ✅ | ✅ | ✅ | ✅ |
+| AWS CodeConnections | ❌ | ✅ | ✅ | ✅ | ✅ |
+| [AWS Fault Injection Service](https://docs.localstack.cloud/user-guide/aws/fis/) | ❌ | ❌ | ✅ | ✅ | ✅ |
+| AWS CodeDeploy | ❌ | ❌ | ✅ | ✅ | ✅ |
+| AWS CodePipeline | ❌ | ❌ | ✅ | ✅ | ✅ |
+| [AWS X-Ray](https://docs.localstack.cloud/user-guide/aws/xray/) | ❌ | ❌ | ✅ | ✅ | ✅ |
+| Frontend Web & Mobile Services |  |  |  |  |  |
+| [AWS Amplify](https://docs.localstack.cloud/user-guide/aws/amplify/) | ❌ | ❌ | ✅ | ✅ | ✅ |
+| [AWS AppSync](https://docs.localstack.cloud/user-guide/aws/appsync/) | ❌ | ❌ | ✅ | ✅ | ✅ |
+| IoT |  |  |  |  |  |
+| [AWS IoT](https://docs.localstack.cloud/user-guide/aws/iot/) | ❌ | ✅ | ✅ | ✅ | ✅ |
+| [AWS IoT Wireless](https://docs.localstack.cloud/user-guide/aws/iotwireless/) | ❌ | ❌ | ✅ | ✅ | ✅ |
+| [AWS IoT Data](https://docs.localstack.cloud/user-guide/aws/iotdata/) | ❌ | ❌ | ✅ | ✅ | ✅ |
+| Management & Governance |  |  |  |  |  |
+| [AWS CloudFormation](https://docs.localstack.cloud/user-guide/aws/cloudformation/) | ✅ | ✅ | ✅ | ✅ | ✅ |
+| [Amazon CloudWatch Metrics](https://docs.localstack.cloud/user-guide/aws/cloudwatch/) | ✅ | ✅ | ✅ | ✅ | ✅ |
+| [Amazon CloudWatch Logs](https://docs.localstack.cloud/user-guide/aws/logs/) | ✅ | ✅ | ✅ | ✅ | ✅ |
+| [AWS Resource Groups](https://docs.localstack.cloud/user-guide/aws/resource_groups/) | ✅ | ✅ | ✅ | ✅ | ✅ |
+| [AWS Systems Manager Parameter Store](https://docs.localstack.cloud/references/coverage/coverage_ssm/) | ✅ | ✅ | ✅ | ✅ | ✅ |
+| [AWS Cloud Control](https://docs.localstack.cloud/references/coverage/coverage_cloudcontrol/) | ✅ | ✅ | ✅ | ✅ | ✅ |
+| [AWS Application Auto Scaling](https://docs.localstack.cloud/references/coverage/coverage_application-autoscaling/) | ❌ | ✅ | ✅ | ✅ | ✅ |
+| [Amazon EC2 Auto Scaling](https://docs.localstack.cloud/references/coverage/coverage_autoscaling/) | ❌ | ✅ | ✅ | ✅ | ✅ |
+| [AWS Config](https://docs.localstack.cloud/references/coverage/coverage_config/) | ✅ | ✅ | ✅ | ✅ | ✅ |
+| [AWS AppConfig](https://docs.localstack.cloud/references/coverage/coverage_appconfig/) | ❌ | ✅ | ✅ | ✅ | ✅ |
+| [AWS CloudTrail](https://docs.localstack.cloud/references/coverage/coverage_cloudtrail/) | ❌ | ❌ | ✅ | ✅ | ✅ |
+| [AWS Account Management](https://docs.localstack.cloud/references/coverage/coverage_account/) | ❌ | ❌ | ✅ | ✅ | ✅ |
+| [AWS Organizations](https://docs.localstack.cloud/references/coverage/coverage_organizations/) | ❌ | ❌ | ✅ | ✅ | ✅ |
+| Media |  |  |  |  |  |
+| [AWS Elemental MediaConvert](https://docs.localstack.cloud/references/coverage/coverage_mediaconvert/) | ❌ | ❌ | ✅ | ✅ | ✅ |
+| Migration & Transfer |  |  |  |  |  |
+| [AWS Transfer Family](https://docs.localstack.cloud/references/coverage/coverage_transfer/) | ❌ | ❌ | ✅ | ✅ | ✅ |
+| [AWS Database Migration Service](https://docs.localstack.cloud/references/coverage/coverage_dms/) | ❌ | ❌ | ✅ | ✅ | ✅ |
+| Machine Learning |  |  |  |  |  |
+| [Amazon Transcribe](https://docs.localstack.cloud/references/coverage/coverage_transcribe/) | ✅ | ✅ | ✅ | ✅ | ✅ |
+| [Amazon Textract](https://docs.localstack.cloud/references/coverage/coverage_textract/) | ❌ | ❌ | ✅ | ✅ | ✅ |
+| [Amazon SageMaker AI](https://docs.localstack.cloud/references/coverage/coverage_sagemaker/) | ❌ | ❌ | ✅ | ✅ | ✅ |
+| [Amazon SageMaker Runtime](https://docs.localstack.cloud/references/coverage/coverage_sagemaker-runtime/) | ❌ | ❌ | ✅ | ✅ | ✅ |
+| [Amazon Bedrock](https://docs.localstack.cloud/references/coverage/coverage_bedrock/) | ❌ | ❌ | ✅ | ✅ | ✅ |
+| [Amazon Bedrock Runtime](https://docs.localstack.cloud/references/coverage/coverage_bedrock-runtime/) | ❌ | ❌ | ✅ | ✅ | ✅ |
+| Networking & Content Delivery |  |  |  |  |  |
+| [Amazon Route 53](https://docs.localstack.cloud/references/coverage/coverage_route53/) | ✅ | ✅ | ✅ | ✅ | ✅ |
+| [Amazon Route 53 Resolver](https://docs.localstack.cloud/user-guide/aws/route53resolver/) | ✅ | ✅ | ✅ | ✅ | ✅ |
+| [Amazon API Gateway REST API](https://docs.localstack.cloud/references/coverage/coverage_apigateway/) | ✅ | ✅ | ✅ | ✅ | ✅ |
+| [Amazon API Gateway HTTP and WebSocket API](https://docs.localstack.cloud/references/coverage/coverage_apigatewayv2/) | ❌ | ✅ | ✅ | ✅ | ✅ |
+| [Amazon API Gateway Management API](https://docs.localstack.cloud/references/coverage/coverage_apigatewaymanagementapi/) | ❌ | ✅ | ✅ | ✅ | ✅ |
+| [Elastic Load Balancing](https://docs.localstack.cloud/references/coverage/coverage_elb/) | ❌ | ✅ | ✅ | ✅ | ✅ |
+| [Elastic Load Balancing v2 (Application, Network)](https://docs.localstack.cloud/references/coverage/coverage_elbv2/) | ❌ | ✅ | ✅ | ✅ | ✅ |
+| [Amazon CloudFront](https://docs.localstack.cloud/references/coverage/coverage_cloudfront/) | ❌ | ✅ | ✅ | ✅ | ✅ |
+| [AWS Cloud Map](https://docs.localstack.cloud/references/coverage/coverage_servicediscovery/) | ❌ | ❌ | ✅ | ✅ | ✅ |
+| Security, Identity & Compliance |  |  |  |  |  |
+| [AWS Key Management Service (KMS)](https://docs.localstack.cloud/references/coverage/coverage_kms/) | ✅ | ✅ | ✅ | ✅ | ✅ |
+| [AWS Secrets Manager](https://docs.localstack.cloud/references/coverage/coverage_secretsmanager/) | ✅ | ✅ | ✅ | ✅ | ✅ |
+| [AWS Security Token Service](https://docs.localstack.cloud/references/coverage/coverage_sts/) | ✅ | ✅ | ✅ | ✅ | ✅ |
+| [AWS Certificate Manager](https://docs.localstack.cloud/references/coverage/coverage_acm/) | ✅ | ✅ | ✅ | ✅ | ✅ |
+| [Amazon Cognito Identity Pools](https://docs.localstack.cloud/references/coverage/coverage_cognito-identity/) | ❌ | ✅ | ✅ | ✅ | ✅ |
+| [Amazon Cognito User Pools](https://docs.localstack.cloud/references/coverage/coverage_cognito-idp/) | ❌ | ✅ | ✅ | ✅ | ✅ |
+| [Amazon Verified Permissions](https://docs.localstack.cloud/aws/services/verifiedpermissions/) | ❌ | ❌ | ✅ | ✅ | ✅ |
+| [AWS Private Certificate Authority](https://docs.localstack.cloud/references/coverage/coverage_acm-pca/) | ❌ | ❌ | ✅ | ✅ | ✅ |
+| [AWS Web Application Firewall (WAF)](https://docs.localstack.cloud/references/coverage/coverage_wafv2/) | ❌ | ❌ | ✅ | ✅ | ✅ |
+| [AWS Identity and Access Management (IAM)](https://docs.localstack.cloud/references/coverage/coverage_iam/) | ✅ | ✅ | ✅ | ✅ | ✅ |
+| [AWS IAM Identity Store API](https://docs.localstack.cloud/references/coverage/coverage_identitystore/) | ❌ | ❌ | ✅ | ✅ | ✅ |
+| [AWS IAM Identity Center](https://docs.localstack.cloud/references/coverage/coverage_sso-admin/) | ❌ | ❌ | ✅ | ✅ | ✅ |
+| [AWS Resource Access Manager (RAM)](https://docs.localstack.cloud/references/coverage/coverage_ram/) | ❌ | ❌ | ✅ | ✅ | ✅ |
+| [AWS Shield](https://docs.localstack.cloud/references/coverage/coverage_shield/) | ❌ | ❌ | ✅ | ✅ | ✅ |
+| Storage |  |  |  |  |  |
+| [Amazon S3](https://docs.localstack.cloud/references/coverage/coverage_s3/) | ✅ | ✅ | ✅ | ✅ | ✅ |
+| [Amazon S3 Control](https://docs.localstack.cloud/references/coverage/coverage_s3control/) | ✅ | ✅ | ✅ | ✅ | ✅ |
+| [Amazon S3 Glacier](https://docs.localstack.cloud/references/coverage/coverage_glacier/) | ❌ | ❌ | ✅ | ✅ | ✅ |
+| [AWS Backup](https://docs.localstack.cloud/user-guide/aws/backup/) | ❌ | ❌ | ✅ | ✅ | ✅ |
+| [Amazon EFS](https://docs.localstack.cloud/references/coverage/coverage_efs/) | ❌ | ❌ | ✅ | ✅ | ✅ |
+| Emulator Enhancements |  |  |  |  |  |
+| Personal Developer Sandbox | 1 | Per License | Per License | Per License | 1 | 1 |
+| Testing in CI  | ✅ | ✅ | ✅ | ✅ | ✅ |
+Preview: Debug and Inspect through Event Studio | ❌|Preview|Preview|Preview|❌|
+[Extensions](https://docs.localstack.cloud/aws/tooling/extensions/) | ✅ | ✅ | ✅ | ✅ | ✅ |
+| Stack Insights | ❌ | ✅ | ✅ | ✅ | ✅ |
+| Local state persistence | ❌ | ✅ | ✅ | ✅ | ✅|
+| Cloud-based state persistence via Cloud pods | ❌ | ✅ 300 MB, lifetime per workspace | ✅ 3 GB, lifetime per workspace | ✅ 5 GB per user, lifetime | ✅ 500 MB cloud pod storage (lifetime) |
+| [Cloud Sandbox](https://docs.localstack.cloud/user-guide/cloud-sandbox/) previews & ephemeral instances | ❌ | ✅ 100 minutes monthly per workspace | ✅ 500 minutes monthly per workspace | ✅ 3000 minutes monthly per workspace | ❌ |
+| AWS Replicator | ❌ | ❌ | ✅ | ✅ | ✅
+| IAM Policy Enforcement | ❌ | ✅ | ✅ | ✅ | ✅
+| IAM Policy Streams | ❌ | ❌ | ✅ | ✅ | ✅
+| Air-gapped Delivery | ❌ | ❌ | ❌ | Optional  | ❌| 
+| Custom SSO & SCIM  | ❌ | ❌ | ❌ | ✅ | ❌ |
+| [Resiliency Testing](https://docs.localstack.cloud/user-guide/chaos-engineering/) | ❌ | ❌ | ❌| ✅  | ✅ | ✅ |
+| [Kubernetes Delivery Operator](https://docs.localstack.cloud/user-guide/localstack-enterprise/k8s-operator/) & [Executor](https://docs.localstack.cloud/user-guide/localstack-enterprise/kubernetes-executor/)) | ❌ | ❌ | ❌ | ✅ | ❌
 |  |  |  |  |  |
-| [Support](https://docs.localstack.cloud/getting-started/help-and-support/) | Basic | Standard | Priority | Basic |
+[Telemetry Sharing](https://docs.localstack.cloud/aws/capabilities/config/usage-tracking/) | enforced | default on | default on | optional | default on |
+| [Support](https://docs.localstack.cloud/getting-started/help-and-support/) | Basic | Standard | Priority | Enterprise | Basic |
 
 ## Legacy Plans
 
 As of **May 8, 2025**, the following plans are no longer available for new purchases.
-If you're an existing customer on one of these tiers, your subscription remains active and unchanged.
+If you’re an existing customer on one of these tiers, your subscription remains active and unchanged.
 You’ll continue receiving all regular version updates and will not experience any downgrade or loss of access.
 If you have questions or concerns, please contact Support.
 
@@ -222,153 +229,148 @@ However, if your subscription lapses, we may not be able to restore access to th
 - 2400 CI credits maximum
 - Includes workspace-wide Ephemeral Instance minutes and Cloud Pod storage
 
-**Enterprise:**
-
-- Unlimited CI credits
-- Includes workspace-wide Ephemeral Instance minutes and Cloud Pod storage
-- Detailed values for CI credits, minutes, and storage are shown in the table below
-
 For any subscription or access-related questions, please reach out to Support.
 
-| AWS Services | Legacy Plan: Starter | Legacy Plan: Teams | Legacy Plan: Enterprise sold before May 8th, 2025 |
-| -------- | ------- | ------- | ------- |
-| Analytics |  |  |  |
-| [](https://docs.localstack.cloud/user-guide/aws/es/)[Amazon ElasticSearch](https://docs.localstack.cloud/user-guide/aws/es/) | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_kinesis/)[Amazon Kinesis Streams](https://docs.localstack.cloud/references/coverage/coverage_kinesis/) | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_firehose/)[Amazon Kinesis Data Firehose](https://docs.localstack.cloud/references/coverage/coverage_firehose/) | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_opensearch/)[Amazon OpenSearch](https://docs.localstack.cloud/references/coverage/coverage_opensearch/) | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_redshift/)[Amazon Redshift](https://docs.localstack.cloud/references/coverage/coverage_redshift/) | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_athena/)[Amazon Athena](https://docs.localstack.cloud/references/coverage/coverage_athena/) | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_emr/)[Amazon EMR](https://docs.localstack.cloud/references/coverage/coverage_emr/) | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_emr-serverless/)[Amazon EMR Serverless](https://docs.localstack.cloud/references/coverage/coverage_emr-serverless/) | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_glue/)[AWS Glue](https://docs.localstack.cloud/references/coverage/coverage_glue/) | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_redshift-data/)[Amazon Redshift Data API](https://docs.localstack.cloud/references/coverage/coverage_redshift-data/) | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_lakeformation/)[AWS Lake Formation](https://docs.localstack.cloud/references/coverage/coverage_lakeformation/) | ✅ | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/user-guide/aws/msk/)[Amazon Managed Streaming for Apache Kafka](https://docs.localstack.cloud/user-guide/aws/msk/) | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/user-guide/aws/kinesisanalyticsv2/)[Amazon Managed Service for Apache Flink](https://docs.localstack.cloud/user-guide/aws/kinesisanalyticsv2/) | ✅ | ✅ | ✅ |
-| Application Integration |  |  |  |
-| [](https://docs.localstack.cloud/user-guide/aws/swf/)[Amazon Simple Workflow Service (SWF)](https://docs.localstack.cloud/user-guide/aws/swf/) | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/user-guide/aws/sns/)[Amazon Simple Notification Service (SNS)](https://docs.localstack.cloud/user-guide/aws/sns/) | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/user-guide/aws/sqs/)[Amazon Simple Queue Service (SQS)](https://docs.localstack.cloud/user-guide/aws/sqs/) | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/user-guide/aws/stepfunctions/)[AWS Step Functions](https://docs.localstack.cloud/user-guide/aws/stepfunctions/) | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/user-guide/aws/events/)[Amazon EventBridge](https://docs.localstack.cloud/user-guide/aws/events/) | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/user-guide/aws/scheduler/)[Amazon EventBridge Scheduler](https://docs.localstack.cloud/user-guide/aws/scheduler/) | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/user-guide/aws/mq/)[Amazon MQ](https://docs.localstack.cloud/user-guide/aws/mq/) | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/user-guide/aws/pipes/)[Amazon EventBridge Pipes](https://docs.localstack.cloud/user-guide/aws/pipes/) | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/user-guide/aws/mwaa/)[Amazon Managed Workflows for Apache Airflow](https://docs.localstack.cloud/user-guide/aws/mwaa/) | ✅ | ✅ | ✅ |
-| BlockChain |  |  |  |
-| [](https://docs.localstack.cloud/user-guide/aws/managedblockchain/)[Amazon Managed Blockchain](https://docs.localstack.cloud/user-guide/aws/managedblockchain/) | ✅ | ✅ | ✅ |
-| Business Applications |  |  |  |
-| [](https://docs.localstack.cloud/user-guide/aws/ses/)[Amazon Simple Email Service (SES)](https://docs.localstack.cloud/user-guide/aws/ses/) | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/user-guide/aws/ses/)[Amazon Simple Email Service API V2 (SES)](https://docs.localstack.cloud/user-guide/aws/ses/) | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/user-guide/aws/pinpoint/)[Amazon Pinpoint](https://docs.localstack.cloud/user-guide/aws/pinpoint/) | ✅ | ✅ | ✅ |
-| Cloud Financial Management |  |  |  |
-| [](https://docs.localstack.cloud/user-guide/aws/ce/)[AWS Cost Explorer](https://docs.localstack.cloud/user-guide/aws/ce/) | ✅ | ✅ | ✅ |
-| Compute |  |  |  |
-| [](https://docs.localstack.cloud/user-guide/aws/ec2/)[Amazon Elastic Compute Cloud (EC2)](https://docs.localstack.cloud/user-guide/aws/ec2/) | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/user-guide/aws/lambda/)[AWS Lambda](https://docs.localstack.cloud/user-guide/aws/lambda/) | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/user-guide/aws/batch/)[AWS Batch](https://docs.localstack.cloud/user-guide/aws/batch/) | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/user-guide/aws/elasticbeanstalk/)[AWS Elastic Beanstalk](https://docs.localstack.cloud/user-guide/aws/elasticbeanstalk/) | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/user-guide/aws/serverlessrepo/)[AWS Serverless Application Repository](https://docs.localstack.cloud/user-guide/aws/serverlessrepo/) | ✅ | ✅ | ✅ |
-| Containers |  |  |  |
-| [](https://docs.localstack.cloud/user-guide/aws/ecr/)[Amazon Elastic Container Registry (ECR)](https://docs.localstack.cloud/user-guide/aws/ecr/) | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/user-guide/aws/ecr/)[Amazon Elastic Container Service (ECS)](https://docs.localstack.cloud/user-guide/aws/ecr/) | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/user-guide/aws/eks/)[Amazon Elastic Kubernetes Service (EKS)](https://docs.localstack.cloud/user-guide/aws/eks/) | ✅ | ✅ | ✅ |
-| Customer Enablement |  |  |  |
-| [](https://docs.localstack.cloud/user-guide/aws/support/)[AWS Support API](https://docs.localstack.cloud/user-guide/aws/support/) | ✅ | ✅ | ✅ |
-| DataBases |  |  |  |
-| [](https://docs.localstack.cloud/user-guide/aws/dynamodb/)[Amazon DynamoDB](https://docs.localstack.cloud/user-guide/aws/dynamodb/) | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/user-guide/aws/dynamodbstreams/)[Amazon DynamoDB Streams](https://docs.localstack.cloud/user-guide/aws/dynamodbstreams/) | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/user-guide/aws/elasticache/)[Amazon ElastiCache](https://docs.localstack.cloud/user-guide/aws/elasticache/) | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/user-guide/aws/rds/)[Amazon Relational Database Service (RDS)](https://docs.localstack.cloud/user-guide/aws/rds/) | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_rds-data/)[Amazon RDS Data API](https://docs.localstack.cloud/references/coverage/coverage_rds-data/) | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/user-guide/aws/docdb/)[Amazon DocumentDB](https://docs.localstack.cloud/user-guide/aws/docdb/) | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/user-guide/aws/memorydb/)[Amazon MemoryDB](https://docs.localstack.cloud/user-guide/aws/memorydb/) | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/user-guide/aws/neptune/)[Amazon Neptune](https://docs.localstack.cloud/user-guide/aws/neptune/) | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/user-guide/aws/timestream/)[Amazon Timestream](https://docs.localstack.cloud/user-guide/aws/timestream/) | ✅ | ✅ | ✅ |
-| Developer Tools |  |  |  |
-| [](https://docs.localstack.cloud/references/coverage/coverage_codecommit/)[AWS CodeCommit](https://docs.localstack.cloud/references/coverage/coverage_codecommit/) | ✅ | ✅ | ✅ |
-| AWS CodeBuild | ✅ | ✅ | ✅ |
-| AWS CodeConnections | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/user-guide/aws/fis/)[AWS Fault Injection Service](https://docs.localstack.cloud/user-guide/aws/fis/) | ❌ | ❌ | ✅ |
-| AWS CodeDeploy | ✅ | ✅ | ✅ |
-| AWS CodePipeline | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/user-guide/aws/xray/)[AWS X-Ray](https://docs.localstack.cloud/user-guide/aws/xray/) | ✅ | ✅ | ✅ |
-| Frontend Web & Mobile Services |  |  |  |
-| [](https://docs.localstack.cloud/user-guide/aws/amplify/)[AWS Amplify](https://docs.localstack.cloud/user-guide/aws/amplify/) | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/user-guide/aws/appsync/)[AWS AppSync](https://docs.localstack.cloud/user-guide/aws/appsync/) | ✅ | ✅ | ✅ |
-| IoT |  |  |  |
-| [](https://docs.localstack.cloud/user-guide/aws/iot/)[AWS IoT](https://docs.localstack.cloud/user-guide/aws/iot/) | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/user-guide/aws/iotwireless/)[AWS IoT Wireless](https://docs.localstack.cloud/user-guide/aws/iotwireless/) | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/user-guide/aws/iotdata/)[AWS IoT Data](https://docs.localstack.cloud/user-guide/aws/iotdata/) | ✅ | ✅ | ✅ |
-| Management & Governance |  |  |  |
-| [](https://docs.localstack.cloud/user-guide/aws/cloudformation/)[AWS CloudFormation](https://docs.localstack.cloud/user-guide/aws/cloudformation/) | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/user-guide/aws/cloudwatch/)[Amazon CloudWatch Metrics](https://docs.localstack.cloud/user-guide/aws/cloudwatch/) | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/user-guide/aws/logs/)[Amazon CloudWatch Logs](https://docs.localstack.cloud/user-guide/aws/logs/) | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/user-guide/aws/resource_groups/)[AWS Resource Groups](https://docs.localstack.cloud/user-guide/aws/resource_groups/) | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_ssm/)[AWS Systems Manager Parameter Store](https://docs.localstack.cloud/references/coverage/coverage_ssm/) | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_cloudcontrol/)[AWS Cloud Control](https://docs.localstack.cloud/references/coverage/coverage_cloudcontrol/) | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_application-autoscaling/)[AWS Application Auto Scaling](https://docs.localstack.cloud/references/coverage/coverage_application-autoscaling/) | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_autoscaling/)[Amazon EC2 Auto Scaling](https://docs.localstack.cloud/references/coverage/coverage_autoscaling/) | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_config/)[AWS Config](https://docs.localstack.cloud/references/coverage/coverage_config/) | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_appconfig/)[AWS AppConfig](https://docs.localstack.cloud/references/coverage/coverage_appconfig/) | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_cloudtrail/)[AWS CloudTrail](https://docs.localstack.cloud/references/coverage/coverage_cloudtrail/) | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_account/)[AWS Account Management](https://docs.localstack.cloud/references/coverage/coverage_account/) | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_organizations/)[AWS Organizations](https://docs.localstack.cloud/references/coverage/coverage_organizations/) | ✅ | ✅ | ✅ |
-| Media |  |  |  |
-| [](https://docs.localstack.cloud/references/coverage/coverage_mediaconvert/)[AWS Elemental MediaConvert](https://docs.localstack.cloud/references/coverage/coverage_mediaconvert/) | ✅ | ✅ | ✅ |
-| Migration & Transfer |  |  |  |
-| [](https://docs.localstack.cloud/references/coverage/coverage_transfer/)[AWS Transfer Family](https://docs.localstack.cloud/references/coverage/coverage_transfer/) | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_dms/)[AWS Database Migration Service](https://docs.localstack.cloud/references/coverage/coverage_dms/) | ✅ | ✅ | ✅ |
-| Machine Learning |  |  |  |
-| [](https://docs.localstack.cloud/references/coverage/coverage_transcribe/)[Amazon Transcribe](https://docs.localstack.cloud/references/coverage/coverage_transcribe/) | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_textract/)[Amazon Textract](https://docs.localstack.cloud/references/coverage/coverage_textract/) | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_sagemaker/)[Amazon SageMaker AI](https://docs.localstack.cloud/references/coverage/coverage_sagemaker/) | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_sagemaker-runtime/)[Amazon SageMaker Runtime](https://docs.localstack.cloud/references/coverage/coverage_sagemaker-runtime/) | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_bedrock/)[Amazon Bedrock](https://docs.localstack.cloud/references/coverage/coverage_bedrock/) | ❌ | ❌ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_bedrock-runtime/)[Amazon Bedrock Runtime](https://docs.localstack.cloud/references/coverage/coverage_bedrock-runtime/) | ❌ | ❌ | ✅ |
-| Networking & Content Delivery |  |  |  |
-| [](https://docs.localstack.cloud/references/coverage/coverage_route53/)[Amazon Route 53](https://docs.localstack.cloud/references/coverage/coverage_route53/) | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/user-guide/aws/route53resolver/)[Amazon Route 53 Resolver](https://docs.localstack.cloud/user-guide/aws/route53resolver/) | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_apigateway/)[Amazon API Gateway REST API](https://docs.localstack.cloud/references/coverage/coverage_apigateway/) | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_apigatewayv2/)[Amazon API Gateway HTTP and WebSocket API](https://docs.localstack.cloud/references/coverage/coverage_apigatewayv2/) | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_apigatewaymanagementapi/)[Amazon API Gateway Management API](https://docs.localstack.cloud/references/coverage/coverage_apigatewaymanagementapi/) | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_elb/)[Elastic Load Balancing](https://docs.localstack.cloud/references/coverage/coverage_elb/) | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_elbv2/)[Elastic Load Balancing v2 (Application, Network)](https://docs.localstack.cloud/references/coverage/coverage_elbv2/) | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_cloudfront/)[Amazon CloudFront](https://docs.localstack.cloud/references/coverage/coverage_cloudfront/) | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_servicediscovery/)[AWS Cloud Map](https://docs.localstack.cloud/references/coverage/coverage_servicediscovery/) | ✅ | ✅ | ✅ |
-| Security, Identity & Compliance |  |  |  |
-| [](https://docs.localstack.cloud/references/coverage/coverage_kms/)[AWS Key Management Service (KMS)](https://docs.localstack.cloud/references/coverage/coverage_kms/) | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_secretsmanager/)[AWS Secrets Manager](https://docs.localstack.cloud/references/coverage/coverage_secretsmanager/) | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_sts/)[AWS Security Token Service](https://docs.localstack.cloud/references/coverage/coverage_sts/) | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_acm/)[AWS Certificate Manager](https://docs.localstack.cloud/references/coverage/coverage_acm/) | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_cognito-identity/)[Amazon Cognito Identity Pools](https://docs.localstack.cloud/references/coverage/coverage_cognito-identity/) | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_cognito-idp/)[Amazon Cognito User Pools](https://docs.localstack.cloud/references/coverage/coverage_cognito-idp/) | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_acm-pca/)[AWS Private Certificate Authority](https://docs.localstack.cloud/references/coverage/coverage_acm-pca/) | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_wafv2/)[AWS Web Application Firewall (WAF)](https://docs.localstack.cloud/references/coverage/coverage_wafv2/) | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_iam/)[AWS Identity and Access Management (IAM)](https://docs.localstack.cloud/references/coverage/coverage_iam/) | ✅ | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_identitystore/)[AWS IAM Identity Store API](https://docs.localstack.cloud/references/coverage/coverage_identitystore/) | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_sso-admin/)[AWS IAM Identity Center](https://docs.localstack.cloud/references/coverage/coverage_sso-admin/) | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_ram/)[AWS Resource Access Manager (RAM)](https://docs.localstack.cloud/references/coverage/coverage_ram/) | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_shield/)[AWS Shield](https://docs.localstack.cloud/references/coverage/coverage_shield/) | ✅ | ✅ | ✅ |
-| Storage |  |  |  |
-| [](https://docs.localstack.cloud/references/coverage/coverage_s3/)[Amazon S3](https://docs.localstack.cloud/references/coverage/coverage_s3/) | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_s3control/)[Amazon S3 Control](https://docs.localstack.cloud/references/coverage/coverage_s3control/) | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_glacier/)[Amazon S3 Glacier](https://docs.localstack.cloud/references/coverage/coverage_glacier/) | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/user-guide/aws/backup/)[AWS Backup](https://docs.localstack.cloud/user-guide/aws/backup/) | ✅ | ✅ | ✅ |
-| [](https://docs.localstack.cloud/references/coverage/coverage_efs/)[Amazon EFS](https://docs.localstack.cloud/references/coverage/coverage_efs/) | ✅ | ✅ | ✅ |
-| Emulator Enhancements |  |  |  |
-| CI Credits | ✅ Up to 240 credits monthly per workspace | ✅ Up to 2400 credits monthly per workspace | Unlimited |
-| Stack Insights | ✅ For all supported services | ✅ For all supported services | ✅ For all supported services |
-| Local state persistence | ✅ | ✅ | ✅ |
-| Cloud-based state persistence via Cloud pods | ❌ | ✅ 1 GB, lifetime per license | ✅ 5 GB lifetime, per license |
-| [Cloud Sandbox](https://docs.localstack.cloud/user-guide/cloud-sandbox/) previews & ephemeral instances | ❌ | ✅ 1000 minutes monthly per workspace | ✅ 3000 minutes monthly per workspace |
-| AWS Replicator | ❌ | ✅ | ✅ |
-| IAM Policy Enforcement | ❌ | ❌ | ✅ |
-| IAM Policy Streams | ❌ | ❌ | ✅ |
-| Emulator Compliance Pack | ❌ | ❌ | ✅ |
-| User Security Pack | ❌ | ❌ | ✅ |
-| [Chaos Engineering](https://docs.localstack.cloud/user-guide/chaos-engineering/) | ❌ | ❌ | ✅ |
-| Kubernetes Pack ([Operator](https://docs.localstack.cloud/user-guide/localstack-enterprise/k8s-operator/) & [Executor](https://docs.localstack.cloud/user-guide/localstack-enterprise/kubernetes-executor/)) | ❌ | ❌ | ✅ |
-|  |  |  |  |
-| [Support](https://docs.localstack.cloud/getting-started/help-and-support/) | Standard | Priority | Enterprise |
+| AWS Services | Legacy Plan: Starter | Legacy Plan: Teams |
+| --- | --- | --- |
+| Analytics |  |  | 
+| [Amazon ElasticSearch](https://docs.localstack.cloud/user-guide/aws/es/) | ✅ | ✅ | 
+| [Amazon Kinesis Streams](https://docs.localstack.cloud/references/coverage/coverage_kinesis/) | ✅ | ✅ | 
+| [Amazon Kinesis Data Firehose](https://docs.localstack.cloud/references/coverage/coverage_firehose/) | ✅ | ✅ | 
+| [Amazon OpenSearch](https://docs.localstack.cloud/references/coverage/coverage_opensearch/) | ✅ | ✅ | 
+| [Amazon Redshift](https://docs.localstack.cloud/references/coverage/coverage_redshift/) | ✅ | ✅ | 
+| [Amazon Athena](https://docs.localstack.cloud/references/coverage/coverage_athena/) | ✅ | ✅ | 
+| [Amazon EMR](https://docs.localstack.cloud/references/coverage/coverage_emr/) | ✅ | ✅ | 
+| [Amazon EMR Serverless](https://docs.localstack.cloud/references/coverage/coverage_emr-serverless/) | ✅ | ✅ | 
+| [AWS Glue](https://docs.localstack.cloud/references/coverage/coverage_glue/) | ✅ | ✅ | 
+| [Amazon Redshift Data API](https://docs.localstack.cloud/references/coverage/coverage_redshift-data/) | ✅ | ✅ | 
+| [AWS Lake Formation](https://docs.localstack.cloud/references/coverage/coverage_lakeformation/) | ✅ | ✅ | 
+| [Amazon Managed Streaming for Apache Kafka](https://docs.localstack.cloud/user-guide/aws/msk/) | ✅ | ✅ | 
+| [Amazon Managed Service for Apache Flink](https://docs.localstack.cloud/user-guide/aws/kinesisanalyticsv2/) | ✅ | ✅ | 
+| Application Integration |  |  | 
+| [Amazon Simple Workflow Service (SWF)](https://docs.localstack.cloud/user-guide/aws/swf/) | ✅ | ✅ |
+| [Amazon Simple Notification Service (SNS)](https://docs.localstack.cloud/user-guide/aws/sns/) | ✅ | ✅ | 
+| [Amazon Simple Queue Service (SQS)](https://docs.localstack.cloud/user-guide/aws/sqs/) | ✅ | ✅ | 
+| [AWS Step Functions](https://docs.localstack.cloud/user-guide/aws/stepfunctions/) | ✅ | ✅ | 
+| [Amazon EventBridge](https://docs.localstack.cloud/user-guide/aws/events/) | ✅ | ✅ | 
+| [Amazon EventBridge Scheduler](https://docs.localstack.cloud/user-guide/aws/scheduler/) | ✅ | ✅ | 
+| [Amazon MQ](https://docs.localstack.cloud/user-guide/aws/mq/) | ✅ | ✅ | 
+| [Amazon EventBridge Pipes](https://docs.localstack.cloud/user-guide/aws/pipes/) | ✅ | ✅ | 
+| [Amazon Managed Workflows for Apache Airflow](https://docs.localstack.cloud/user-guide/aws/mwaa/) | ✅ | ✅ | 
+| BlockChain |  |  | 
+| [Amazon Managed Blockchain](https://docs.localstack.cloud/user-guide/aws/managedblockchain/) | ✅ | ✅ | 
+| Business Applications |  |  | 
+| [Amazon Simple Email Service (SES)](https://docs.localstack.cloud/user-guide/aws/ses/) | ✅ | ✅ | 
+| [Amazon Simple Email Service API V2 (SES)](https://docs.localstack.cloud/user-guide/aws/ses/) | ✅ | ✅ | 
+| [Amazon Pinpoint](https://docs.localstack.cloud/user-guide/aws/pinpoint/) | ✅ | ✅ | 
+| Cloud Financial Management |  |  | 
+| [AWS Cost Explorer](https://docs.localstack.cloud/user-guide/aws/ce/) | ✅ | ✅ | 
+| Compute |  |  | 
+| [Amazon Elastic Compute Cloud (EC2)](https://docs.localstack.cloud/user-guide/aws/ec2/) | ✅ | ✅ | 
+| [AWS Lambda](https://docs.localstack.cloud/user-guide/aws/lambda/) | ✅ | ✅ |
+| [AWS Batch](https://docs.localstack.cloud/user-guide/aws/batch/) | ✅ | ✅ | 
+| [AWS Elastic Beanstalk](https://docs.localstack.cloud/user-guide/aws/elasticbeanstalk/) | ✅ | ✅ | 
+| [AWS Serverless Application Repository](https://docs.localstack.cloud/user-guide/aws/serverlessrepo/) | ✅ | ✅ | 
+| Containers |  |  | 
+| [Amazon Elastic Container Registry (ECR)](https://docs.localstack.cloud/user-guide/aws/ecr/) | ✅ | ✅ | 
+| [Amazon Elastic Container Service (ECS)](https://docs.localstack.cloud/user-guide/aws/ecr/) | ✅ | ✅ | 
+| [Amazon Elastic Kubernetes Service (EKS)](https://docs.localstack.cloud/user-guide/aws/eks/) | ✅ | ✅ | 
+| Customer Enablement |  |  | 
+| [AWS Support API](https://docs.localstack.cloud/user-guide/aws/support/) | ✅ | ✅ | 
+| DataBases |  |  | 
+| [Amazon DynamoDB](https://docs.localstack.cloud/user-guide/aws/dynamodb/) | ✅ | ✅ | 
+| [Amazon DynamoDB Streams](https://docs.localstack.cloud/user-guide/aws/dynamodbstreams/) | ✅ | ✅ | 
+| [Amazon ElastiCache](https://docs.localstack.cloud/user-guide/aws/elasticache/) | ✅ | ✅ | 
+| [Amazon Relational Database Service (RDS)](https://docs.localstack.cloud/user-guide/aws/rds/) | ✅ | ✅ | 
+| [Amazon RDS Data API](https://docs.localstack.cloud/references/coverage/coverage_rds-data/) | ✅ | ✅ | 
+| [Amazon DocumentDB](https://docs.localstack.cloud/user-guide/aws/docdb/) | ✅ | ✅ | 
+| [Amazon MemoryDB](https://docs.localstack.cloud/user-guide/aws/memorydb/) | ✅ | ✅ | 
+| [Amazon Neptune](https://docs.localstack.cloud/user-guide/aws/neptune/) | ✅ | ✅ | 
+| [Amazon Timestream](https://docs.localstack.cloud/user-guide/aws/timestream/) | ✅ | ✅ | 
+| Developer Tools |  |  | 
+| [AWS CodeCommit](https://docs.localstack.cloud/references/coverage/coverage_codecommit/) | ✅ | ✅ | 
+| AWS CodeBuild | ✅ | ✅ | 
+| AWS CodeConnections | ✅ | ✅ | 
+| [AWS Fault Injection Service](https://docs.localstack.cloud/user-guide/aws/fis/) | ❌ | ❌ | 
+| AWS CodeDeploy | ✅ | ✅ | 
+| AWS CodePipeline | ✅ | ✅ | 
+| [AWS X-Ray](https://docs.localstack.cloud/user-guide/aws/xray/) | ✅ | ✅ | 
+| Frontend Web & Mobile Services |  |  | 
+| [AWS Amplify](https://docs.localstack.cloud/user-guide/aws/amplify/) | ✅ | ✅ | 
+| [AWS AppSync](https://docs.localstack.cloud/user-guide/aws/appsync/) | ✅ | ✅ | 
+| IoT |  |  | 
+| [AWS IoT](https://docs.localstack.cloud/user-guide/aws/iot/) | ✅ | ✅ | 
+| [AWS IoT Wireless](https://docs.localstack.cloud/user-guide/aws/iotwireless/) | ✅ | ✅ | 
+| [AWS IoT Data](https://docs.localstack.cloud/user-guide/aws/iotdata/) | ✅ | ✅ | 
+| Management & Governance |  |  | 
+| [AWS CloudFormation](https://docs.localstack.cloud/user-guide/aws/cloudformation/) | ✅ | ✅ | 
+| [Amazon CloudWatch Metrics](https://docs.localstack.cloud/user-guide/aws/cloudwatch/) | ✅ | ✅ | 
+| [Amazon CloudWatch Logs](https://docs.localstack.cloud/user-guide/aws/logs/) | ✅ | ✅ | 
+| [AWS Resource Groups](https://docs.localstack.cloud/user-guide/aws/resource_groups/) | ✅ | ✅ | 
+| [AWS Systems Manager Parameter Store](https://docs.localstack.cloud/references/coverage/coverage_ssm/) | ✅ | ✅ | 
+| [AWS Cloud Control](https://docs.localstack.cloud/references/coverage/coverage_cloudcontrol/) | ✅ | ✅ | 
+| [AWS Application Auto Scaling](https://docs.localstack.cloud/references/coverage/coverage_application-autoscaling/) | ✅ | ✅ | 
+| [Amazon EC2 Auto Scaling](https://docs.localstack.cloud/references/coverage/coverage_autoscaling/) | ✅ | ✅ | 
+| [AWS Config](https://docs.localstack.cloud/references/coverage/coverage_config/) | ✅ | ✅ | 
+| [AWS AppConfig](https://docs.localstack.cloud/references/coverage/coverage_appconfig/) | ✅ | ✅ | 
+| [AWS CloudTrail](https://docs.localstack.cloud/references/coverage/coverage_cloudtrail/) | ✅ | ✅ | 
+| [AWS Account Management](https://docs.localstack.cloud/references/coverage/coverage_account/) | ✅ | ✅ | 
+| [AWS Organizations](https://docs.localstack.cloud/references/coverage/coverage_organizations/) | ✅ | ✅ | 
+| Media |  |  | 
+| [AWS Elemental MediaConvert](https://docs.localstack.cloud/references/coverage/coverage_mediaconvert/) | ✅ | ✅ | 
+| Migration & Transfer |  |  | 
+| [AWS Transfer Family](https://docs.localstack.cloud/references/coverage/coverage_transfer/) | ✅ | ✅ | 
+| [AWS Database Migration Service](https://docs.localstack.cloud/references/coverage/coverage_dms/) | ✅ | ✅ | 
+| Machine Learning |  |  | 
+| [Amazon Transcribe](https://docs.localstack.cloud/references/coverage/coverage_transcribe/) | ✅ | ✅ |
+| [Amazon Textract](https://docs.localstack.cloud/references/coverage/coverage_textract/) | ✅ | ✅ | 
+| [Amazon SageMaker AI](https://docs.localstack.cloud/references/coverage/coverage_sagemaker/) | ✅ | ✅ | 
+| [Amazon SageMaker Runtime](https://docs.localstack.cloud/references/coverage/coverage_sagemaker-runtime/) | ✅ | ✅ | 
+| [Amazon Bedrock](https://docs.localstack.cloud/references/coverage/coverage_bedrock/) | ❌ | ❌ | 
+| [Amazon Bedrock Runtime](https://docs.localstack.cloud/references/coverage/coverage_bedrock-runtime/) | ❌ | ❌ | 
+| Networking & Content Delivery |  |  | 
+| [Amazon Route 53](https://docs.localstack.cloud/references/coverage/coverage_route53/) | ✅ | ✅ | 
+| [Amazon Route 53 Resolver](https://docs.localstack.cloud/user-guide/aws/route53resolver/) | ✅ | ✅ | 
+| [Amazon API Gateway REST API](https://docs.localstack.cloud/references/coverage/coverage_apigateway/) | ✅ | ✅ | 
+| [Amazon API Gateway HTTP and WebSocket API](https://docs.localstack.cloud/references/coverage/coverage_apigatewayv2/) | ✅ | ✅ | 
+| [Amazon API Gateway Management API](https://docs.localstack.cloud/references/coverage/coverage_apigatewaymanagementapi/) | ✅ | ✅ | 
+| [Elastic Load Balancing](https://docs.localstack.cloud/references/coverage/coverage_elb/) | ✅ | ✅ | 
+| [Elastic Load Balancing v2 (Application, Network)](https://docs.localstack.cloud/references/coverage/coverage_elbv2/) | ✅ | ✅ | 
+| [Amazon CloudFront](https://docs.localstack.cloud/references/coverage/coverage_cloudfront/) | ✅ | ✅ | 
+| [AWS Cloud Map](https://docs.localstack.cloud/references/coverage/coverage_servicediscovery/) | ✅ | ✅ | 
+| Security, Identity & Compliance |  |  | 
+| [AWS Key Management Service (KMS)](https://docs.localstack.cloud/references/coverage/coverage_kms/) | ✅ | ✅ | 
+| [AWS Secrets Manager](https://docs.localstack.cloud/references/coverage/coverage_secretsmanager/) | ✅ | ✅ | 
+| [AWS Security Token Service](https://docs.localstack.cloud/references/coverage/coverage_sts/) | ✅ | ✅ | 
+| [AWS Certificate Manager](https://docs.localstack.cloud/references/coverage/coverage_acm/) | ✅ | ✅ | 
+| [Amazon Cognito Identity Pools](https://docs.localstack.cloud/references/coverage/coverage_cognito-identity/) | ✅ | ✅ | 
+| [Amazon Cognito User Pools](https://docs.localstack.cloud/references/coverage/coverage_cognito-idp/) | ✅ | ✅ | 
+| [AWS Private Certificate Authority](https://docs.localstack.cloud/references/coverage/coverage_acm-pca/) | ✅ | ✅ | 
+| [AWS Web Application Firewall (WAF)](https://docs.localstack.cloud/references/coverage/coverage_wafv2/) | ✅ | ✅ | 
+| [AWS Identity and Access Management (IAM)](https://docs.localstack.cloud/references/coverage/coverage_iam/) | ✅ | ✅ | 
+| [AWS IAM Identity Store API](https://docs.localstack.cloud/references/coverage/coverage_identitystore/) | ✅ | ✅ | 
+| [AWS IAM Identity Center](https://docs.localstack.cloud/references/coverage/coverage_sso-admin/) | ✅ | ✅ | 
+| [AWS Resource Access Manager (RAM)](https://docs.localstack.cloud/references/coverage/coverage_ram/) | ✅ | ✅ | 
+| [AWS Shield](https://docs.localstack.cloud/references/coverage/coverage_shield/) | ✅ | ✅ | 
+| Storage |  |  | 
+| [Amazon S3](https://docs.localstack.cloud/references/coverage/coverage_s3/) | ✅ | ✅ |
+| [Amazon S3 Control](https://docs.localstack.cloud/references/coverage/coverage_s3control/) | ✅ | ✅ | 
+| [Amazon S3 Glacier](https://docs.localstack.cloud/references/coverage/coverage_glacier/) | ✅ | ✅ | 
+| [AWS Backup](https://docs.localstack.cloud/user-guide/aws/backup/) | ✅ | ✅ | 
+| [Amazon EFS](https://docs.localstack.cloud/references/coverage/coverage_efs/) | ✅ | ✅ | 
+| Emulator Enhancements |  |  | 
+| Testing in CI | ✅ | ✅ | 
+| Stack Insights | ✅ | ✅ | 
+| Local state persistence | ✅ | ✅ | 
+| Cloud-based state persistence via Cloud pods | ❌ | ✅ 1 GB, lifetime per license | 
+| [Cloud Sandbox](https://docs.localstack.cloud/user-guide/cloud-sandbox/) previews & ephemeral instances | ❌ | ✅ 1000 minutes monthly per workspace | 
+| AWS Replicator | ❌ | ✅ | 
+| IAM Policy Enforcement | ❌ | ❌ | 
+| IAM Policy Streams | ❌ | ❌ | 
+| Fully offline / air-gapped image delivery | ❌ | ❌ | 
+| Custom SSO and SCIM | ❌ | ❌ | 
+| Resiliency Testing through [Chaos Engineering](https://docs.localstack.cloud/user-guide/chaos-engineering/) | ❌ | ❌ | 
+| Kubernetes Pack ([Operator](https://docs.localstack.cloud/user-guide/localstack-enterprise/k8s-operator/) & [Executor](https://docs.localstack.cloud/user-guide/localstack-enterprise/kubernetes-executor/)) | ❌ | ❌ | 
+|  |  |  | 
+| [Support](https://docs.localstack.cloud/getting-started/help-and-support/) | Standard | Priority | 
+
diff --git a/src/content/docs/aws/services/apigateway.mdx b/src/content/docs/aws/services/apigateway.mdx
index 77923c6b..a3157541 100644
--- a/src/content/docs/aws/services/apigateway.mdx
+++ b/src/content/docs/aws/services/apigateway.mdx
@@ -468,7 +468,7 @@ You can also use the Resource Browser to check out the **Authorizers**, **Models
 
 The following code snippets and sample applications provide practical examples of how to use API Gateway in LocalStack for various use cases:
 
-- [API Gateway with Custom Domains over our LocalStack Pro samples](https://github.com/localstack/localstack-pro-samples/tree/master/apigw-custom-domain)
+- [API Gateway with Custom Domains](https://github.com/localstack/localstack-pro-samples/tree/master/apigw-custom-domain)
 - [Websockets via API Gateway V2](https://github.com/localstack/localstack-pro-samples/tree/master/serverless-websockets)
 - [Serverless Container-based APIs with Amazon ECS and Amazon API Gateway](https://github.com/localstack/serverless-api-ecs-apigateway-sample)
 - [Step-up Authentication using Amazon Cognito, DynamoDB, API Gateway Lambda Authorizer, and Lambda functions](https://github.com/localstack/step-up-auth-sample)
diff --git a/src/content/docs/aws/services/cloudformation.mdx b/src/content/docs/aws/services/cloudformation.mdx
index 70fe0d2f..aa6a78f6 100644
--- a/src/content/docs/aws/services/cloudformation.mdx
+++ b/src/content/docs/aws/services/cloudformation.mdx
@@ -205,10 +205,6 @@ Please exercise caution when using parameters with `NoEcho`.
 
 ### Resources
 
-:::note
-When utilizing the Community image, any resources within the stack that are not supported will be disregarded and won't be deployed.
-:::
-
 <CloudFormationCoverage client:load />
 
 ## API Coverage
diff --git a/src/content/docs/aws/services/cloudfront.mdx b/src/content/docs/aws/services/cloudfront.mdx
index bef23ca9..37af3989 100644
--- a/src/content/docs/aws/services/cloudfront.mdx
+++ b/src/content/docs/aws/services/cloudfront.mdx
@@ -85,7 +85,7 @@ You can enable this feature by setting `CLOUDFRONT_LAMBDA_EDGE=1` in your LocalS
 
 ## Using custom URLs
 
-LocalStack Pro supports using an alternate domain name, also referred to as a `CNAME` or custom domain name, to access your applications and file artifacts instead of relying on the domain name generated by CloudFront for your distribution.
+LocalStack for AWS supports using an alternate domain name, also referred to as a `CNAME` or custom domain name, to access your applications and file artifacts instead of relying on the domain name generated by CloudFront for your distribution.
 
 To set up the custom domain name, you must configure it in your local DNS server.
 Once that is done, you can designate the desired domain name as an alias for the target distribution.
diff --git a/src/content/docs/aws/services/codecommit.mdx b/src/content/docs/aws/services/codecommit.mdx
index e02fd25c..fc434b1d 100644
--- a/src/content/docs/aws/services/codecommit.mdx
+++ b/src/content/docs/aws/services/codecommit.mdx
@@ -104,7 +104,7 @@ The Resource Browser allows you to perform the following actions:
 
 ## Examples
 
-You can find a sample application illustrating the usage of the CodeCommit APIs locally in the [LocalStack Pro Samples](https://github.com/localstack/localstack-pro-samples/tree/master/codecommit-git-repo).
+You can find a sample application illustrating the usage of the CodeCommit APIs locally in the [`localstack-pro-samples` repository](https://github.com/localstack/localstack-pro-samples/tree/master/codecommit-git-repo).
 
 ## API Coverage
 
diff --git a/src/content/docs/aws/services/ec2.mdx b/src/content/docs/aws/services/ec2.mdx
index 372bcd25..a39b803e 100644
--- a/src/content/docs/aws/services/ec2.mdx
+++ b/src/content/docs/aws/services/ec2.mdx
@@ -21,7 +21,7 @@ The list of supported APIs can be found on the [API Coverage section](#api-cover
 
 This guide is designed for users new to EC2 and assumes basic knowledge of the AWS CLI and our [`awslocal`](https://github.com/localstack/awscli-local) wrapper script.
 We will demonstrate how to create an EC2 instance that runs a simple Python web server.
-LocalStack Pro running on a Linux host is required as network access to containers is not possible on macOS.
+LocalStack for AWS running on a Linux host is required as network access to containers is not possible on macOS.
 
 Start your LocalStack container using your preferred method.
 
@@ -204,7 +204,7 @@ If the `ssh` command throws an error like "Identity file not accessible" or "bad
 
 LocalStack EC2 supports multiple methods to simulate the EC2 service.
 All tiers support the mock/CRUD capability.
-For advanced setups, LocalStack Pro comes with emulation capability for certain resource types so that they behave more closely like AWS.
+For advanced setups, LocalStack for AWS comes with emulation capability for certain resource types so that they behave more closely like AWS.
 
 The underlying method for this can be controlled using the [`EC2_VM_MANAGER`](/aws/capabilities/config/configuration#ec2) configuration option.
 You may choose between plain mocked resources, containerized or virtualized.
@@ -215,16 +215,16 @@ With the Mock VM manager, all resources are stored as in-memory representation.
 This only offers the CRUD capability.
 
 This is the default VM manager in LocalStack Community edition.
-To use this VM manager in LocalStack Pro, set [`EC2_VM_MANAGER`](/aws/capabilities/config/configuration#ec2) to `mock`.
+To use this VM manager in LocalStack for AWS, set [`EC2_VM_MANAGER`](/aws/capabilities/config/configuration#ec2) to `mock`.
 
 This serves as the fallback manager if an operation is not implemented in other VM managers.
 
 ## Docker VM Manager
 
-LocalStack Pro supports the Docker VM manager which uses the [Docker Engine](https://docs.docker.com/engine/) to emulate EC2 instances.
+LocalStack for AWS supports the Docker VM manager which uses the [Docker Engine](https://docs.docker.com/engine/) to emulate EC2 instances.
 This VM manager requires the Docker socket from the host machine to be mounted inside the LocalStack container at `/var/run/docker.sock`.
 
-This is the default VM manager in LocalStack Pro.
+This is the default VM manager in LocalStack for AWS.
 You may set [`EC2_VM_MANAGER`](/aws/capabilities/config/configuration#ec2) to `docker` to explicitly use this VM manager.
 
 All launched EC2 instances have the Docker socket mounted inside them at `/var/run/docker.sock` to make Docker-in-Docker usecases possible.
@@ -460,7 +460,7 @@ If a functionality you desire is missing, please create a feature request on the
 
 The Libvirt VM manager uses the [Libvirt](https://libvirt.org/index.html) API to create fully virtualized EC2 resources.
 This lets you create EC2 setups which closely resemble AWS EC2.
-Currently LocalStack Pro supports the KVM-accelerated QEMU hypervisor on Linux hosts.
+Currently LocalStack for AWS supports the KVM-accelerated QEMU hypervisor on Linux hosts.
 
 Installation steps for QEMU/KVM will vary based on the Linux distribution on the host machine.
 On Debian/Ubuntu-based distributions, you can run:
diff --git a/src/content/docs/aws/services/elasticache.mdx b/src/content/docs/aws/services/elasticache.mdx
index 9b7e54d7..63d707ab 100644
--- a/src/content/docs/aws/services/elasticache.mdx
+++ b/src/content/docs/aws/services/elasticache.mdx
@@ -26,7 +26,7 @@ This guide is designed for users new to ElastiCache and assumes basic knowledge
 
 ### Single cache cluster
 
-After starting LocalStack Pro, you can create a cluster with the following command.
+After starting LocalStack for AWS, you can create a cluster with the following command.
 
 ```bash
 awslocal elasticache create-cache-cluster \
diff --git a/src/content/docs/aws/services/glue.mdx b/src/content/docs/aws/services/glue.mdx
index 300b49d3..56f39c9d 100644
--- a/src/content/docs/aws/services/glue.mdx
+++ b/src/content/docs/aws/services/glue.mdx
@@ -8,7 +8,7 @@ import FeatureCoverage from '../../../../components/feature-coverage/FeatureCove
 
 ## Introduction
 
-The Glue API in LocalStack Pro allows you to run ETL (Extract-Transform-Load) jobs locally, maintaining table metadata in the local Glue data catalog, and using the Spark ecosystem (PySpark/Scala) to run data processing workflows.
+The Glue API in LocalStack for AWS allows you to run ETL (Extract-Transform-Load) jobs locally, maintaining table metadata in the local Glue data catalog, and using the Spark ecosystem (PySpark/Scala) to run data processing workflows.
 
 LocalStack allows you to use the Glue APIs in your local environment.
 The supported APIs are available on our [API Coverage section](#api-coverage), which provides information on the extent of Glue's integration with LocalStack.
diff --git a/src/content/docs/aws/services/lambda.mdx b/src/content/docs/aws/services/lambda.mdx
index 8e4791c6..a900b1f5 100644
--- a/src/content/docs/aws/services/lambda.mdx
+++ b/src/content/docs/aws/services/lambda.mdx
@@ -435,7 +435,6 @@ Create a [GitHub issue](https://github.com/localstack/localstack/issues/new/choo
 
 [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.
-The Community image also allows creating, updating, and deleting Lambda Layers, but they are not applied when invoking a Lambda function.
 
 ### Creating and using a Lambda Layer Locally
 
diff --git a/src/content/docs/aws/services/organizations.mdx b/src/content/docs/aws/services/organizations.mdx
index c756da9f..a3e39d31 100644
--- a/src/content/docs/aws/services/organizations.mdx
+++ b/src/content/docs/aws/services/organizations.mdx
@@ -12,7 +12,7 @@ Amazon Web Services Organizations is an account management service that allows y
 It allows you to manage different accounts in a single organization and consolidate billing.
 With Organizations, you can also attach different policies to your organizational units (OUs) or individual accounts in your organization.
 
-Organizations is available over LocalStack Pro and the supported APIs are available over our [configuration page](/aws/capabilities/config/configuration).
+Organizations is available over LocalStack for AWS and the supported APIs are available over our [configuration page](/aws/capabilities/config/configuration).
 
 ## Getting started
 
diff --git a/src/content/docs/aws/services/route53.mdx b/src/content/docs/aws/services/route53.mdx
index 8b4f3b36..d440fb88 100644
--- a/src/content/docs/aws/services/route53.mdx
+++ b/src/content/docs/aws/services/route53.mdx
@@ -198,7 +198,7 @@ For ELB alias records:
 
 ## DNS resolution
 
-LocalStack Pro supports the ability to respond to DNS queries for your Route53 domain names, with our [integrated DNS server](/aws/tooling/dns-server).
+LocalStack for AWS supports the ability to respond to DNS queries for your Route53 domain names, with our [integrated DNS server](/aws/tooling/dns-server).
 
 :::note
 To follow the example below you must [configure your system DNS to use the LocalStack DNS server](/aws/tooling/dns-server#system-dns-configuration).
diff --git a/src/content/docs/aws/services/s3.mdx b/src/content/docs/aws/services/s3.mdx
index bb490b45..80ff35d9 100644
--- a/src/content/docs/aws/services/s3.mdx
+++ b/src/content/docs/aws/services/s3.mdx
@@ -243,58 +243,6 @@ awslocal s3api get-bucket-cors --bucket cors-bucket
 
 You can try again to upload files in your bucket from the [LocalStack Web Application](https://app.localstack.cloud) and it should work.
 
-## S3 Docker image
-
-LocalStack provides a Docker image for S3, which you can use to run S3 in a Docker container.
-The image is available on [Docker Hub](https://hub.docker.com/r/localstack/localstack) and can be pulled using the following command:
-
-```bash
-docker pull localstack/localstack:s3-latest
-```
-
-The S3 Docker image only supports the S3 APIs and does not include other services like Lambda, DynamoDB, etc. You can run the S3 Docker image using any of the following commands:
-
-import { Tabs, TabItem } from '@astrojs/starlight/components';
-
-<Tabs>
-<TabItem label="LocalStack CLI">
-```bash
-IMAGE_NAME=localstack/localstack:s3-latest localstack start
-```
-</TabItem>
-<TabItem label="Docker Compose">
-```yaml showLineNumbers
-services:
-  localstack:
-    container_name: "${LOCALSTACK_DOCKER_NAME:-localstack-main}"
-    image: localstack/localstack:s3-latest
-    ports:
-      - "127.0.0.1:4566:4566"            # LocalStack Gateway
-    environment:
-      - DEBUG=${DEBUG:-0}
-    volumes:
-      - "${LOCALSTACK_VOLUME_DIR:-./volume}:/var/lib/localstack"
-      - "/var/run/docker.sock:/var/run/docker.sock"
-```
-</TabItem>
-<TabItem label="Docker">
-```bash
-docker run \
-  --rm \
-  -p 4566:4566 \
-  localstack/localstack:s3-latest
-```
-</TabItem>
-</Tabs>
-
-The S3 Docker image has similar parity with the S3 APIs supported by LocalStack Docker image.
-You can use similar [configuration options](/aws/capabilities/config/configuration/#s3) to alter the behaviour of the S3 Docker image, such as `DEBUG` or `S3_SKIP_SIGNATURE_VALIDATION`.
-
-:::note
-The S3 Docker image does not support persistence, and all data is lost when the container is stopped.
-To use persistence or save the container state as a Cloud Pod, you need to use the [`localstack/localstack-pro`](https://hub.docker.com/r/localstack/localstack-pro) image.
-:::
-
 ## SSE-C Encryption
 
 SSE-C (Server-Side Encryption with Customer-Provided Keys) is an Amazon S3 encryption method where customers provide their own encryption keys for securing objects.
diff --git a/src/content/docs/aws/services/ses.mdx b/src/content/docs/aws/services/ses.mdx
index 56f37ab1..10a4958e 100644
--- a/src/content/docs/aws/services/ses.mdx
+++ b/src/content/docs/aws/services/ses.mdx
@@ -66,8 +66,7 @@ awslocal ses send-email \
 ```
 
 :::note
-In LocalStack Community, all operations are mocked and no real emails are sent.
-In LocalStack Pro, it is possible to send real emails via an SMTP server.
+In LocalStack for AWS, it is possible to send real emails via an SMTP server.
 :::
 
 ## Retrieve Sent Emails
@@ -117,7 +116,7 @@ Sent messages can be retrieved in following ways:
 
 ## SMTP Integration
 
-LocalStack Pro supports sending emails via an SMTP server.
+LocalStack for AWS supports sending emails via an SMTP server.
 To enable this, set the connections parameters and access credentials for the server in the configuration.
 Refer to the [Configuration](/aws/capabilities/config/configuration/#emails) guide for details.
 
diff --git a/src/content/docs/aws/tooling/aws-replicator.mdx b/src/content/docs/aws/tooling/aws-replicator.mdx
index 5b0d3df3..ab685081 100644
--- a/src/content/docs/aws/tooling/aws-replicator.mdx
+++ b/src/content/docs/aws/tooling/aws-replicator.mdx
@@ -25,7 +25,7 @@ The AWS Replicator is in a preview state, supporting only [selected resources](#
 
 ## Getting started
 
-A valid `LOCALSTACK_AUTH_TOKEN` must be configured to start the LocalStack Pro image.
+A valid `LOCALSTACK_AUTH_TOKEN` must be configured to start the LocalStack for AWS image.
 
 :::note
 The Replicator is in limited preview and is available from LocalStack CLI version 4.2.0.
diff --git a/src/content/docs/aws/tooling/dns-server.md b/src/content/docs/aws/tooling/dns-server.md
index e9dd01d5..dad71ff7 100644
--- a/src/content/docs/aws/tooling/dns-server.md
+++ b/src/content/docs/aws/tooling/dns-server.md
@@ -12,7 +12,7 @@ This configuration happens automatically for containers created by LocalStack, i
 Your container can be configured to use the DNS server as demonstrated in the [Network Troubleshooting guide](/aws/capabilities/networking/accessing-endpoint-url/#from-the-same-computer).
 If you wish to use the DNS server on your host system, follow the instructions under [System DNS configuration](#system-dns-configuration).
 
-LocalStack Pro additionally offers [Transparent Endpoint Injection](/aws/capabilities/networking/transparent-endpoint-injection/) (active by default),
+LocalStack for AWS additionally offers [Transparent Endpoint Injection](/aws/capabilities/networking/transparent-endpoint-injection/) (active by default),
 which enables seamless connectivity to LocalStack without changing your application code targeting AWS.
 The DNS server resolves AWS domains such as `*.amazonaws.com` including subdomains to the LocalStack container.
 Therefore, your application seamlessly accesses the LocalStack APIs instead of the real AWS APIs.
@@ -183,7 +183,7 @@ On many modern systemd-based distributions, like Ubuntu, systemd-resolved is use
 LocalStack provides a CLI command for exactly this scenario.
 To use systemd-resolved and the LocalStack domain resolution, try the following steps.
 
-Start LocalStack Pro with `DNS_ADDRESS=127.0.0.1` as environment variable.
+Start LocalStack for AWS with `DNS_ADDRESS=127.0.0.1` as environment variable.
 This makes LocalStack bind port 53 on 127.0.0.1, whereas systemd-resolved binds its stub resolver to 127.0.0.53:53, which prevents a conflict.
 Once LocalStack is started, you can test the DNS server using `dig @127.0.0.1 s3.amazonaws.com` versus `dig @127.0.0.53 s3.amazonaws.com`, the former should return an A record `127.0.0.1`, the latter the real AWS DNS result.
 
diff --git a/src/content/docs/aws/tooling/lambda-tools/remote-debugging.mdx b/src/content/docs/aws/tooling/lambda-tools/remote-debugging.mdx
index c09369e8..8f8c9e4b 100644
--- a/src/content/docs/aws/tooling/lambda-tools/remote-debugging.mdx
+++ b/src/content/docs/aws/tooling/lambda-tools/remote-debugging.mdx
@@ -159,7 +159,7 @@ UnsupportedLocalStackVersion: Your current LocalStack version does not support L
 
 Here's how to fix it:
 
-1. Make sure you are running **LocalStack Pro >= v4.8.0**
+1. Make sure you are running **LocalStack for AWS >= v4.8.0**
 
    ```bash
    docker pull localstack/localstack-pro:latest
@@ -229,7 +229,7 @@ localstack start --volume /path/to/debug-config.yaml:/tmp/lambda_debug_mode_conf
 services:
   localstack:
     container_name: "${LOCALSTACK_DOCKER_NAME:-localstack-main}"
-    image: localstack/localstack-pro  # required for Pro
+    image: localstack/localstack-pro
     ports:
       - "127.0.0.1:4566:4566"            # LocalStack Gateway
       - "127.0.0.1:4510-4559:4510-4559"  # external services port range
diff --git a/src/content/docs/aws/tooling/localstack-cli.md b/src/content/docs/aws/tooling/localstack-cli.md
index 83bf6247..d3ee4caf 100644
--- a/src/content/docs/aws/tooling/localstack-cli.md
+++ b/src/content/docs/aws/tooling/localstack-cli.md
@@ -79,10 +79,8 @@ Set your Localstack auth token to allow you to start LocalStack
 ```bash
 Usage: localstack auth set-token [OPTIONS] AUTH_TOKEN
 
-  Configure your auth token. Your auth token is used the license activation to
-  activate LocalStack Pro. This is different from `localstack auth login`
-  which enables platform features such as pushing cloud pods to your webapp
-  account.
+Set up your auth token to activate your LocalStack for AWS license.
+This differs from localstack auth login, which is used for platform features such as syncing Cloud Pods with your web account.
 
   The auth token you configure here will be passed to the
   `LOCALSTACK_AUTH_TOKEN` environment variable of the LocalStack container
@@ -959,7 +957,7 @@ Usage: localstack pod list [OPTIONS] [REMOTE]
   With the --public flag, it lists the all the available public Cloud Pods. A
   public Cloud Pod is available across the boundary of a user and/or
   organization. In other words, any public Cloud Pod can be injected by any
-  other user holding a LocalStack Pro (or above) license.
+  other user holding a LocalStack for AWS license.
 
 Options:
   -p, --public               List all the available public Cloud Pods
diff --git a/src/content/docs/aws/tooling/localstack-docker-extension.md b/src/content/docs/aws/tooling/localstack-docker-extension.md
index c01e1b94..7a5244f7 100644
--- a/src/content/docs/aws/tooling/localstack-docker-extension.md
+++ b/src/content/docs/aws/tooling/localstack-docker-extension.md
@@ -71,4 +71,4 @@ To configure an Auth Token for the LocalStack Docker Extension, you need to crea
 Navigate to the **Configurations** tab and click the **New +** button.
 Enter the configuration name and add the `LOCALSTACK_AUTH_TOKEN` environment variable with the desired value.
 
-To start the LocalStack Pro container with the Auth Token, select the configuration profile from the drop-down menu and click the **Start** button.
+To start the LocalStack for AWS container with the Auth Token, select the configuration profile from the drop-down menu and click the **Start** button.
diff --git a/src/content/docs/aws/tutorials/ecs-ecr-container-app.mdx b/src/content/docs/aws/tutorials/ecs-ecr-container-app.mdx
index 68dd0fa4..c08cd3c4 100644
--- a/src/content/docs/aws/tutorials/ecs-ecr-container-app.mdx
+++ b/src/content/docs/aws/tutorials/ecs-ecr-container-app.mdx
@@ -20,12 +20,12 @@ The Fargate launch type provides a serverless-like experience for running contai
 It is tightly integrated with other AWS services such as ECS, EKS, and Lambda, enabling you to quickly deploy your container images to these services.
 With ECR, you can version, tag, and manage your container images’ lifecycles independently of your applications, making it easy to maintain and deploy your containers.
 
-ECS tasks can pull container images from ECR repositories and are customizable using task definitions to specify settings such as CPU and memory limits, environment variables, and networking configurations. [LocalStack Pro](https://localstack.cloud/) allows creating ECR registries, repositories, and ECS clusters and tasks on your local machine.
+ECS tasks can pull container images from ECR repositories and are customizable using task definitions to specify settings such as CPU and memory limits, environment variables, and networking configurations. [LocalStack for AWS](https://localstack.cloud/) allows creating ECR registries, repositories, and ECS clusters and tasks on your local machine.
 This tutorial will showcase using LocalStack to set up an NGINX web server to serve a static website using CloudFormation templates in a local AWS environment.
 
 ## Prerequisites
 
-- [LocalStack Pro](https://localstack.cloud/pricing/)
+- [LocalStack for AWS](https://localstack.cloud/pricing/)
 - [awslocal](/aws/integrations/aws-native-tools/aws-cli#localstack-aws-cli-awslocal)
 - [Docker](https://docker.io/)
 - [curl](https://curl.se/download.html)
@@ -585,4 +585,4 @@ We have also shown how you can use CloudFormation templates with the awslocal CL
 
 With LocalStack, you can easily mount code from your host filesystem into the ECS container, allowing for a quicker debugging loop that doesn't require rebuilding and redeploying the task's Docker image for each change.
 
-To try out this tutorial for yourself, you can find the code in our LocalStack Pro samples on [LocalStack Pro samples](https://github.com/localstack/localstack-pro-samples/tree/master/ecs-ecr-container-app) over GitHub, including a `Makefile` to execute each step of the process.
+To try out this tutorial for yourself, you can find the code in our [`localstack-pro-samples` repository](https://github.com/localstack/localstack-pro-samples/tree/master/ecs-ecr-container-app) over GitHub, including a `Makefile` to execute each step of the process.
diff --git a/src/content/docs/aws/tutorials/elb-load-balancing.mdx b/src/content/docs/aws/tutorials/elb-load-balancing.mdx
index 823b7372..3ac70eb2 100644
--- a/src/content/docs/aws/tutorials/elb-load-balancing.mdx
+++ b/src/content/docs/aws/tutorials/elb-load-balancing.mdx
@@ -28,14 +28,14 @@ In this tutorial, we focus on the Application Load Balancer (ALB), which operate
 ALB works at the request level, allowing advanced load-balancing features for HTTP and HTTPS requests. It also enables you to register Lambda functions as targets. 
 You can configure a listener rule that forwards requests to a target group for your Lambda function, triggering its execution to process the request.
 
-[LocalStack Pro](https://localstack.cloud) extends support for ELB Application Load Balancers and the configuration of target groups, including Lambda functions.
+[LocalStack for AWS](https://localstack.cloud) extends support for ELB Application Load Balancers and the configuration of target groups, including Lambda functions.
 This tutorial will guide you through setting up an ELB Application Load Balancer to configure Node.js Lambda functions as targets.
 We will utilize the [Serverless framework](http://serverless.com/) along with the [`serverless-localstack` plugin](https://www.serverless.com/plugins/serverless-localstack) to simplify the setup.
 Additionally, we will demonstrate how to set up ELB endpoints to efficiently forward requests to the target group associated with your Lambda functions.
 
 ## Prerequisites
 
-- LocalStack Pro
+- LocalStack for AWS
 - [Serverless framework](https://www.serverless.com/framework/docs/getting-started/)
 - [Node.js & `npm`](https://nodejs.org/en/download/)
 - [awslocal](https://github.com/localstack/awscli-local)
@@ -425,4 +425,4 @@ In this tutorial, we have learned how to create an Application Load Balancer (AL
 
 We have also explored creating, configuring, and deploying a Serverless project with LocalStack, enabling developers to develop and test Cloud and Serverless applications locally without AWS costs—accelerating iteration for cloud-native workloads.
 
-LocalStack offers integrations with various popular tools such as Terraform, Pulumi, Serverless Application Model (SAM), and more. For more information about LocalStack integrations, you can refer to our [Integration documentation](https://docs.localstack.cloud/aws/integrations). To further explore and experiment with the concepts covered in this tutorial, you can access the code and resources on our [LocalStack Pro samples over GitHub](https://github.com/localstack/localstack-pro-samples/tree/master/elb-load-balancing) along with a Makefile for step-by-step execution.
+LocalStack for AWS offers integrations with various popular tools such as Terraform, Pulumi, Serverless Application Model (SAM), and more. For more information about integrations, you can refer to our [Integrations documentation](https://docs.localstack.cloud/aws/integrations). To further explore and experiment with the concepts covered in this tutorial, you can access the code and resources on our [`localstack-pro-samples` repository on GitHub](https://github.com/localstack/localstack-pro-samples/tree/master/elb-load-balancing) along with a Makefile for step-by-step execution.
diff --git a/src/content/docs/aws/tutorials/gitlab-ci-testcontainers.mdx b/src/content/docs/aws/tutorials/gitlab-ci-testcontainers.mdx
index 0f59c38e..54a27dde 100644
--- a/src/content/docs/aws/tutorials/gitlab-ci-testcontainers.mdx
+++ b/src/content/docs/aws/tutorials/gitlab-ci-testcontainers.mdx
@@ -31,7 +31,7 @@ seamlessly with CI/CD pipelines like GitLab CI or GitHub Actions, allowing devel
 
 For this tutorial, you will need:
 
-- [LocalStack Pro](/aws/getting-started/auth-token) to emulate the AWS services.
+- [LocalStack for AWS](/aws/getting-started/auth-token) to emulate the AWS services.
   If you don't have a subscription yet, you can just get a trial license for free.
 - [Docker](https://docker.io/)
 - [A GitLab account](https://gitlab.com/)
diff --git a/src/content/docs/aws/tutorials/java-notification-app.mdx b/src/content/docs/aws/tutorials/java-notification-app.mdx
index e84234ce..86f75ab1 100644
--- a/src/content/docs/aws/tutorials/java-notification-app.mdx
+++ b/src/content/docs/aws/tutorials/java-notification-app.mdx
@@ -22,7 +22,7 @@ With the AWS Java SDK, Java developers can build applications that work with var
 Simple Email Service (SES) is a cloud-based email-sending service that enables developers to integrate email functionality into their applications running on AWS.
 SES allows developers to work without an on-prem Simple Mail Transfer Protocol (SMTP) system and send bulk emails to many recipients.
 
-[LocalStack Pro](https://app.localstack.cloud/) supports SES along with a simple user interface to inspect email accounts and sent messages.
+[LocalStack for AWS](https://app.localstack.cloud/) supports SES along with a simple user interface to inspect email accounts and sent messages.
 LocalStack also supports sending SES messages through an actual SMTP email server.
 We will use SQS and SNS to process the emails.
 We would further employ a CloudFormation stack to configure the infrastructure and configure SNS & SQS subscriptions.
@@ -35,7 +35,7 @@ We will further use [MailHog](https://github.com/mailhog/MailHog), a local SMTP
 
 For this tutorial, you will need:
 
-- [LocalStack Pro](https://localstack.cloud/pricing/) to emulate the AWS services (SNS, SQS, SES, etc) locally
+- [LocalStack for AWS](https://localstack.cloud/pricing/) to emulate the AWS services (SNS, SQS, SES, etc) locally
   - Don't worry, if you don't have a subscription yet, you can just get a trial license for free.
 - [awslocal](/aws/integrations/aws-native-tools/aws-cli#localstack-aws-cli-awslocal)
 - [Docker](https://docker.io/)
@@ -658,5 +658,5 @@ In this tutorial, we have demonstrated, how you can:
 - Use CloudFormation to provision infrastructure for SNS & SQS subscriptions on LocalStack
 - Use the AWS Java SDK and Spring Boot to build an application that sends SQS and SES messages.
 
-Using [LocalStack Pro](https://app.localstack.cloud), you can use our Web user interface to view the email messages sent by SES.
-The code for this tutorial can be found in our [LocalStack Pro samples over GitHub](https://github.com/localstack/localstack-pro-samples/tree/master/java-notification-app).
+Using [LocalStack for AWS](https://app.localstack.cloud), you can use our Web user interface to view the email messages sent by SES.
+The code for this tutorial can be found in our [LocalStack for AWS samples over GitHub](https://github.com/localstack/localstack-pro-samples/tree/master/java-notification-app).
diff --git a/src/content/docs/aws/tutorials/lambda-ecr-container-images.mdx b/src/content/docs/aws/tutorials/lambda-ecr-container-images.mdx
index cc741656..0ee5a213 100644
--- a/src/content/docs/aws/tutorials/lambda-ecr-container-images.mdx
+++ b/src/content/docs/aws/tutorials/lambda-ecr-container-images.mdx
@@ -24,7 +24,7 @@ With ECR, you can effectively manage your image lifecycles, versioning, and tagg
 It seamlessly integrates with other AWS services like ECS, EKS, and Lambda, enabling you to deploy your container images effortlessly.
 Creating container images for your Lambda functions involves using Docker and implementing the Lambda Runtime API according to the Open Container Initiative (OCI) specifications.
 
-[LocalStack Pro](https://localstack.cloud) extends support for Lambda functions using container images through ECR.
+[LocalStack for AWS](https://localstack.cloud) extends support for Lambda functions using container images through ECR.
 It enables you to deploy your Lambda functions locally using LocalStack.
 In this tutorial, we will explore creating a Lambda function using a container image and deploying it locally with the help of LocalStack.
 
@@ -32,7 +32,7 @@ In this tutorial, we will explore creating a Lambda function using a container i
 
 Before diving into this tutorial, make sure you have the following prerequisites:
 
-- [LocalStack Pro](https://localstack.cloud/pricing/)
+- [LocalStack for AWS](https://localstack.cloud/pricing/)
 - [awslocal](/aws/integrations/aws-native-tools/aws-cli#localstack-aws-cli-awslocal)
 - [Python](https://www.python.org/downloads/)
 - [Docker](https://docker.io/)
@@ -278,4 +278,4 @@ With the help of LocalStack, you can seamlessly package, deploy, and invoke Lamb
 It empowers you to develop, debug, and test your Lambda functions with a wide range of AWS services.
 For more advanced usage patterns, you can explore features like [Lambda Hot Reloading](/aws/tooling/lambda-tools/hot-reloading) and [Lambda Debugging](/aws/tooling/lambda-tools/remote-debugging).
 
-To further explore and experiment with the concepts covered in this tutorial, you can access the code and accompanying `Makefile` on our [LocalStack Pro samples over GitHub](https://github.com/localstack/localstack-pro-samples/tree/master/lambda-container-image).
+To further explore and experiment with the concepts covered in this tutorial, you can access the code and accompanying `Makefile` on our [`localstack-pro-samples` repository on GitHub](https://github.com/localstack/localstack-pro-samples/tree/master/lambda-container-image).
diff --git a/src/content/docs/aws/tutorials/rds-database-initialization.mdx b/src/content/docs/aws/tutorials/rds-database-initialization.mdx
index aeb2cce7..32975645 100644
--- a/src/content/docs/aws/tutorials/rds-database-initialization.mdx
+++ b/src/content/docs/aws/tutorials/rds-database-initialization.mdx
@@ -19,7 +19,7 @@ leadimage: "rds-database-initialization-featured-image.png"
 
 Database initialization is a critical aspect of application development and testing. Setting up databases with proper schemas and seed data consistently across development, testing, and CI environments can be challenging. Amazon RDS provides managed database services, but testing database initialization scripts and configurations requires a reliable local development environment.
 
-[LocalStack Pro](https://app.localstack.cloud/) enables you to emulate Amazon RDS, Lambda, and Secrets Manager locally, allowing you to develop and test database initialization workflows without connecting to AWS. This approach accelerates development cycles, reduces costs, and ensures consistent environments across different stages of your development pipeline.
+[LocalStack for AWS](https://app.localstack.cloud/) enables you to emulate Amazon RDS, Lambda, and Secrets Manager locally, allowing you to develop and test database initialization workflows without connecting to AWS. This approach accelerates development cycles, reduces costs, and ensures consistent environments across different stages of your development pipeline.
 
 In this tutorial, we will demonstrate how to provision and initialize an Amazon RDS database using AWS CDK and LocalStack. We'll create a Lambda function that executes custom SQL scripts to set up database schemas and seed data. Additionally, we'll explore how Cloud Pods can streamline CI workflows by providing pre-seeded database environments.
 
@@ -27,7 +27,7 @@ In this tutorial, we will demonstrate how to provision and initialize an Amazon
 
 For this tutorial, you will need:
 
-- [LocalStack Pro](https://localstack.cloud/pricing/) with a valid auth token
+- [LocalStack for AWS](https://localstack.cloud/pricing/) with a valid auth token
 - [AWS CLI](https://docs.localstack.cloud/user-guide/integrations/aws-cli/) with the [`awslocal` wrapper](https://docs.localstack.cloud/user-guide/integrations/aws-cli/#localstack-aws-cli-awslocal)
 - [AWS CDK](https://docs.localstack.cloud/user-guide/integrations/aws-cdk/) with the [`cdklocal`](https://www.npmjs.com/package/aws-cdk-local) wrapper
 - [Node.js](https://nodejs.org/en/download/) (version 16 or later)
@@ -250,7 +250,7 @@ This will run end-to-end tests that verify:
 
 This tutorial demonstrated how to provision and initialize an Amazon RDS database locally using AWS CDK and LocalStack. You learned how to:
 
-- **Set up LocalStack Pro** for local AWS service emulation
+- **Set up LocalStack for AWS** for local AWS service emulation
 - **Deploy RDS infrastructure** using AWS CDK and CloudFormation
 - **Initialize database schemas and data** via Lambda functions during deployment
 - **Test the initialized database** using both Lambda queries and direct MySQL connections
diff --git a/src/content/docs/aws/tutorials/reproducible-machine-learning-cloud-pods.mdx b/src/content/docs/aws/tutorials/reproducible-machine-learning-cloud-pods.mdx
index c4652ea0..c41f6f15 100644
--- a/src/content/docs/aws/tutorials/reproducible-machine-learning-cloud-pods.mdx
+++ b/src/content/docs/aws/tutorials/reproducible-machine-learning-cloud-pods.mdx
@@ -23,7 +23,7 @@ You can always tear down your LocalStack instance and restore it from a snapshot
 Cloud Pods is supported in [LocalStack Team](https://app.localstack.cloud/).
 With LocalStack Team, you can utilize the Cloud Pods CLI that allows you to inspect your Cloud Pods, version them using tags, and push them to the LocalStack platform for storage and collaboration.
 
-In this tutorial, we will use [LocalStack Pro](/aws/getting-started/auth-token) to train a simple machine-learning model that recognizes handwritten digits on an image.
+In this tutorial, we will use [LocalStack for AWS](/aws/getting-started/auth-token) to train a simple machine-learning model that recognizes handwritten digits on an image.
 We will rely on Cloud Pods to create a reproducible sample by using:
 
 - S3 to create a bucket to host our training data
@@ -39,11 +39,11 @@ We will then create a Cloud Pod to save the state of our LocalStack instance and
 
 For this tutorial, you will need the following:
 
-- [LocalStack Pro](https://localstack.cloud/pricing/)
+- [LocalStack for AWS](https://localstack.cloud/pricing/)
 - [awslocal](/aws/integrations/aws-native-tools/aws-cli#localstack-aws-cli-awslocal)
 - [Optical recognition of handwritten digits dataset](https://github.com/localstack-samples/localstack-pro-samples/raw/refs/heads/master/reproducible-ml/digits.csv.gz) ([Source](https://archive.ics.uci.edu/ml/datasets/Optical+Recognition+of+Handwritten+Digits))
 
-If you don't have a subscription to LocalStack Pro, you can request a trial license upon sign-up.
+If you don't have a subscription to LocalStack for AWS, you can request a trial license upon sign-up.
 For this tutorial to work, you must have the LocalStack CLI installed, which must be version 1.3 or higher.
 The Cloud Pods CLI is shipped with the LocalStack CLI, so you don't need to install it separately.
 
@@ -391,4 +391,4 @@ By using Cloud Pods, teams can work together to create a reproducible environmen
 Additionally, Cloud Pods can be used to pre-seed continuous integration (CI) pipelines with the necessary instance state to bootstrap testing environments or to troubleshoot failures in the CI pipeline.
 
 For more information about LocalStack Cloud Pods, refer to the documentation provided.
-The code for this tutorial, including a Makefile to execute it step-by-step, is available in the [LocalStack Pro samples repository](https://github.com/localstack/localstack-pro-samples/tree/master/reproducible-ml) on GitHub.
+The code for this tutorial, including a Makefile to execute it step-by-step, is available in the [`localstack-pro-samples` repository on GitHub](https://github.com/localstack/localstack-pro-samples/tree/master/reproducible-ml) on GitHub.
diff --git a/src/content/docs/aws/tutorials/route-53-failover.mdx b/src/content/docs/aws/tutorials/route-53-failover.mdx
index 4b816693..28e801a0 100644
--- a/src/content/docs/aws/tutorials/route-53-failover.mdx
+++ b/src/content/docs/aws/tutorials/route-53-failover.mdx
@@ -39,7 +39,7 @@ Clone the repository, and follow the instructions below to get started.
 
 The general prerequisites for this guide are:
 
-- LocalStack Pro with [LocalStack Auth Token](/aws/getting-started/auth-token)
+- LocalStack for AWS with [LocalStack Auth Token](/aws/getting-started/auth-token)
 - [AWS CLI](/aws/integrations/aws-native-tools/aws-cli) with the [`awslocal` wrapper](/aws/integrations/aws-native-tools/aws-cli#localstack-aws-cli-awslocal)
 - [Docker](https://docs.docker.com/get-docker/) and [Docker Compose](https://docs.docker.com/compose/install/)
 - [Python-3](https://www.python.org/downloads/)
diff --git a/src/content/docs/aws/tutorials/schema-evolution-glue-msk.mdx b/src/content/docs/aws/tutorials/schema-evolution-glue-msk.mdx
index f145826f..8d35db1e 100644
--- a/src/content/docs/aws/tutorials/schema-evolution-glue-msk.mdx
+++ b/src/content/docs/aws/tutorials/schema-evolution-glue-msk.mdx
@@ -19,7 +19,7 @@ It is used to capture data generated by producers and distribute it among its co
 Kafka is known for its scalability, with reports of production environments scaling to [trillions of messages per day](https://engineering.linkedin.com/blog/2019/apache-kafka-trillion-messages).
 With [Amazon Managed Streaming for Apache Kafka (MSK)](https://aws.amazon.com/msk/), AWS provides a service to provision Apache Kafka clusters easily.
 
-[LocalStack Pro](https://app.localstack.cloud/) supports [Amazon Managed Streaming for Kafka (MSK)](/aws/services/kafka/), which enables you to spin up Kafka clusters on your local machine and test the integration of your applications with Amazon MSK.
+[LocalStack for AWS](https://app.localstack.cloud/) supports [Amazon Managed Streaming for Kafka (MSK)](/aws/services/kafka/), which enables you to spin up Kafka clusters on your local machine and test the integration of your applications with Amazon MSK.
 
 Kafka clusters are often used as the central messaging infrastructure in complex microservice environments.
 However, the continuous and independent development of the individual microservices - the data producers and consumers - can make it hard to coordinate and evolve data schemas over time without introducing application failures due to incompatibilities.
@@ -43,15 +43,15 @@ The following chart shows the integration of producers and consumers with Amazon
 3. The consumer reads the serialized and compressed record.
 4. The consumer requests the schema from the schema registry (if it is not already cached) and uses the schema to decompress and deserialize the record.
 
-[AWS Glue Schema Registry](/aws/services/glue) is supported by LocalStack Pro as well, ultimately allowing you to test the evolution of your data streaming application completely on your local machine.
+[AWS Glue Schema Registry](/aws/services/glue) is supported by LocalStack for AWS as well, ultimately allowing you to test the evolution of your data streaming application completely on your local machine.
 It allows you develop and test your application's data schema evolution locally.
-The code for this tutorial (including a script to execute it step-by-step) can be found in our [LocalStack Pro samples over GitHub](https://github.com/localstack/localstack-pro-samples/tree/master/glue-msk-schema-registry).
+The code for this tutorial (including a script to execute it step-by-step) can be found in our [`localstack-pro-samples` repository on GitHub](https://github.com/localstack/localstack-pro-samples/tree/master/glue-msk-schema-registry).
 
 # Prerequisites
 
 For this tutorial you will need:
 
-- [LocalStack Pro](https://localstack.cloud/pricing/) to emulate Amazon MSK and AWS Glue Schema Registry locally
+- [LocalStack for AWS](https://localstack.cloud/pricing/) to emulate Amazon MSK and AWS Glue Schema Registry locally
   - Don't worry, if you don't have a subscription yet, you can just get a trial license for free.
 - [awslocal](/aws/integrations/aws-native-tools/aws-cli#localstack-aws-cli-awslocal)
 - Java 11+
diff --git a/src/content/docs/aws/tutorials/serverless-quiz-app.mdx b/src/content/docs/aws/tutorials/serverless-quiz-app.mdx
index 45875c3d..0b6f91f3 100644
--- a/src/content/docs/aws/tutorials/serverless-quiz-app.mdx
+++ b/src/content/docs/aws/tutorials/serverless-quiz-app.mdx
@@ -29,7 +29,7 @@ Using LocalStack, we can develop and test this entire serverless infrastructure
 
 For this tutorial, you will need:
 
-- [LocalStack Pro](https://localstack.cloud/pricing/) with a valid auth token
+- [LocalStack for AWS](https://localstack.cloud/pricing/) with a valid auth token
 - [AWS CLI](https://docs.localstack.cloud/user-guide/integrations/aws-cli/) with [`awslocal` wrapper](https://docs.localstack.cloud/user-guide/integrations/aws-cli/#localstack-aws-cli-awslocal)
 - [AWS CDK](https://docs.localstack.cloud/user-guide/integrations/aws-cdk/) with [`cdklocal` wrapper](https://github.com/localstack/aws-cdk-local) (**optional**)
 - [Python 3.11+](https://www.python.org/downloads/) and `pip`
@@ -155,7 +155,7 @@ pytest tests/test_infra.py
 
 The automated tests utilize the AWS SDK for Python (boto3) and the `requests` library to interact with the quiz application API.
 
-## Advanced Features with LocalStack Pro
+## Advanced Features with LocalStack for AWS
 
 ### Resource Browser
 
diff --git a/src/content/docs/aws/tutorials/simulating-outages.mdx b/src/content/docs/aws/tutorials/simulating-outages.mdx
index 705992fa..c29621ed 100644
--- a/src/content/docs/aws/tutorials/simulating-outages.mdx
+++ b/src/content/docs/aws/tutorials/simulating-outages.mdx
@@ -36,7 +36,7 @@ Clone the repository, and follow the instructions below to get started.
 
 The general prerequisites for this guide are:
 
-- LocalStack Pro with [LocalStack Auth Token](/aws/getting-started/auth-token)
+- LocalStack for AWS with [LocalStack Auth Token](/aws/getting-started/auth-token)
 - [AWS CLI](/aws/integrations/aws-native-tools/aws-cli) with the [`awslocal` wrapper](/aws/integrations/aws-native-tools/aws-cli#localstack-aws-cli-awslocal)
 - [Docker](https://docs.docker.com/get-docker/) and [Docker Compose](https://docs.docker.com/compose/install/)
 
diff --git a/src/content/docs/aws/tutorials/using-terraform-with-testcontainers-and-localstack.mdx b/src/content/docs/aws/tutorials/using-terraform-with-testcontainers-and-localstack.mdx
index 5db2318b..9d8ec90f 100644
--- a/src/content/docs/aws/tutorials/using-terraform-with-testcontainers-and-localstack.mdx
+++ b/src/content/docs/aws/tutorials/using-terraform-with-testcontainers-and-localstack.mdx
@@ -37,8 +37,8 @@ This approach simplifies the development and testing cycle, making it more effic
 
 For this tutorial, you will need:
 
-- [LocalStack Pro](/aws/getting-started/auth-token) to emulate the AWS services and to use LocalStack Extensions.
-  If you don't have LocalStack Pro yet, you can sign up on our [webapp](https://app.localstack.cloud) to get a trial license for free.
+- [LocalStack for AWS](/aws/getting-started/auth-token) to emulate the AWS services and to use LocalStack Extensions.
+  If you don't have LocalStack for AWS yet, you can sign up on our [webapp](https://app.localstack.cloud) to get a trial license for free.
 - [Docker](https://docker.io/)
 - [LocalStack CLI](/aws/getting-started/installation)
 - [AWS CLI](https://aws.amazon.com/cli/)
@@ -105,7 +105,7 @@ services:
             - "127.0.0.1:4510-4559:4510-4559"  # external services port range
             - "127.0.0.1:443:443"              # LocalStack HTTPS Gateway (Pro)
         environment:
-            # Activate LocalStack Pro: https://docs.localstack.cloud/getting-started/auth-token/
+            # Activate LocalStack for AWS: https://docs.localstack.cloud/getting-started/auth-token/
             - LOCALSTACK_AUTH_TOKEN=${LOCALSTACK_AUTH_TOKEN:?}  # required for Pro
             # LocalStack configuration: https://docs.localstack.cloud/references/configuration/
             - DEBUG=1
@@ -119,7 +119,7 @@ services:
 ```
 
 Environment Variables:
-- **LOCALSTACK_AUTH_TOKEN**: Required for using LocalStack Pro.
+- **LOCALSTACK_AUTH_TOKEN**: Required for using LocalStack for AWS.
 - **DEBUG**: Set to 1 to enable verbose logging of the container.
 - **EXTENSION_AUTO_INSTALL**: Automatically installs specified LocalStack [extensions](/aws/tooling/extensions/), in this case, `localstack-extension-terraform-init` which allows Terraform files to be directly used as init hooks.
 
diff --git a/src/content/docs/snowflake/getting-started/faq.md b/src/content/docs/snowflake/getting-started/faq.md
index 48047dc0..2e96b626 100644
--- a/src/content/docs/snowflake/getting-started/faq.md
+++ b/src/content/docs/snowflake/getting-started/faq.md
@@ -24,12 +24,6 @@ Note: In case you are deploying the LocalStack for Snowflake in a Kubernetes clu
 
 ## Integration FAQs
 
-### Why are my CI pipelines failing with `license.not_enough_credits` error?
-
-If you are using the LocalStack for Snowflake in your CI pipelines consistently, you may encounter the `license.not_enough_credits` error. This error occurs when the LocalStack for Snowflake is unable to process the requests due to the lack of LocalStack CI credits.
-
-A CI key allows you to use LocalStack in your CI environment. Every activation of a CI key consumes one CI credit. This means that with every build triggered through the LocalStack container you will consume one credit. To use more credits, you can [contact us](https://localstack.cloud/contact) to discuss your requirements.
-
 ### How do I enable detailed debug logs?
 
 You can set the `SF_LOG=trace` environment variable in the Snowflake container to enable detailed trace logs that show all the request/response message.