diff --git a/jenkins/cd/Jenkinsfile b/jenkins/cd/Jenkinsfile
index 27a7c05..eb21f04 100644
--- a/jenkins/cd/Jenkinsfile
+++ b/jenkins/cd/Jenkinsfile
@@ -1,15 +1,20 @@
 #!groovy
-pipeline {
+def MAVEN_IMAGE = 'maven:3.8.2-openjdk-11-slim'
 
-  agent any
+pipeline {
+  agent {
+        docker {
+      image "${MAVEN_IMAGE}"
+        }
+  }
 
   stages {
     stage ('Build') {
       steps {
         dir('user-service') {
-          sh "../mvnw clean verify " +
+          sh 'mvn clean verify ' +
                   "-Dpact.provider.version=${GIT_COMMIT} " +
-                  "-Dpact.verifier.publishResults=true"
+                  '-Dpact.verifier.publishResults=true'
         }
       }
     }
@@ -18,7 +23,7 @@ pipeline {
         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 user-service -b http://pact_broker -e ${GIT_COMMIT}"
+          sh "./pact-broker can-i-deploy -a user-service -b http://cicd.bayhan.ca:9292 -e ${GIT_COMMIT}"
         }
       }
     }
@@ -31,5 +36,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 438507f..0000000
--- a/jenkins/without-cd/Jenkinsfile-build
+++ /dev/null
@@ -1,18 +0,0 @@
-#!groovy
-pipeline {
-
-  agent any
-
-  stages {
-    stage('Build') {
-      steps {
-        dir('user-service') {
-          sh "../mvnw clean verify " +
-                  "-Dpact.provider.version=${GIT_COMMIT} " +
-                  "-Dpact.verifier.publishResults=true"
-        }
-      }
-    }
-  }
-
-}
\ 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 55b06eb..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 user-service -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 user-service -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..9620feb
--- /dev/null
+++ b/target/classes/application.yml
@@ -0,0 +1,8 @@
+server:
+  port: 8090
+
+spring:
+  jackson:
+    serialization:
+      write-dates-as-timestamps: false
+    date-format: yyyy-MM-dd'T'HH:mm:ss.SSS'Z'
\ No newline at end of file
diff --git a/target/classes/de/kreuzwerker/cdc/userservice/Friend.class b/target/classes/de/kreuzwerker/cdc/userservice/Friend.class
new file mode 100644
index 0000000..211f240
Binary files /dev/null and b/target/classes/de/kreuzwerker/cdc/userservice/Friend.class differ
diff --git a/target/classes/de/kreuzwerker/cdc/userservice/GlobalControllerExceptionHandler.class b/target/classes/de/kreuzwerker/cdc/userservice/GlobalControllerExceptionHandler.class
new file mode 100644
index 0000000..5d4c51b
Binary files /dev/null and b/target/classes/de/kreuzwerker/cdc/userservice/GlobalControllerExceptionHandler.class differ
diff --git a/target/classes/de/kreuzwerker/cdc/userservice/NotFoundException.class b/target/classes/de/kreuzwerker/cdc/userservice/NotFoundException.class
new file mode 100644
index 0000000..d50693b
Binary files /dev/null and b/target/classes/de/kreuzwerker/cdc/userservice/NotFoundException.class differ
diff --git a/target/classes/de/kreuzwerker/cdc/userservice/User.class b/target/classes/de/kreuzwerker/cdc/userservice/User.class
new file mode 100644
index 0000000..8da3f29
Binary files /dev/null and b/target/classes/de/kreuzwerker/cdc/userservice/User.class differ
diff --git a/target/classes/de/kreuzwerker/cdc/userservice/UserController.class b/target/classes/de/kreuzwerker/cdc/userservice/UserController.class
new file mode 100644
index 0000000..28544fe
Binary files /dev/null and b/target/classes/de/kreuzwerker/cdc/userservice/UserController.class differ
diff --git a/target/classes/de/kreuzwerker/cdc/userservice/UserRole.class b/target/classes/de/kreuzwerker/cdc/userservice/UserRole.class
new file mode 100644
index 0000000..8a0467b
Binary files /dev/null and b/target/classes/de/kreuzwerker/cdc/userservice/UserRole.class differ
diff --git a/target/classes/de/kreuzwerker/cdc/userservice/UserService.class b/target/classes/de/kreuzwerker/cdc/userservice/UserService.class
new file mode 100644
index 0000000..983b38a
Binary files /dev/null and b/target/classes/de/kreuzwerker/cdc/userservice/UserService.class differ
diff --git a/target/classes/de/kreuzwerker/cdc/userservice/UserServiceApplication.class b/target/classes/de/kreuzwerker/cdc/userservice/UserServiceApplication.class
new file mode 100644
index 0000000..fa2c8d6
Binary files /dev/null and b/target/classes/de/kreuzwerker/cdc/userservice/UserServiceApplication.class differ
diff --git a/target/test-classes/de/kreuzwerker/cdc/userservice/ContractTest.class b/target/test-classes/de/kreuzwerker/cdc/userservice/ContractTest.class
new file mode 100644
index 0000000..ed553cd
Binary files /dev/null and b/target/test-classes/de/kreuzwerker/cdc/userservice/ContractTest.class differ
diff --git a/target/test-classes/de/kreuzwerker/cdc/userservice/GenericStateWithParameterContractTest.class b/target/test-classes/de/kreuzwerker/cdc/userservice/GenericStateWithParameterContractTest.class
new file mode 100644
index 0000000..36950c5
Binary files /dev/null and b/target/test-classes/de/kreuzwerker/cdc/userservice/GenericStateWithParameterContractTest.class differ
diff --git a/target/test-classes/de/kreuzwerker/cdc/userservice/MockedUserServiceContractTest.class b/target/test-classes/de/kreuzwerker/cdc/userservice/MockedUserServiceContractTest.class
new file mode 100644
index 0000000..0d6452a
Binary files /dev/null and b/target/test-classes/de/kreuzwerker/cdc/userservice/MockedUserServiceContractTest.class differ
diff --git a/target/test-classes/de/kreuzwerker/cdc/userservice/UserServiceApplicationTests.class b/target/test-classes/de/kreuzwerker/cdc/userservice/UserServiceApplicationTests.class
new file mode 100644
index 0000000..345ac9e
Binary files /dev/null and b/target/test-classes/de/kreuzwerker/cdc/userservice/UserServiceApplicationTests.class differ