diff --git a/broker/src/main/groovy/com/swisscom/cloud/sb/broker/backup/shield/restClient/ShieldRestClientImpl.groovy b/broker/src/main/groovy/com/swisscom/cloud/sb/broker/backup/shield/restClient/ShieldRestClientImpl.groovy
index fc71e38fb..39d910c88 100644
--- a/broker/src/main/groovy/com/swisscom/cloud/sb/broker/backup/shield/restClient/ShieldRestClientImpl.groovy
+++ b/broker/src/main/groovy/com/swisscom/cloud/sb/broker/backup/shield/restClient/ShieldRestClientImpl.groovy
@@ -27,7 +27,7 @@ import org.springframework.http.HttpMethod
 import org.springframework.web.client.RestTemplate
 
 @Slf4j
-abstract class ShieldRestClientImpl {
+abstract class ShieldRestClientImpl implements ShieldRestClient {
     protected ShieldConfig config
     protected RestTemplate restTemplate
 
diff --git a/broker/src/main/groovy/com/swisscom/cloud/sb/broker/backup/shield/restClient/ShieldRestClientv1.groovy b/broker/src/main/groovy/com/swisscom/cloud/sb/broker/backup/shield/restClient/ShieldRestClientv1.groovy
index faa6f0c0f..cc1368d92 100644
--- a/broker/src/main/groovy/com/swisscom/cloud/sb/broker/backup/shield/restClient/ShieldRestClientv1.groovy
+++ b/broker/src/main/groovy/com/swisscom/cloud/sb/broker/backup/shield/restClient/ShieldRestClientv1.groovy
@@ -28,7 +28,7 @@ import org.springframework.stereotype.Component
 
 @Slf4j
 @Component
-class ShieldRestClientv1 extends ShieldRestClientImpl implements ShieldRestClient {
+class ShieldRestClientv1 extends ShieldRestClientImpl {
     public static final String HEADER_API_KEY = 'X-Shield-Token'
     private final int apiVersion = 1
 
diff --git a/broker/src/main/groovy/com/swisscom/cloud/sb/broker/backup/shield/restClient/ShieldRestClientv2.groovy b/broker/src/main/groovy/com/swisscom/cloud/sb/broker/backup/shield/restClient/ShieldRestClientv2.groovy
index 78ce5a605..47d6c2373 100644
--- a/broker/src/main/groovy/com/swisscom/cloud/sb/broker/backup/shield/restClient/ShieldRestClientv2.groovy
+++ b/broker/src/main/groovy/com/swisscom/cloud/sb/broker/backup/shield/restClient/ShieldRestClientv2.groovy
@@ -26,7 +26,7 @@ import org.springframework.stereotype.Component
 
 @Slf4j
 @Component
-class ShieldRestClientv2 extends ShieldRestClientImpl implements ShieldRestClient {
+class ShieldRestClientv2 extends ShieldRestClientImpl {
     public static final String HEADER_API_SESSION = 'X-Shield-Session'
     private final int apiVersion = 2