diff --git a/content/en/docs/control-center/lead-mendix-implementation-your-organization.md b/content/en/docs/control-center/lead-mendix-implementation-your-organization.md
index bfcf4dfb7ae..bde222774a8 100644
--- a/content/en/docs/control-center/lead-mendix-implementation-your-organization.md
+++ b/content/en/docs/control-center/lead-mendix-implementation-your-organization.md
@@ -235,7 +235,7 @@ High-level positioning is about knowing how and where Mendix fits in with the re
**Deployment strategy**
-The Start stage is an excellent time to start exploring your cloud options, and use this knowledge as input for strategic choices in the future. You’re most likely going to deploy your application on Mendix Cloud because it’s the most optimized cloud to run Mendix-built applications. Built on top of Cloud Foundry and AWS, Mendix Cloud is the deployment solution in which Mendix provides hosting environments for you. It’s available globally and comes standard with deep insights, alerting capabilities, high availability options, and backups.
+The Start stage is an excellent time to start exploring your cloud options, and use this knowledge as input for strategic choices in the future. You are most likely going to deploy your application on Mendix Cloud because it’s the most optimized cloud to run Mendix-built applications. Built on top of AWS, Mendix Cloud is the deployment solution in which Mendix provides hosting environments for you. It’s available globally and comes standard with deep insights, alerting capabilities, high availability options, and backups.
{{< figure src="/attachments/quickstarts/leading-mendix-implementation/cloud-options.png" >}}
@@ -619,7 +619,7 @@ Mendix applications can be deployed in different ways, mainly:
**Mendix Cloud** is the default deployment option and has the advantage of being a fully integrated solution, with easy setting up and administrating. When developing your first application and if there are no specific (private) cloud constraints, it makes sense to choose the user friendly Mendix Cloud option. Within Mendix Cloud, there are options for multitenant cloud environments and single-tenant cloud environments. Deploying to Mendix Cloud gives you the shortest time-to-value.
-Mendix can also be deployed to any cloud platform which supports a version of Cloud Foundry. With **Mendix for Private Cloud**, you can choose the cloud provider of your preference, e.g. your own Azure or AWS infrastructures. If there already is access to an on-premise hosting environment, Mendix can also be deployed on-premise.
+Mendix can also be deployed to any cloud platform which supports a version of Kubernetes or Cloud Foundry. With **Mendix for Private Cloud**, you can choose the cloud provider of your preference, e.g. your own Azure or AWS infrastructures. If there already is access to an on-premise hosting environment, Mendix can also be deployed on-premise.
When setting up your deployment strategy, it is important to look at the features that are needed, as some features that rely on the target platform can work differently.
diff --git a/content/en/docs/deployment/_index.md b/content/en/docs/deployment/_index.md
index f2351899823..f59840ff1ea 100644
--- a/content/en/docs/deployment/_index.md
+++ b/content/en/docs/deployment/_index.md
@@ -14,7 +14,7 @@ cascade:
## Introduction
-There are multiple ways to deploy a Mendix application. You can deploy to your local machine for development and testing. You can deploy to Mendix Cloud, which is the default location for both free and licensed apps. You can also deploy to SAP Business Technology (SAP BTP) Platform, Cloud Foundry-based platforms, Docker containers, Azure, or to a server you configured yourself.
+There are multiple ways to deploy a Mendix application. You can deploy to your local machine for development and testing. You can deploy to Mendix Cloud, which is the default location for both free and licensed apps. You can also deploy to SAP Business Technology (SAP BTP) Platform, Kubernetes and Cloud Foundry-based platforms, Docker containers, Azure, or to a server you configured yourself.
{{% alert color="warning" %}}
Each app can only be deployed to one type of target platform (such as Mendix Cloud nodes) in addition to local testing.
diff --git a/content/en/docs/deployment/mendix-cloud-deploy/_about.md b/content/en/docs/deployment/mendix-cloud-deploy/_about.md
index 72d47364d8c..155e00384ae 100644
--- a/content/en/docs/deployment/mendix-cloud-deploy/_about.md
+++ b/content/en/docs/deployment/mendix-cloud-deploy/_about.md
@@ -10,7 +10,7 @@ description: "Frequently asked questions about Mendix Cloud"
Mendix Cloud is where licensed Mendix apps are deployed to a scalable, enterprise-grade cloud platform.
-Apps deployed to Mendix Cloud run in Cloud Foundry clusters that are deployed on highly available Amazon Web Services (AWS) regions. They can be deployed from Studio Pro and the Mendix Portal or via [Mendix APIs](/apidocs-mxsdk/apidocs/deploy-api/). Apps can run in many regions of the world.
+Apps deployed to Mendix Cloud run in Kubernetes clusters that are deployed on highly available Amazon Web Services (AWS) regions. They can be deployed from Studio Pro and the Mendix Portal or via [Mendix APIs](/apidocs-mxsdk/apidocs/deploy-api/). Apps can run in many regions of the world.
## Where Is Data Hosted?{#cloud-data-regions}
@@ -34,18 +34,18 @@ The primary hosting locations are as follows:
* Mendix Cloud US West: Oregon
* Mendix Cloud South America: São Paulo
-## Does Mendix Expose the Underlying Cloud Foundry API?
+## Does Mendix Expose the Underlying Container Platform API?
-No, it does not. The Cloud Foundry API does not map one-to-one to Mendix's deployment options, authorization model, or cloud resource usage. However, deployment to Mendix Cloud can be automated using the [Deploy API](/apidocs-mxsdk/apidocs/deploy-api/).
+No, it does not. The container platform APIs do not map one-to-one to Mendix's deployment options, authorization model, or cloud resource usage. However, deployment to Mendix Cloud can be automated using the [Deploy API](/apidocs-mxsdk/apidocs/deploy-api/).
## How Do You Access the Underlying AWS Resources? How Can You Deploy in Your AWS Account?
-Mendix Cloud runs in Mendix's own AWS account; you cannot interact with the AWS APIs directly via Mendix credentials. Mendix does not offer [VPC peering](https://docs.aws.amazon.com/AmazonVPC/latest/PeeringGuide/Welcome.html) or VPC connections. All access to Mendix-hosted AWS resources (such as EC2, RDS, and S3) is done via Mendix APIs, such as the [Database API](https://apidocs.rnd.mendix.com/10/runtime/com/mendix/core/Core.html#createXPathQuery(java.lang.String)) and [FileDocument API](https://apidocs.rnd.mendix.com/10/runtime/com/mendix/core/Core.html#storeFileDocumentContent(com.mendix.systemwideinterfaces.core.IContext,com.mendix.systemwideinterfaces.core.IMendixObject,java.io.InputStream)) in Runtime and the [Deploy API](/apidocs-mxsdk/apidocs/deploy-api/) for cloud resources.
+Mendix Cloud runs in Mendix's own AWS account; you cannot interact with the AWS APIs directly via Mendix credentials. Mendix Cloud does not offer [VPC peering](https://docs.aws.amazon.com/AmazonVPC/latest/PeeringGuide/Welcome.html) or VPC connections. All access to Mendix-hosted AWS resources (such as EC2, RDS, and S3) is done via Mendix APIs, such as the [Database API](https://apidocs.rnd.mendix.com/10/runtime/com/mendix/core/Core.html#createXPathQuery(java.lang.String)) and [FileDocument API](https://apidocs.rnd.mendix.com/10/runtime/com/mendix/core/Core.html#storeFileDocumentContent(com.mendix.systemwideinterfaces.core.IContext,com.mendix.systemwideinterfaces.core.IMendixObject,java.io.InputStream)) in Runtime and the [Deploy API](/apidocs-mxsdk/apidocs/deploy-api/) for cloud resources.
However, you can launch services on your own AWS account, in the same region to minimize latency. Then, you can access those services via connectors in your app.
## If There Is No Deployment in Your Desired AWS Region, When Will Mendix Launch There?
-Mendix adds regions based on customer demand. If you would like a different region, contact your Mendix Customer Success Manager to see what Mendix can offer. Note that any request will need to take into account the costs of launching a complete Cloud Foundry cluster, with backup services, monitoring, etc.
+Mendix adds regions based on customer demand. If you would like a different region, contact your Mendix Customer Success Manager to see what Mendix can offer. Note that any request will need to take into account the costs of launching a complete Mendix Cloud cluster, with backup services, monitoring, etc.
You can also consider running your Mendix app using your own AWS account, with control over your runtime environment. Mendix provides a streamlined way to deploy your apps in your own AWS account by using [Mendix for Amazon EKS](https://aws.amazon.com/solutions/partners/terraform-modules/mendix-eks/). If you do this, however, you will be responsible for the security and management of the AWS resources.
diff --git a/content/en/docs/deployment/mendix-cloud-deploy/_index.md b/content/en/docs/deployment/mendix-cloud-deploy/_index.md
index cccc65e7f76..b0681718de5 100644
--- a/content/en/docs/deployment/mendix-cloud-deploy/_index.md
+++ b/content/en/docs/deployment/mendix-cloud-deploy/_index.md
@@ -109,7 +109,7 @@ Apps that run on Mendix Cloud are automatically assigned their own URLs. The for
| Licensed app | Test, acceptance, flexible environments | Depends on the region:
`{app-name}-{environment-type}.mendixcloud.com`
or
`{app-name}-{environment-type}.apps.{region}.mendixcloud.com` | `myappname-accp.mendixcloud.com`,
`myappname-accp.apps.ap-3a.mendixcloud.com` |
| Free App | N/A | `{app-name}-sandbox.mxapps.io`
or
`{app-name}.mxapps.io` | `myfreeappname.mxapps.io` |
-{{% alert color="info" %}}Licensed apps run in Cloud Foundry clusters deployed on AWS. You can select the region for your app, but not for the cluster. Note that there can be multiple clusters in a region, and the URL of an app on some clusters in a region contains `apps.{region}`.{{% /alert %}}
+{{% alert color="info" %}}Licensed apps run in clusters deployed on AWS. You can select the region for your app, but not for the cluster. Note that there can be multiple clusters in a region, and the URL of an app on some clusters in a region contains `apps.{region}`.{{% /alert %}}
For licensed apps, you can customize a URL by adding [custom domains](/developerportal/deploy/custom-domains/).
diff --git a/content/en/docs/deployment/mendix-cloud-deploy/behavior-of-app.md b/content/en/docs/deployment/mendix-cloud-deploy/behavior-of-app.md
index 32b423a6128..c90e08ca075 100644
--- a/content/en/docs/deployment/mendix-cloud-deploy/behavior-of-app.md
+++ b/content/en/docs/deployment/mendix-cloud-deploy/behavior-of-app.md
@@ -38,7 +38,6 @@ Apps running in Mendix Cloud are subject to certain limitations. These behaviors
## HTTP Headers, Responses, and REST Connections
-* Due to the behavior of one of the Cloud Foundry routing components, HTTP headers sent to Mendix Cloud do not always preserve their case. For example, `X-SharedSecret` may be transformed to `X-Sharedsecret`. This has no practical effect because HTTP headers are defined as case insensitive.
* **Call REST** connections are eventually closed by the cloud infrastructure if left idle. This is because Mendix Cloud uses AWS NAT gateways for outgoing traffic, and these gateways drop connections that are idle for more than 350 seconds.
* Mendix recommends [setting the timeout](/refguide/call-rest-action/#timeout) for calls to consumed REST or web services to less than 350. Set the timeout to a higher value only if you are sure that traffic will go back and forth at least every 350 seconds.
* If you have a REST or web service call that will be idle (waiting) for 350 seconds or more, try to minimize the wait time. For example, you could make multiple requests for smaller amounts of data instead of a single request for a large amount of data, or you could make the call asynchronously.
diff --git a/content/en/docs/deployment/mendix-cloud-deploy/environments-details-new.md b/content/en/docs/deployment/mendix-cloud-deploy/environments-details-new.md
index a84fd44b41a..63567b9908f 100644
--- a/content/en/docs/deployment/mendix-cloud-deploy/environments-details-new.md
+++ b/content/en/docs/deployment/mendix-cloud-deploy/environments-details-new.md
@@ -287,7 +287,7 @@ Mendix and the deployment environment automatically add some non-configurable re
| `cache-control`| The buildpack for *index.html* and *login.html* – the Mendix Runtime for other pages |
| `permissions-policy: interest-cohort=()` | Exclude from Federated Learning of Cohorts (FLoC) calculation |
| `strict-transport-security` | TLS terminating webservers – set to `max-age=31536000` (365 days, in seconds)|
-| `x-vcap-request-id` | Cloud Foundry to track requests through CF |
+| `X-Request-ID` | Kubernetes to track requests through the Mendix Cloud platform |
#### Running Your App in an Iframe {#iframe}
diff --git a/content/en/docs/deployment/mendix-cloud-deploy/environments-details.md b/content/en/docs/deployment/mendix-cloud-deploy/environments-details.md
index af924f0e785..31b2b9472fe 100644
--- a/content/en/docs/deployment/mendix-cloud-deploy/environments-details.md
+++ b/content/en/docs/deployment/mendix-cloud-deploy/environments-details.md
@@ -276,7 +276,7 @@ Mendix and the deployment environment automatically add some non-configurable re
| `cache-control`| The buildpack for *index.html* and *login.html* – the Mendix Runtime for other pages |
| `permissions-policy: interest-cohort=()` | Exclude from Federated Learning of Cohorts (FLoC) calculation |
| `strict-transport-security` | TLS terminating webservers – set to `max-age=31536000` (365 days, in seconds)|
-| `x-vcap-request-id` | Cloud Foundry to track requests through CF |
+| `X-Request-ID` | Kubernetes to track requests through the Mendix Cloud platform |
#### Running Your App in an Iframe {#iframe}
diff --git a/content/en/docs/deployment/mendix-cloud-deploy/monitoring-with-apm/_index.md b/content/en/docs/deployment/mendix-cloud-deploy/monitoring-with-apm/_index.md
index ade1cf65071..ff3f4992359 100644
--- a/content/en/docs/deployment/mendix-cloud-deploy/monitoring-with-apm/_index.md
+++ b/content/en/docs/deployment/mendix-cloud-deploy/monitoring-with-apm/_index.md
@@ -50,7 +50,7 @@ The integration with Splunk Cloud Platform sends only runtime application logs.
Mendix provides two types of monitoring data:
-* Data from the Mendix Runtime, the Java Virtual Machine (JVM), the database, and the SaaS (for example, Cloud Foundry) environment – this is described in [Environment Metrics](#environment), below
+* Data from the Mendix Runtime, the Java Virtual Machine (JVM), the database, and the SaaS (for example, Kubernetes or Cloud Foundry) environment – this is described in [Environment Metrics](#environment), below
* Data from within the Mendix app itself – this is described in [App Metrics](#app-metrics), below
## Environment Metrics{#environment}
diff --git a/content/en/docs/refguide/runtime/runtime-deployment.md b/content/en/docs/refguide/runtime/runtime-deployment.md
index 455be76f0a9..782a62f0013 100644
--- a/content/en/docs/refguide/runtime/runtime-deployment.md
+++ b/content/en/docs/refguide/runtime/runtime-deployment.md
@@ -35,9 +35,9 @@ This is the app model as created by Studio Pro. It cannot be directly interprete
This converts an app in the *.mpk* format to the mda format which can be interpreted by the Mendix Runtime.
-### Cloud Foundry
+### Container Platform
-This is the command line interpreter which allows Cloud Foundry environments to be created, and code to be pushed into the environments to be executed.
+This is the command line interpreter which allows Kubernetes or Cloud Foundry environments to be created, and code to be pushed into the environments to be executed.
### Buildpack
diff --git a/content/en/docs/refguide8/runtime/runtime-deployment.md b/content/en/docs/refguide8/runtime/runtime-deployment.md
index c01dfaa1bf1..ab1c61b882a 100644
--- a/content/en/docs/refguide8/runtime/runtime-deployment.md
+++ b/content/en/docs/refguide8/runtime/runtime-deployment.md
@@ -35,10 +35,6 @@ This is the project model as created by Studio Pro. It cannot be directly interp
This converts an app in mpk format to the mda format which can be interpreted by the Mendix Runtime.
-### Cloud Foundry
-
-This is the command line interpreter which allows Cloud Foundry environments to be created, and code to be pushed into the environments to be executed.
-
### Buildpack
The buildpack is the Mendix script which controls the deployment of Mendix models to a cloud environment. It performs the following tasks:
diff --git a/content/en/docs/refguide9/runtime/runtime-deployment.md b/content/en/docs/refguide9/runtime/runtime-deployment.md
index 45054e33301..8042c71ebf9 100644
--- a/content/en/docs/refguide9/runtime/runtime-deployment.md
+++ b/content/en/docs/refguide9/runtime/runtime-deployment.md
@@ -35,10 +35,6 @@ This is the app model as created by Studio Pro. It cannot be directly interprete
This converts an app in mpk format to the mda format which can be interpreted by the Mendix Runtime.
-### Cloud Foundry
-
-This is the command line interpreter which allows Cloud Foundry environments to be created, and code to be pushed into the environments to be executed.
-
### Buildpack
The buildpack is the Mendix script which controls the deployment of Mendix models to a cloud environment. It performs the following tasks:
diff --git a/content/en/docs/releasenotes/deployment/mendix-cloud.md b/content/en/docs/releasenotes/deployment/mendix-cloud.md
index d4046afc19a..3321da91a4e 100644
--- a/content/en/docs/releasenotes/deployment/mendix-cloud.md
+++ b/content/en/docs/releasenotes/deployment/mendix-cloud.md
@@ -8,8 +8,6 @@ description: "Release notes for deployment to Mendix Cloud"
These release notes cover changes to deployment to [Mendix Cloud](/developerportal/deploy/mendix-cloud-deploy/).
-Mendix Cloud deployments are also dependent on the latest version of the [Mendix Cloud Foundry Buildpack](https://github.com/mendix/cf-mendix-buildpack). The [Mendix Cloud Foundry Buildpack release notes](https://github.com/mendix/cf-mendix-buildpack/releases) are published separately, as other deployment targets are also dependent on the buildpack.
-
There are separate release notes for other deployment targets; for more information, see the [Deployment](/releasenotes/developer-portal/deployment/) release notes.
For information on the current status of deployment to Mendix Cloud and any planned releases, see [Mendix Status](https://status.mendix.com/).
diff --git a/content/en/docs/support/_index.md b/content/en/docs/support/_index.md
index 73b6673cc03..b01641fe9b1 100644
--- a/content/en/docs/support/_index.md
+++ b/content/en/docs/support/_index.md
@@ -232,7 +232,7 @@ Mendix Support can analyze this component if your app is running on Mendix Cloud
### Container Runtime Platform
-The container runtime platform refers to the platform for managing, creating, destroying, and scaling of runtime containers. In Mendix Cloud and Mendix Cloud Dedicated, Cloud Foundry is used.
+The container runtime platform refers to the platform for managing, creating, destroying, and scaling of runtime containers. In Mendix Cloud and Mendix Cloud Dedicated, Kubernetes is used.
Mendix Support can analyze this component if your app is running on Mendix Cloud or Mendix Cloud Dedicated. If it is running on SAP BTP instead, the selected third party can analyze this component.