diff --git a/templates/jenkins/0/docker-compose.yml b/templates/jenkins/0/docker-compose.yml
index 1b1b47e..34b642b 100644
--- a/templates/jenkins/0/docker-compose.yml
+++ b/templates/jenkins/0/docker-compose.yml
@@ -1,25 +1,38 @@
-version: '2'
+version: '2.1'
 
 services:
-  jenkins:
-    image: jenkins/jenkins:lts
+  jenkins-master:
+    image: jenkinsci/blueocean:latest
     ports:
       - 8080
+      - 50000
     volumes:
       - molgenis-jenkins:/var/jenkins_home
+    restart: always
     labels:
       io.rancher.container.pull_image: always
       traefik.frontend.rule: Host:${DOMAINS}
       traefik.backend: ${TRAEFIK_BACKEND}
       traefik.enable: true
       traefik.port: 8080
+    healthcheck:
+      test: ["CMD", "curl", "-sS", "http://localhost:50000" ]
+      interval: 5s
+      timeout: 10s
+      retries: 5
 
-  jenkins-agent-buildtools:
-    image: registry.molgenis.org/docker-molgenis-ops-releases/jenkins-agent-buildtools:latest
-    ports:
-      - 22
+  jenkins-agent-maven:
+    image: registry.molgenis.org/docker-molgenis-ops-releases/jenkins-agent-buildtools:lts
+    environment:
+      - JENKINS_URL=http://localhost:8080
+      - JENKINS_SECRET=paradoxa
+      - JENKINS_AGENT_NAME=buildtools
     volumes:
       - molgenis-jenkins-agent-buildtools:/var/jenkins_home
+    depends_on:
+      jenkins-master:
+        condition: service_healthy
+    restart: always
 
 volumes:
   molgenis-jenkins:
diff --git a/templates/jenkins/0/rancher-compose.yml b/templates/jenkins/0/rancher-compose.yml
index 7a18a28..1e5b407 100644
--- a/templates/jenkins/0/rancher-compose.yml
+++ b/templates/jenkins/0/rancher-compose.yml
@@ -16,13 +16,3 @@
         required: true
         default: "test.molgenis.org"
         type: "string"
-
-  start_on_create: true
-  scale: 1
-  health_check:
-    port: 8080
-    interval: 5000
-    unhealthy_threshold: 3
-    request_line: 'GET / HTTP/1.0'
-    healthy_threshold: 2
-    response_timeout: 5000
diff --git a/templates/molgenis/0/docker-compose.yml b/templates/molgenis/0/docker-compose.yml
index bca991a..9450bde 100644
--- a/templates/molgenis/0/docker-compose.yml
+++ b/templates/molgenis/0/docker-compose.yml
@@ -2,7 +2,7 @@ version: '2'
 
 services:
   molgenis:
-    image: registry.webhosting.rug.nl/molgenis/molgenis:latest
+    image: registry.molgenis.org/molgenis/molgenis:latest
     ports:
       - 8080
     links:
@@ -39,11 +39,21 @@ services:
       - postgres-data
     ports:
       - 5432
+    healthcheck:
+      test: ["CMD", "curl", "sS", "http://localhost:8080"]
+      interval: 5s
+      timeout: 10s
+      retries: 5
 
   opencpu:
-    image: registry.webhosting.rug.nl/molgenis/molgenis-opencpu:latest
+    image: registry.molgenis.org/molgenis/molgenis-opencpu:latest
     ports:
       - 8004
+    healthcheck:
+      test: ["CMD", "curl", "sS", "http://localhost:8084"]
+      interval: 5s
+      timeout: 10s
+      retries: 5
 
   elasticsearch:
     image: docker.elastic.co/elasticsearch/elasticsearch:5.5.1
diff --git a/templates/molgenis/0/rancher-compose.yml b/templates/molgenis/0/rancher-compose.yml
index f0f0073..7610f58 100644
--- a/templates/molgenis/0/rancher-compose.yml
+++ b/templates/molgenis/0/rancher-compose.yml
@@ -51,14 +51,4 @@
       label: "Initial and maximum size:"
       required: true
       default: "2g"
-      type: "string"
-
-  start_on_create: true
-  scale: 1
-  health_check:
-    port: 8080
-    interval: 5000
-    unhealthy_threshold: 3
-    request_line: 'GET / HTTP/1.0'
-    healthy_threshold: 2
-    response_timeout: 5000
+      type: "string"
\ No newline at end of file