diff --git a/README.md b/README.md
index 0d90114..6136d92 100644
--- a/README.md
+++ b/README.md
@@ -12,14 +12,14 @@ Zalando Cloud AWS is an addition to [Spring Cloud AWS](https://github.com/awspri
 This project has dependency and transitive dependency on Spring Projects. The table below outlines the version of Spring Cloud AWS, Spring Cloud, Spring Boot and Spring Framework versions that are compatible with certain Zalando Cloud AWS versions.
 
 | Zalando Cloud AWS | Spring Cloud AWS | Spring Boot | Spring Framework | AWS Java SDK |
-| ----------------- | ---------------- | ----------- | ---------------- | ------------ |
+|-------------------|------------------|-------------|------------------|--------------|
 | 3.1.x             | 3.1.x            | 3.2.x       | 6.1.x            | 2.x          |
 
 ## Supported AWS integrations
 
 | AWS Service | Zalando Cloud AWS 3.x | 
-| ----------- | --------------------- |
-| KMS         | ✅                    |
+|-------------|-----------------------|
+| KMS         | ✅                     |
 
 Note that Spring Cloud AWS and Spring Cloud provide support for other AWS services in their projects.
 
diff --git a/zalando-cloud-aws-samples/zalando-cloud-aws-kms-sample/README.md b/zalando-cloud-aws-samples/zalando-cloud-aws-kms-sample/README.md
index 673931b..9995642 100644
--- a/zalando-cloud-aws-samples/zalando-cloud-aws-kms-sample/README.md
+++ b/zalando-cloud-aws-samples/zalando-cloud-aws-kms-sample/README.md
@@ -6,7 +6,7 @@ Startup localstack with KMS
 docker run -d --name localstack -p 4566:4566 -p 4510-4559:4510-4559 localstack/localstack
 ```
 
-Create customer-managed key and note down KeyId from the AWS CLI output
+Create customer-managed key and **note down the KeyId** from the AWS CLI output
 
 ```bash
 aws --endpoint-url http://localhost:4566 kms create-key
diff --git a/zalando-cloud-aws-samples/zalando-cloud-aws-kms-sample/pom.xml b/zalando-cloud-aws-samples/zalando-cloud-aws-kms-sample/pom.xml
index 172ea0a..0280da1 100644
--- a/zalando-cloud-aws-samples/zalando-cloud-aws-kms-sample/pom.xml
+++ b/zalando-cloud-aws-samples/zalando-cloud-aws-kms-sample/pom.xml
@@ -51,15 +51,10 @@
 			<artifactId>spring-cloud-aws-starter</artifactId>
 			<version>${awsspring.version}</version>
 		</dependency>
-		
-		<dependency>
-			<groupId>org.zalando.awspring.cloud</groupId>
-			<artifactId>zalando-cloud-aws-kms</artifactId>
-			<version>${project.version}</version>
-		</dependency>
+
 		<dependency>
 			<groupId>org.zalando.awspring.cloud</groupId>
-			<artifactId>zalando-cloud-aws-autoconfigure</artifactId>
+			<artifactId>zalando-cloud-aws-starter-kms</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 
diff --git a/zalando-cloud-aws-starters/zalando-cloud-aws-starter-kms/pom.xml b/zalando-cloud-aws-starters/zalando-cloud-aws-starter-kms/pom.xml
index fb7b49a..b8bf99e 100644
--- a/zalando-cloud-aws-starters/zalando-cloud-aws-starter-kms/pom.xml
+++ b/zalando-cloud-aws-starters/zalando-cloud-aws-starter-kms/pom.xml
@@ -13,7 +13,6 @@
 
 	<modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.zalando.awspring.cloud</groupId>
 	<artifactId>zalando-cloud-aws-starter-kms</artifactId>
 	<name>Zalando Cloud AWS KMS Starter</name>
 	<description>Zalando Cloud AWS Key Management Service Starter</description>
@@ -23,6 +22,11 @@
 			<groupId>io.awspring.cloud</groupId>
 			<artifactId>spring-cloud-aws-starter</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.zalando.awspring.cloud</groupId>
+			<artifactId>zalando-cloud-aws-autoconfigure</artifactId>
+			<version>${project.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>org.zalando.awspring.cloud</groupId>
 			<artifactId>zalando-cloud-aws-kms</artifactId>