diff --git a/.github/workflows/maven.yml b/.github/workflows/maven-build.yml
similarity index 97%
rename from .github/workflows/maven.yml
rename to .github/workflows/maven-build.yml
index 7ca61a7..8a1e9b2 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven-build.yml
@@ -6,7 +6,7 @@
 # separate terms of service, privacy policy, and support
 # documentation.
 
-name: Java CI with Maven
+name: Build
 
 on:
   push:
diff --git a/README.md b/README.md
index 06907e1..6136d92 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Zalando Cloud AWS
 
-[![Build Status](https://travis-ci.org/zalando/spring-cloud-config-aws-kms.svg?branch=master)](https://travis-ci.org/zalando/spring-cloud-config-aws-kms)
+[![Build Status](https://github.com/zalando/spring-cloud-config-aws-kms/actions/workflows/maven.yml/badge.svg?branch=master)](https://github.com/zalando/spring-cloud-config-aws-kms/actions/workflows/maven-build.yml)
 [![Javadocs](http://javadoc.io/badge/org.zalando/spring-cloud-config-aws-kms.svg?color=blue)](http://javadoc.io/doc/org.zalando/spring-cloud-config-aws-kms)
 [![Maven Central](https://img.shields.io/maven-central/v/org.zalando/spring-cloud-config-aws-kms.svg)](https://maven-badges.herokuapp.com/maven-central/org.zalando/spring-cloud-config-aws-kms)
 [![License](https://img.shields.io/badge/license-Apache_2.0-blue.svg)](https://raw.githubusercontent.com/zalando-incubator/aws-support-spring-boot-starter/master/LICENSE)
@@ -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.
 
@@ -30,10 +30,6 @@ Development
 ### Run Test Suite
 
     mvn clean test
-    
-### Coverage Report
-
-    open coverage/target/site/jacoco/index.html
 
 Releases
 --------
diff --git a/pom.xml b/pom.xml
index 8288cc3..dbdda96 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,8 +27,8 @@
 	</organization>
 	
 	<properties>
-		<spring-cloud-aws.version>3.1.0</spring-cloud-aws.version>
-		<testcontainers.version>1.19.3</testcontainers.version>
+		<spring-cloud-aws.version>3.1.1</spring-cloud-aws.version>
+		<testcontainers.version>1.19.8</testcontainers.version>
 	</properties>
 	
 	<modules>
@@ -92,7 +92,7 @@
 		<developer>
 			<name>Felix Roske</name>
 			<organization>Zalando SE</organization>
-			<email>elix@zalando.de</email>
+			<email>felix@zalando.de</email>
 		</developer>
 		<developer>
 			<name>Oussema Toujani</name>
@@ -136,7 +136,7 @@
 					<plugin>
   						<groupId>org.sonatype.plugins</groupId>
   						<artifactId>nexus-staging-maven-plugin</artifactId>
-  						<version>1.6.13</version>
+  						<version>1.7.0</version>
   						<extensions>true</extensions>
   						<configuration>
      						<serverId>ossrh</serverId>
diff --git a/zalando-cloud-aws-autoconfigure/pom.xml b/zalando-cloud-aws-autoconfigure/pom.xml
index 20a2594..3ad4c6c 100644
--- a/zalando-cloud-aws-autoconfigure/pom.xml
+++ b/zalando-cloud-aws-autoconfigure/pom.xml
@@ -10,8 +10,7 @@
 		<artifactId>zalando-cloud-aws</artifactId>
 		<version>3.1.2-SNAPSHOT</version>
 	</parent>
-	
-	<groupId>org.zalando.awspring.cloud</groupId>
+
 	<artifactId>zalando-cloud-aws-autoconfigure</artifactId>
 	<version>3.1.2-SNAPSHOT</version>
 	<packaging>jar</packaging>
diff --git a/zalando-cloud-aws-kms/README.md b/zalando-cloud-aws-kms/README.md
index 5afdfd7..b39b74f 100644
--- a/zalando-cloud-aws-kms/README.md
+++ b/zalando-cloud-aws-kms/README.md
@@ -167,12 +167,6 @@ Encryption context and extra options can be combined in any order.
 ```shell
 mvn clean test
 ```
-    
-### Coverage Report
-
-```shell
-open coverage/target/site/jacoco/index.html
-```
 
 ## Releases
 
diff --git a/zalando-cloud-aws-kms/pom.xml b/zalando-cloud-aws-kms/pom.xml
index edafe23..e035a10 100644
--- a/zalando-cloud-aws-kms/pom.xml
+++ b/zalando-cloud-aws-kms/pom.xml
@@ -10,8 +10,7 @@
 		<artifactId>zalando-cloud-aws</artifactId>
 		<version>3.1.2-SNAPSHOT</version>
 	</parent>
-	
-	<groupId>org.zalando.awspring.cloud</groupId>
+
 	<artifactId>zalando-cloud-aws-kms</artifactId>
 	<version>3.1.2-SNAPSHOT</version>
 	<packaging>jar</packaging>
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 1ccbde7..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
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.2.3</version>
+		<version>3.3.1</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	
@@ -20,8 +20,8 @@
 	
 	<properties>
 		<java.version>17</java.version>
-		<spring-cloud.version>2023.0.0</spring-cloud.version>
-		<awsspring.version>3.1.0</awsspring.version>
+		<spring-cloud.version>2023.0.2</spring-cloud.version>
+		<awsspring.version>3.1.1</awsspring.version>
 	</properties>
 	
 	<dependencies>
@@ -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>