diff --git a/molgenis-jenkins/templates/config.tpl b/molgenis-jenkins/templates/config.tpl
index 1626be9..7499a4b 100644
--- a/molgenis-jenkins/templates/config.tpl
+++ b/molgenis-jenkins/templates/config.tpl
@@ -15,12 +15,12 @@ data:
       <authorizationStrategy class="hudson.security.FullControlOnceLoggedInAuthorizationStrategy">
         <denyAnonymousReadAccess>true</denyAnonymousReadAccess>
       </authorizationStrategy>
-{{- if .Values.jenkins.Master.Security.UseGitHub }}
+{{- if .Values.Master.Security.UseGitHub }}
       <securityRealm class="org.jenkinsci.plugins.GithubSecurityRealm">
         <githubWebUri>https://github.com</githubWebUri>
         <githubApiUri>https://api.github.com</githubApiUri>
-        <clientID>{{ .Values.jenkins.Master.Security.Github.ClientID }}</clientID>
-        <clientSecret>{{ .Values.jenkins.Master.Security.Github.ClientSecret }}</clientSecret>
+        <clientID>{{ .Values.Master.Security.Github.ClientID }}</clientID>
+        <clientSecret>{{ .Values.Master.Security.Github.ClientSecret }}</clientSecret>
         <oauthScopes>read:org,user:email</oauthScopes>
       </securityRealm>
 {{- else }}
@@ -40,7 +40,7 @@ data:
           <templates>
 {{- range $podName, $pod := .Values.Pods }}
             <org.csanchez.jenkins.plugins.kubernetes.PodTemplate>
-              <inheritFrom></inheritFrom>
+              <inheritFrom>{{ $pod.InheritFrom | default "" }}</inheritFrom>
               <name>{{ $podName }}</name>
               <instanceCap>2147483647</instanceCap>
               <idleMinutes>0</idleMinutes>
@@ -94,6 +94,15 @@ data:
 {{- else }}
                   <ttyEnabled>false</ttyEnabled>
 {{- end }}
+                  <envVars>
+{{- range $index, $envVar := .EnvVars }}
+                    <org.csanchez.jenkins.plugins.kubernetes.model.{{ .type }}EnvVar>
+{{- range $key, $value := $envVar }}{{- if not (eq $key "type") }}
+                      <{{ $key }}>{{ $value }}</{{ $key }}>
+{{- end }}{{- end }}
+                    </org.csanchez.jenkins.plugins.kubernetes.model.{{ .type }}EnvVar>
+{{- end }}
+                  </envVars>
 {{- if .resources }}
 {{- if .resources.requests }}
                   <resourceRequestCpu>{{ .resources.requests.cpu | default "" }}</resourceRequestCpu>
diff --git a/molgenis-jenkins/values.yaml b/molgenis-jenkins/values.yaml
index bd2e473..c1b370f 100644
--- a/molgenis-jenkins/values.yaml
+++ b/molgenis-jenkins/values.yaml
@@ -214,51 +214,99 @@ jenkins:
             requests:
               cpu: "1"
               memory: "4Gi"
+          EnvVars:
+            - type: Secret
+              key: PGP_PASSPHRASE
+              secretName: molgenis-pipeline-env-secret
+              secretKey: pgpPassphrase
+            - type: KeyValue
+              key: PGP_SECRETKEY
+              value: "keyfile:/root/.m2/key.asc"
+            - type: KeyValue
+              key: npm_config_registry
+              value: "http://nexus.molgenis-nexus:8081/repository/npm-central/"
+            - type: Secret
+              key: SONAR_TOKEN
+              secretName: molgenis-pipeline-env-secret
+              secretKey: sonarToken
+            - type: Secret
+              key: GITHUB_TOKEN
+              secretName: molgenis-pipeline-env-secret
+              secretKey: githubToken
         alpine:
           Image: "spotify/alpine"
           Command: cat
           TTY: true
-# Hard to get these right memorywise!
-#        elasticsearch:
-#          Image: "elasticsearch"
-#          ImageTag: "5.5.1"
-#          Ports:
-#            - name: rest
-#              containerPort: "9200"
-#            - name: api
-#              containerPort: "9300"
-#        postgres:
-#          Image: "postgres"
-#          ImageTag: "9.6-alpine"
-#          Ports:
-#            - name: postgres
-#              containerPort: "5432"
-      EnvVars:
-        - type: Secret
-          key: PGP_PASSPHRASE
-          secretName: molgenis-pipeline-env-secret
-          secretKey: pgpPassphrase
-        - type: KeyValue
-          key: PGP_SECRETKEY
-          value: "keyfile:/root/.m2/key.asc"
-        - type: KeyValue
-          key: npm_config_registry
-          value: "http://nexus.molgenis-nexus:8081/repository/npm-central/"
-        - type: Secret
-          key: SONAR_TOKEN
-          secretName: molgenis-pipeline-env-secret
-          secretKey: sonarToken
-        - type: Secret
-          key: CODECOV_TOKEN
-          secretName: molgenis-pipeline-env-secret
-          secretKey: codecovToken
-        - type: Secret
-          key: GITHUB_TOKEN
-          secretName: molgenis-pipeline-env-secret
-          secretKey: githubToken
-      # If needed
-      # ImagePullSecret: jenkins
+          EnvVars:
+          EnvVars:
+            - type: Secret
+              key: CODECOV_TOKEN
+              secretName: molgenis-pipeline-env-secret
+              secretKey: codecovToken
       NodeSelector: {}
+    molgenis-it:
+      InheritFrom: molgenis
+      Label: molgenis-it
+      NodeUsageMode: EXCLUSIVE
+      Containers:
+        elasticsearch:
+          Image: docker.elastic.co/elasticsearch/elasticsearch
+          ImageTag: 5.5.3
+          resources:
+            requests:
+              cpu: "100m"
+              memory: "1Gi"
+            limits:
+              cpu: "1"
+              memory: "1500Mi"
+          EnvVars:
+          - type: KeyValue
+            key: ES_JAVA_OPTS
+            value: "-Xms512m -Xmx512m"
+          - type: KeyValue
+            key: cluster.name
+            value: molgenis
+          - type: KeyValue
+            key: bootstrap.memory_lock
+            value: "true"
+          - type: KeyValue
+            key: xpack.security.enabled
+            value: "false"
+          - type: KeyValue
+            key: discovery.type
+            value: single-node
+        postgres:
+          Image: postgres
+          ImageTag: 9.6-alpine
+          resources:
+            requests:
+              cpu: "100m"
+              memory: "250Mi"
+            limits:
+              cpu: "1"
+              memory: "250Mi"
+          EnvVars:
+          - type: KeyValue
+            key: POSTGRES_USER
+            value: molgenis
+          - type: KeyValue
+            key: POSTGRES_PASSWORD
+            value: molgenis
+          - type: KeyValue
+            key: POSTGRES_DB
+            value: molgenis
+        opencpu:
+          Image: molgenis/opencpu
+          AlwaysPullImage: true
+          resources:
+            requests:
+              cpu: "100m"
+              memory: "256Mi"
+            limits:
+              cpu: "1"
+              memory: "512Mi"
+      NodeSelector: {}
+
 PipelineSecrets:
   Env:
     # Set to false to keep existing secret