diff --git a/metadata/service/job_builder/single.yml b/metadata/service/job_builder/single.yml
new file mode 100644
index 0000000..d550460
--- /dev/null
+++ b/metadata/service/job_builder/single.yml
@@ -0,0 +1,18 @@
+applications:
+- jenkins
+classes:
+- service.jenkins.support
+parameters:
+  jenkins:
+    job_builder:
+      enabled: true
+      config:
+        source: git
+        address: ${_param:job_builder_config_address}
+        branch: ${_param:job_builder_config_branch}
+      master:
+        host: localhost
+        port: 8080
+        protocol: http
+        user: admin
+        password: ${_param:jenkins_admin_password}
diff --git a/metadata/service/master/single.yml b/metadata/service/master/single.yml
index 0d27f12..c93864a 100644
--- a/metadata/service/master/single.yml
+++ b/metadata/service/master/single.yml
@@ -12,34 +12,9 @@
         network: any
         port: 8080
         protocol: http
-      pkgs:
-        - jenkins-jobs-slack
-      plugins:
-      - name: git
-      - name: metadata
-      - name: envinject
-      - name: ansicolor
-      - name: greenballs
-      - name: gitlab-hook
-      - name: build-pipeline-plugin
-      - name: copyartifact
-      - name: ws-cleanup
-      - name: parameterized-trigger
       user:
         admin:
           api_token: ${_param:jenkins_admin_token}
           password: ${_param:jenkins_admin_password}
           password_hash: ${_param:jenkins_admin_password_hash}
           email: root@domain.com
-    job_builder:
-      enabled: true
-      config:
-        source: git
-        address: ${_param:job_builder_config_address}
-        branch: ${_param:job_builder_config_branch}
-      master:
-        host: localhost
-        port: 8080
-        protocol: http
-        user: admin
-        password: ${_param:jenkins_admin_password}