diff --git a/molgenis-jenkins/Chart.yaml b/molgenis-jenkins/Chart.yaml
index 97d7764..0310b56 100755
--- a/molgenis-jenkins/Chart.yaml
+++ b/molgenis-jenkins/Chart.yaml
@@ -1,6 +1,6 @@
 name: molgenis-jenkins
 home: https://jenkins.io/
-version: 0.2.3
+version: 0.2.4
 appVersion: 2.107
 description: Molgenis installation for the jenkins chart.
 sources:
diff --git a/molgenis-jenkins/templates/config.tpl b/molgenis-jenkins/templates/config.tpl
index 8286edb..67204ce 100644
--- a/molgenis-jenkins/templates/config.tpl
+++ b/molgenis-jenkins/templates/config.tpl
@@ -28,23 +28,23 @@ data:
         <org.csanchez.jenkins.plugins.kubernetes.KubernetesCloud plugin="kubernetes@{{ template "jenkins.kubernetes-version" . }}">
           <name>kubernetes</name>
           <templates>
-{{- if .Values.Agent.Enabled }}
+{{- range $podName, $pod := .Values.Pods }}
             <org.csanchez.jenkins.plugins.kubernetes.PodTemplate>
               <inheritFrom></inheritFrom>
-              <name>default</name>
+              <name>{{ $podName }}</name>
               <instanceCap>2147483647</instanceCap>
               <idleMinutes>0</idleMinutes>
-              <label>{{ .Release.Name }}-{{ .Values.Agent.Component }}</label>
+              <label>{{ $.Release.Name }}-{{ $pod.Label }}</label>
               <nodeSelector>
                 {{- $local := dict "first" true }}
-                {{- range $key, $value := .Values.Agent.NodeSelector }}
+                {{- range $key, $value := $pod.NodeSelector }}
                   {{- if not $local.first }},{{- end }}
                   {{- $key }}={{ $value }}
                   {{- $_ := set $local "first" false }}
                 {{- end }}</nodeSelector>
-                <nodeUsageMode>EXCLUSIVE</nodeUsageMode>
+                <nodeUsageMode>$pod.NodeUsageMode</nodeUsageMode>
               <volumes>
-{{- range $index, $volume := .Values.Agent.volumes }}
+{{- range $index, $volume := $pod.volumes }}
                 <org.csanchez.jenkins.plugins.kubernetes.volumes.{{ $volume.type }}Volume>
 {{- range $key, $value := $volume }}{{- if not (eq $key "type") }}
                   <{{ $key }}>{{ $value }}</{{ $key }}>
@@ -53,153 +53,59 @@ data:
 {{- end }}
               </volumes>
               <containers>
+{{- range $containerName, $container := $pod.Containers }}
                 <org.csanchez.jenkins.plugins.kubernetes.ContainerTemplate>
-                  <name>jnlp</name>
-                  <image>{{ .Values.Agent.Image }}:{{ .Values.Agent.ImageTag }}</image>
-{{- if .Values.Agent.Privileged }}
+                  <name>{{ $containerName }}</name>
+                  <image>{{ $container.Image }}:{{ $container.ImageTag | default "latest" }}</image>
+{{- if $container.Privileged }}
                   <privileged>true</privileged>
 {{- else }}
                   <privileged>false</privileged>
 {{- end }}
-                  <alwaysPullImage>{{ .Values.Agent.AlwaysPullImage }}</alwaysPullImage>
-                  <workingDir>/home/jenkins</workingDir>
-                  <command></command>
-                  <args>${computer.jnlpmac} ${computer.name}</args>
-                  <ttyEnabled>false</ttyEnabled>
-                  <resourceRequestCpu>{{.Values.Agent.Cpu}}</resourceRequestCpu>
-                  <resourceRequestMemory>{{.Values.Agent.Memory}}</resourceRequestMemory>
-                  <resourceLimitCpu>{{.Values.Agent.Cpu}}</resourceLimitCpu>
-                  <resourceLimitMemory>{{.Values.Agent.Memory}}</resourceLimitMemory>
-                  <envVars>
-                    <org.csanchez.jenkins.plugins.kubernetes.ContainerEnvVar>
-                      <key>JENKINS_URL</key>
-                      <value>http://{{ template "jenkins.fullname" . }}:{{.Values.Master.ServicePort}}{{ default "" .Values.Master.JenkinsUriPrefix }}</value>
-                    </org.csanchez.jenkins.plugins.kubernetes.ContainerEnvVar>
-                  </envVars>
-                </org.csanchez.jenkins.plugins.kubernetes.ContainerTemplate>
-              </containers>
-              <envVars/>
-              <annotations/>
-{{- if .Values.Agent.ImagePullSecret }}
-              <imagePullSecrets>
-                <org.csanchez.jenkins.plugins.kubernetes.PodImagePullSecret>
-                  <name>{{ .Values.Agent.ImagePullSecret }}</name>
-                </org.csanchez.jenkins.plugins.kubernetes.PodImagePullSecret>
-              </imagePullSecrets>
+{{- if $container.AlwaysPullImage }}
+                  <alwaysPullImage>true</alwaysPullImage>
 {{- else }}
-              <imagePullSecrets/>
-{{- end }}
-              <nodeProperties/>
-            </org.csanchez.jenkins.plugins.kubernetes.PodTemplate>
-{{- end -}}
-{{- if .Values.Pod.Enabled }}
-            <org.csanchez.jenkins.plugins.kubernetes.PodTemplate>
-              <inheritFrom></inheritFrom>
-              <name>{{ .Values.Pod.Label }}</name>
-              <instanceCap>2147483647</instanceCap>
-              <idleMinutes>0</idleMinutes>
-              <label>{{ .Values.Pod.Label }}</label>
-              <nodeSelector>
-                {{- $local := dict "first" true }}
-                {{- range $key, $value := .Values.Pod.NodeSelector }}
-                  {{- if not $local.first }},{{- end }}
-                  {{- $key }}={{ $value }}
-                  {{- $_ := set $local "first" false }}
-                {{- end }}</nodeSelector>
-                <nodeUsageMode>NORMAL</nodeUsageMode>
-              <volumes>
-{{- range $index, $volume := .Values.Pod.volumes }}
-                <org.csanchez.jenkins.plugins.kubernetes.volumes.{{ $volume.type }}Volume>
-{{- range $key, $value := $volume }}{{- if not (eq $key "type") }}
-                  <{{ $key }}>{{ $value }}</{{ $key }}>
-{{- end }}{{- end }}
-                </org.csanchez.jenkins.plugins.kubernetes.volumes.{{ $volume.type }}Volume>
-{{- end }}
-              </volumes>
-              <containers>
-                <org.csanchez.jenkins.plugins.kubernetes.ContainerTemplate>
-                  <name>{{ .Values.Pod.Label }}</name>
-                  <image>{{ .Values.Pod.Image }}:{{ .Values.Pod.ImageTag }}</image>
-{{- if .Values.Pod.Privileged }}
-                  <privileged>true</privileged>
-{{- else }}
-                  <privileged>false</privileged>
-{{- end }}
-                  <alwaysPullImage>{{ .Values.Pod.AlwaysPullImage }}</alwaysPullImage>
-                  <workingDir>/home/jenkins</workingDir>
-                  <command>{{ .Values.Pod.Command }}</command>
-                  <args>{{ .Values.Pod.Args }}</args>
-{{- if .Values.Pod.TTY }}
-                  <ttyEnabled>true</ttyEnabled>
-{{- else }}
-                  <ttyEnabled>false</ttyEnabled>
-{{- end }}
-                  <resourceRequestCpu>{{.Values.Pod.Cpu}}</resourceRequestCpu>
-                  <resourceRequestMemory>{{.Values.Pod.Memory}}</resourceRequestMemory>
-                  <resourceLimitCpu>{{.Values.Pod.Cpu}}</resourceLimitCpu>
-                  <resourceLimitMemory>{{.Values.Pod.Memory}}</resourceLimitMemory>
-                </org.csanchez.jenkins.plugins.kubernetes.ContainerTemplate>
-                <org.csanchez.jenkins.plugins.kubernetes.ContainerTemplate>
-                  <name>alpine</name>
-                  <image>spotify/alpine</image>
-                  <privileged>false</privileged>
                   <alwaysPullImage>false</alwaysPullImage>
+{{- end }}
                   <workingDir>/home/jenkins</workingDir>
-                  <command>/bin/sh -c</command>
-                  <args>cat</args>
+                  <command>{{ $container.Command | default "cat" }}</command>
+                  <args>{{ $container.Args | default "" }}</args>
+{{- if $container.TTY }}
                   <ttyEnabled>true</ttyEnabled>
-                  <resourceRequestCpu></resourceRequestCpu>
-                  <resourceRequestMemory></resourceRequestMemory>
-                  <resourceLimitCpu></resourceLimitCpu>
-                  <resourceLimitMemory></resourceLimitMemory>
-                  <ports/>
-                  <livenessProbe>
-                    <execArgs></execArgs>
-                    <timeoutSeconds>0</timeoutSeconds>
-                    <initialDelaySeconds>0</initialDelaySeconds>
-                    <failureThreshold>0</failureThreshold>
-                    <periodSeconds>0</periodSeconds>
-                    <successThreshold>0</successThreshold>
-                  </livenessProbe>
+{{- else }}
+                  <ttyEnabled>false</ttyEnabled>
+{{- end }}
+{{- if $container.resources }}
+{{- if $container.resources.requests }}
+                  <resourceRequestCpu>{{ $container.resources.requests.cpu | default "" }}</resourceRequestCpu>
+                  <resourceRequestMemory>{{ $container.resources.requests.memory | default "" }}</resourceRequestMemory>
+{{- end }}
+{{- if $container.resources.limits }}
+                  <resourceLimitCpu>{{ $container.resources.limits.cpu | default "" }}</resourceLimitCpu>
+                  <resourceLimitMemory>{{ $container.resources.limits.memory | default "" }}</resourceLimitMemory>
+{{- end }}
+{{- end }}
                 </org.csanchez.jenkins.plugins.kubernetes.ContainerTemplate>
+{{- end }}
               </containers>
               <envVars>
-                <envVars>
                   <org.csanchez.jenkins.plugins.kubernetes.model.KeyValueEnvVar>
                     <key>JENKINS_URL</key>
-                    <value>http://{{ template "jenkins.fullname" . }}:{{.Values.Master.ServicePort}}{{ default "" .Values.Master.JenkinsUriPrefix }}</value>
+                    <value>http://{{ template "jenkins.fullname" $ }}:{{$.Values.Master.ServicePort}}{{ default "" $.Values.Master.JenkinsUriPrefix }}</value>
                   </org.csanchez.jenkins.plugins.kubernetes.model.KeyValueEnvVar>
-                </envVars>
-                <org.csanchez.jenkins.plugins.kubernetes.model.SecretEnvVar>
-                  <key>PGP_PASSPHRASE</key>
-                  <secretName>molgenis-pipeline-env-secret</secretName>
-                  <secretKey>pgpPassphrase</secretKey>
-                </org.csanchez.jenkins.plugins.kubernetes.model.SecretEnvVar>
-                <org.csanchez.jenkins.plugins.kubernetes.model.KeyValueEnvVar>
-                  <key>PGP_SECRETKEY</key>
-                  <value>keyfile:/root/.m2/key.asc</value>
-                </org.csanchez.jenkins.plugins.kubernetes.model.KeyValueEnvVar>
-                <org.csanchez.jenkins.plugins.kubernetes.model.SecretEnvVar>
-                  <key>SONAR_TOKEN</key>
-                  <secretName>molgenis-pipeline-env-secret</secretName>
-                  <secretKey>sonarToken</secretKey>
-                </org.csanchez.jenkins.plugins.kubernetes.model.SecretEnvVar>
-                <org.csanchez.jenkins.plugins.kubernetes.model.SecretEnvVar>
-                  <key>CODECOV_TOKEN</key>
-                  <secretName>molgenis-pipeline-env-secret</secretName>
-                  <secretKey>codecovToken</secretKey>
-                </org.csanchez.jenkins.plugins.kubernetes.model.SecretEnvVar>
-                <org.csanchez.jenkins.plugins.kubernetes.model.SecretEnvVar>
-                  <key>GITHUB_TOKEN</key>
-                  <secretName>molgenis-pipeline-env-secret</secretName>
-                  <secretKey>githubToken</secretKey>
-                </org.csanchez.jenkins.plugins.kubernetes.model.SecretEnvVar>
+{{- range $index, $envVar := $pod.EnvVars }}
+                <org.csanchez.jenkins.plugins.kubernetes.model.{{ $envVar.type }}EnvVar>
+{{- range $key, $value := $envVar }}{{- if not (eq $key "type") }}
+                  <{{ $key }}>{{ $value }}</{{ $key }}>
+{{- end }}{{- end }}
+                </org.csanchez.jenkins.plugins.kubernetes.model.{{ $envVar.type }}EnvVar>
+{{- end }}
               </envVars>
               <annotations/>
-{{- if .Values.Pod.ImagePullSecret }}
+{{- if $pod.ImagePullSecret }}
               <imagePullSecrets>
                 <org.csanchez.jenkins.plugins.kubernetes.PodImagePullSecret>
-                  <name>{{ .Values.Pod.ImagePullSecret }}</name>
+                  <name>{{ $pod.ImagePullSecret }}</name>
                 </org.csanchez.jenkins.plugins.kubernetes.PodImagePullSecret>
               </imagePullSecrets>
 {{- else }}
@@ -207,7 +113,7 @@ data:
 {{- end }}
               <nodeProperties/>
             </org.csanchez.jenkins.plugins.kubernetes.PodTemplate>
-{{- end -}}
+{{- end }}
           </templates>
           <serverUrl>https://kubernetes.default</serverUrl>
           <skipTlsVerify>false</skipTlsVerify>
diff --git a/molgenis-jenkins/values.yaml b/molgenis-jenkins/values.yaml
index 423693b..17c1bc6 100644
--- a/molgenis-jenkins/values.yaml
+++ b/molgenis-jenkins/values.yaml
@@ -82,35 +82,50 @@ jenkins:
     CustomConfigMap: true
   rbac:
     install: true
-  # A second pod template for maven builds
-  Pod:
-    Enabled: true
-    Image: "webhost12.service.rug.nl/molgenis/molgenis-maven"
-    ImageTag: latest
-  # ImagePullSecret: jenkins
-    Label: "molgenis-maven"
-    Privileged: false
-    Cpu: ""
-    Memory: ""
-    # You may want to change this to true while testing a new image
-    AlwaysPullImage: false
-    Command: "/bin/sh -c"
-    Args: "cat"
-    TTY: true
-    # You can define the volumes that you want to mount for this container
-    # Allowed types are: ConfigMap, EmptyDir, HostPath, Nfs, Pod, Secret
-    # Configure the attributes as they appear in the corresponding Java class for that type
-    # https://github.com/jenkinsci/kubernetes-plugin/tree/master/src/main/java/org/csanchez/jenkins/plugins/kubernetes/volumes
-    volumes:
-      - type: HostPath
-        hostPath: "/var/run/docker.sock"
-        mountPath: "/var/run/docker.sock"
-      - type: Secret
-        secretName: molgenis-pipeline-file-secret
-        mountPath: "/root/.m2"
+  Pods:
+    default:
+      Label: "default"
+      NodeUsageMode: NORMAL
+      volumes:
+        - type: HostPath
+          hostPath: "/var/run/docker.sock"
+          mountPath: "/var/run/docker.sock"
+        - type: Secret
+          secretName: molgenis-pipeline-file-secret
+          mountPath: "/root/.m2"
+      Containers:
+        maven:
+          Image: "webhost12.service.rug.nl/molgenis/molgenis-maven"
+          resources:
+            requests:
+              cpu: "1000m"
+            limits:
+              memory: "1Gi"
+        alpine:
+          Image: "spotify/alpine"
+      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: 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
     NodeSelector: {}
-    # Key Value selectors. Ex:
-    # jenkins-agent: v1
 PipelineSecrets:
   Env:
     # Set to false to keep existing secret