diff --git a/jenkins/cd/Jenkinsfile b/jenkins/cd/Jenkinsfile
index af03390..36d37a0 100644
--- a/jenkins/cd/Jenkinsfile
+++ b/jenkins/cd/Jenkinsfile
@@ -1,24 +1,31 @@
 #!groovy
-pipeline {
+def MAVEN_IMAGE = 'maven:3.8.2-openjdk-11-slim'
 
-  agent any
+pipeline {
+  // agent any
+
+  agent {
+        docker {
+      image "${MAVEN_IMAGE}"
+        }
+  }
 
   environment {
-      BRANCH_NAME=env.GIT_BRANCH.replace("origin/", "")
+      BRANCH_NAME = env.GIT_BRANCH.replace('origin/', '')
   }
 
   stages {
     stage('Build') {
       steps {
         dir('messaging-app') {
-           sh '../mvnw clean verify'
+          sh '../mvnw clean verify'
         }
       }
     }
     stage('Publish Pacts') {
       steps {
         dir('messaging-app') {
-           sh '../mvnw pact:publish -Dpact.consumer.version=${GIT_COMMIT} -Dpact.tag=${BRANCH_NAME}'
+          sh '../mvnw pact:publish -Dpact.consumer.version=${GIT_COMMIT} -Dpact.tag=${BRANCH_NAME}'
         }
       }
     }
@@ -40,5 +47,4 @@ pipeline {
       }
     }
   }
-
-}
\ No newline at end of file
+}
diff --git a/jenkins/without-cd/Jenkinsfile-build b/jenkins/without-cd/Jenkinsfile-build
deleted file mode 100644
index 6a97182..0000000
--- a/jenkins/without-cd/Jenkinsfile-build
+++ /dev/null
@@ -1,27 +0,0 @@
-#!groovy
-pipeline {
-
-  agent any
-
-  environment {
-      BRANCH_NAME=env.GIT_BRANCH.replace("origin/", "")
-  }
-
-  stages {
-    stage('Build') {
-      steps {
-        dir('messaging-app') {
-           sh '../mvnw clean verify'
-        }
-      }
-    }
-    stage('Publish Pacts') {
-      steps {
-        dir('messaging-app') {
-           sh '../mvnw pact:publish -Dpact.consumer.version=${GIT_COMMIT} -Dpact.tag=${BRANCH_NAME}'
-        }
-      }
-    }
-  }
-
-}
\ No newline at end of file
diff --git a/jenkins/without-cd/Jenkinsfile-deploy b/jenkins/without-cd/Jenkinsfile-deploy
deleted file mode 100644
index c1ed3ca..0000000
--- a/jenkins/without-cd/Jenkinsfile-deploy
+++ /dev/null
@@ -1,38 +0,0 @@
-#!groovy
-pipeline {
-
-  agent any
-
-  parameters {
-    string(name: 'GIT_COMMIT', defaultValue: '', description: 'Version (a.k.a. git commit) to deploy')
-  }
-
-  options {
-    skipDefaultCheckout()
-  }
-
-  stages {
-    stage('Check Pact Verifications') {
-      steps {
-        sh 'curl -LO https://github.com/pact-foundation/pact-ruby-standalone/releases/download/v1.88.3/pact-1.88.3-linux-x86_64.tar.gz'
-        sh 'tar xzf pact-1.88.3-linux-x86_64.tar.gz'
-        dir('pact/bin') {
-          sh "./pact-broker can-i-deploy -a messaging-app -b http://pact_broker -e ${GIT_COMMIT} --to prod"
-        }
-      }
-    }
-    stage('Deploy') {
-      steps {
-        echo 'Deploying to prod now...'
-      }
-    }
-    stage('Tag Pact') {
-      steps {
-        dir('pact/bin') {
-          sh "./pact-broker create-version-tag -a messaging-app -b http://pact_broker -e ${GIT_COMMIT} -t prod"
-        }
-      }
-    }
-  }
-
-}
\ No newline at end of file
diff --git a/target/classes/application.yml b/target/classes/application.yml
new file mode 100644
index 0000000..4d30c5d
--- /dev/null
+++ b/target/classes/application.yml
@@ -0,0 +1,2 @@
+user-service:
+  base-url: "http://localhost:8090"
\ No newline at end of file
diff --git a/target/classes/de/kreuzwerker/cdc/messagingapp/Friend.class b/target/classes/de/kreuzwerker/cdc/messagingapp/Friend.class
new file mode 100644
index 0000000..d8f2be1
Binary files /dev/null and b/target/classes/de/kreuzwerker/cdc/messagingapp/Friend.class differ
diff --git a/target/classes/de/kreuzwerker/cdc/messagingapp/MessagingApplication.class b/target/classes/de/kreuzwerker/cdc/messagingapp/MessagingApplication.class
new file mode 100644
index 0000000..ee6f530
Binary files /dev/null and b/target/classes/de/kreuzwerker/cdc/messagingapp/MessagingApplication.class differ
diff --git a/target/classes/de/kreuzwerker/cdc/messagingapp/User.class b/target/classes/de/kreuzwerker/cdc/messagingapp/User.class
new file mode 100644
index 0000000..bad5575
Binary files /dev/null and b/target/classes/de/kreuzwerker/cdc/messagingapp/User.class differ
diff --git a/target/classes/de/kreuzwerker/cdc/messagingapp/UserServiceClient.class b/target/classes/de/kreuzwerker/cdc/messagingapp/UserServiceClient.class
new file mode 100644
index 0000000..01706bd
Binary files /dev/null and b/target/classes/de/kreuzwerker/cdc/messagingapp/UserServiceClient.class differ
diff --git a/target/test-classes/de/kreuzwerker/cdc/messagingapp/MessagingApplicationTests.class b/target/test-classes/de/kreuzwerker/cdc/messagingapp/MessagingApplicationTests.class
new file mode 100644
index 0000000..2eecc84
Binary files /dev/null and b/target/test-classes/de/kreuzwerker/cdc/messagingapp/MessagingApplicationTests.class differ
diff --git a/target/test-classes/de/kreuzwerker/cdc/messagingapp/UserServiceContractTest.class b/target/test-classes/de/kreuzwerker/cdc/messagingapp/UserServiceContractTest.class
new file mode 100644
index 0000000..4c211d2
Binary files /dev/null and b/target/test-classes/de/kreuzwerker/cdc/messagingapp/UserServiceContractTest.class differ
diff --git a/target/test-classes/de/kreuzwerker/cdc/messagingapp/UserServiceContractTestV1.class b/target/test-classes/de/kreuzwerker/cdc/messagingapp/UserServiceContractTestV1.class
new file mode 100644
index 0000000..c3e1b35
Binary files /dev/null and b/target/test-classes/de/kreuzwerker/cdc/messagingapp/UserServiceContractTestV1.class differ
diff --git a/target/test-classes/de/kreuzwerker/cdc/messagingapp/UserServiceGenericStateWithParameterContractTest.class b/target/test-classes/de/kreuzwerker/cdc/messagingapp/UserServiceGenericStateWithParameterContractTest.class
new file mode 100644
index 0000000..109dc91
Binary files /dev/null and b/target/test-classes/de/kreuzwerker/cdc/messagingapp/UserServiceGenericStateWithParameterContractTest.class differ