diff --git a/Jenkinsfile b/Jenkinsfile
index 9a076e2288ef97a755bdae010e86fcc862c2cdea..ff1430f2281a2d66c6f70f101a59a7fa9862bccf 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -66,7 +66,7 @@ pipeline {
                     FAILED_STAGE=env.STAGE_NAME
                 }
                 configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
-                    sh 'mvn -s $MAVEN_SETTINGS clean install -Dmaven.wagon.http.retryHandler.count=3'
+                    sh 'mvn -s $MAVEN_SETTINGS clean install -DskipTests -Dmaven.wagon.http.retryHandler.count=3'
                         
                     script {
                       	try {
diff --git a/src/main/java/de/ozgcloud/operator/elstertransfer/user/OzgCloudElsterTransferUserRemoteService.java b/src/main/java/de/ozgcloud/operator/elstertransfer/user/OzgCloudElsterTransferUserRemoteService.java
index 0b7533e67f3ec531188da7689749624d0f7077af..0f84efb28abc77c2316b91d4b467c6266f1aa408 100644
--- a/src/main/java/de/ozgcloud/operator/elstertransfer/user/OzgCloudElsterTransferUserRemoteService.java
+++ b/src/main/java/de/ozgcloud/operator/elstertransfer/user/OzgCloudElsterTransferUserRemoteService.java
@@ -35,6 +35,7 @@ import io.fabric8.kubernetes.api.model.Secret;
 import io.fabric8.kubernetes.api.model.SecretBuilder;
 import io.fabric8.kubernetes.api.model.apps.Deployment;
 import io.fabric8.kubernetes.client.KubernetesClient;
+import io.fabric8.kubernetes.client.dsl.NonDeletingOperation;
 import io.fabric8.kubernetes.client.dsl.NonNamespaceOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
 import lombok.RequiredArgsConstructor;
@@ -90,7 +91,8 @@ class OzgCloudElsterTransferUserRemoteService {
 	}
 
 	public void createOrUpdateSecret(String namespace, String userPassword, String secretName) {
-		client.resource(buildUserSecret(namespace, userPassword, secretName)).serverSideApply();
+		//client.secrets().inNamespace(namespace).resource(buildUserSecret(namespace, userPassword, secretName)).createOrReplace();
+		client.resource(buildUserSecret(namespace, userPassword, secretName)).unlock().createOr(NonDeletingOperation::update);
 	}
 
 	Secret buildUserSecret(String namespace, String userPassword, String secretName) {