diff --git a/Jenkinsfile b/Jenkinsfile
index ceec0c3f..5a16a95a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -29,6 +29,8 @@
  */
 LABEL = 'ubuntu'
 buildJdk = 'JDK 1.8 (latest)'
+buildJdk9 = 'JDK 1.9 (latest)'
+buildJdk10 = 'JDK 10 (latest)'
 buildMvn = 'Maven 3.5.2'
 deploySettings = 'DefaultMavenSettingsProvider.1331204114925'
 
@@ -39,21 +41,6 @@ pipeline {
 
     stages {
 
-
-        stage('Checkout') {
-            steps {
-                script {
-                    echo "Info: Job-Name=${JOB_NAME}, Branch=${BRANCH_NAME}, Workspace=${PWD}"
-                }
-                checkout scm
-            }
-            post {
-                failure {
-                    notifyBuild("Checkout failure")
-                }
-            }
-        }
-
         stage('BuildAndDeploy') {
             steps {
                 timeout(120) {
@@ -92,14 +79,61 @@ pipeline {
                 }
             }
         }
+        
+        stage('JDKs') {
+            parallel {
+                stage('JDK9') {
+                    steps {
+
+                        ws("${env.JOB_NAME}-JDK9") {
+                            timeout(120) {
+                                withMaven(maven: buildMvn, jdk: buildJdk9,
+                                        mavenSettingsConfig: deploySettings,
+                                        mavenLocalRepo: ".repository",
+                                        options: [concordionPublisher(disabled: true), dependenciesFingerprintPublisher(disabled: true),
+                                                  findbugsPublisher(disabled: true), artifactsPublisher(disabled: true),
+                                                  invokerPublisher(disabled: true), jgivenPublisher(disabled: true),
+                                                  junitPublisher(disabled: true, ignoreAttachments: false),
+                                                  openTasksPublisher(disabled: true), pipelineGraphPublisher(disabled: true)]
+                                )
+                                        {
+                                            sh "mvn clean install -B -U -e -fae -T2"
+                                        }
+                            }
+                        }
+                    }
+                }
+                stage('JDK10') {
+                    steps {
+
+                        ws("${env.JOB_NAME}-JDK10") {
+                            timeout(120) {
+                                withMaven(maven: buildMvn, jdk: buildJdk10,
+                                        mavenSettingsConfig: deploySettings,
+                                        mavenLocalRepo: ".repository",
+                                        options: [concordionPublisher(disabled: true), dependenciesFingerprintPublisher(disabled: true),
+                                                  findbugsPublisher(disabled: true), artifactsPublisher(disabled: true),
+                                                  invokerPublisher(disabled: true), jgivenPublisher(disabled: true),
+                                                  junitPublisher(disabled: true, ignoreAttachments: false),
+                                                  openTasksPublisher(disabled: true), pipelineGraphPublisher(disabled: true)]
+                                )
+                                        {
+                                            sh "mvn clean install -B -U -e -fae -T2"
+                                        }
+                            }
+                        }
+                    }
+                }
+            }
+        }
     }
 
     post {
         unstable {
             notifyBuild("Unstable Build")
         }
-        always {
-            cleanWs deleteDirs: true, notFailBuild: true, patterns: [[pattern: '.repository', type: 'EXCLUDE']]
+        failure {
+            notifyBuild("Error in redback build")
         }
         success {
             script {
diff --git a/pom.xml b/pom.xml
index bf993153..32b38ad4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -631,6 +631,19 @@
         <artifactId>assertj-core</artifactId>
         <version>1.7.1</version>
       </dependency>
+
+      <!-- Dependencies for JDK >=9 update -->
+      <dependency>
+        <groupId>javax.annotation</groupId>
+        <artifactId>javax.annotation-api</artifactId>
+        <version>1.3.2</version>
+      </dependency>
+
+      <dependency>
+        <groupId>javax.xml.bind</groupId>
+        <artifactId>jaxb-api</artifactId>
+        <version>2.3.0</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
diff --git a/redback-integrations/redback-rest/redback-rest-services/pom.xml b/redback-integrations/redback-rest/redback-rest-services/pom.xml
index 8add9372..b2e7dff2 100644
--- a/redback-integrations/redback-rest/redback-rest-services/pom.xml
+++ b/redback-integrations/redback-rest/redback-rest-services/pom.xml
@@ -196,6 +196,19 @@
       <scope>test</scope>
     </dependency>
 
+    <!-- Needed for JDK >= 9 -->
+    <dependency>
+      <groupId>javax.annotation</groupId>
+      <artifactId>javax.annotation-api</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>javax.xml.bind</groupId>
+      <artifactId>jaxb-api</artifactId>
+      <scope>test</scope>
+    </dependency>
+
   </dependencies>
 
   <build>