diff --git a/jenkins/client/single.yml b/jenkins/client/single.yml
new file mode 100644
index 0000000..21d0cb2
--- /dev/null
+++ b/jenkins/client/single.yml
@@ -0,0 +1,4 @@
+parameters:
+  jenkins:
+    client:
+      enabled: True
\ No newline at end of file
diff --git a/jenkins/master/single.yml b/jenkins/master/single.yml
new file mode 100644
index 0000000..ceb6766
--- /dev/null
+++ b/jenkins/master/single.yml
@@ -0,0 +1,44 @@
+classes:
+- service.git.client
+- service.java.environment
+- service.jenkins.master.single
+parameters:
+  _param:
+    java_environment_platform: openjdk
+    java_environment_version: '8'
+  jenkins:
+    master:
+      enabled: true
+      sudo: false
+      mode: "NORMAL"
+      update_site_url: 'http://updates.jenkins-ci.org/experimental/update-center.json'
+      views:
+      - name: "Build"
+        regex: "build-.*"
+      admin:
+        email: autobuild@domain.com
+      http:
+        network: any
+        port: 8080
+        protocol: http
+      plugins:
+      - name: extended-choice-parameter
+      - name: rebuild
+      - name: test-stability
+      - name: build-blocker-plugin
+      - name: heavy-job
+      - name: workflow-aggregator
+      - name: git
+      - name: metadata
+      - name: envinject
+      - name: ansicolor
+      - name: greenballs
+      - name: gitlab-hook
+      - name: copyartifact
+      - name: ws-cleanup
+      user:
+        admin:
+          api_token: ${_param:jenkins_admin_token}
+          password: ${_param:jenkins_admin_password}
+          password_hash: ${_param:jenkins_admin_password_hash}
+          email: root@domain.com
diff --git a/jenkins/slave.yml b/jenkins/slave.yml
deleted file mode 100644
index e27572d..0000000
--- a/jenkins/slave.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-applications:
-  - jenkins
-classes:
-  - service.java.environment
-  - system.docker.host.single
-parameters:
-  _param:
-    java_environment_version: "8"
-    java_environment_platform: openjdk
-  java:
-    environment:
-      headless: true
-  jenkins:
-    slave:
-      enabled: true
-      pkgs: false
-      sudo: false
-      scripts: []
-      master:
-        host: 10.0.175.10
-        port: 8081
-        protocol: http
-#      user:
-#        name: admin
-#        password: ${_param:jenkins_admin_password}
-  linux:
-    system:
-      user:
-        jenkins:
-          enabled: true
-          name: jenkins
-          home: /var/lib/jenkins
-          sudo: false
-          groups:
-            - docker
diff --git a/jenkins/slave/single.yml b/jenkins/slave/single.yml
new file mode 100644
index 0000000..14540a5
--- /dev/null
+++ b/jenkins/slave/single.yml
@@ -0,0 +1,37 @@
+classes:
+- service.jenkins.slave.single
+- service.java.environment
+- service.git.client
+parameters:
+  _param:
+    java_environment_version: "8"
+    java_environment_platform: openjdk
+  linux:
+    system:
+      package:
+        python-dev:
+          version: latest
+        build-essential:
+          version: latest
+      user:
+        jenkins:
+          enabled: true
+          name: jenkins
+          home: /var/lib/jenkins
+          sudo: false
+  java:
+    environment:
+      headless: true
+  jenkins:
+    slave:
+      enabled: true
+      pkgs: false
+      sudo: false
+      scripts: []
+      master:
+        host: ${_param:jenkins_slave_master}
+        port: 8080
+        protocol: http
+      user:
+        name: admin
+        password: ${_param:jenkins_admin_password}
diff --git a/nginx/server/proxy/cicd/gerrit.yml b/nginx/server/proxy/cicd/gerrit.yml
new file mode 100644
index 0000000..2593dd7
--- /dev/null
+++ b/nginx/server/proxy/cicd/gerrit.yml
@@ -0,0 +1,34 @@
+parameters:
+  _param:
+    nginx_proxy_gerrit_server_ssl_authority: virt
+    nginx_proxy_gerrit_server_proxy_host: ${_param:single_address}
+    nginx_proxy_gerrit_server_proxy_port: 8082
+    nginx_proxy_gerrit_server_site_host: ${linux:network:fqdn}
+    nginx_proxy_gerrit_server_site_port: 8083
+  nginx:
+    server:
+      enabled: true
+      user:
+        admin:
+          enabled: true
+          password: password
+      site:
+        nginx_proxy_gerrit_server:
+          enabled: true
+          type: nginx_proxy
+          name: gerrit_server
+          auth:
+            engine: basic
+          proxy:
+            host: ${_param:nginx_proxy_gerrit_server_proxy_host}
+            port: ${_param:nginx_proxy_gerrit_server_proxy_port}
+            protocol: http
+          ssl:
+            enabled: true
+            engine: salt
+            authority: ${_param:nginx_proxy_gerrit_server_ssl_authority}
+            certificate: ${_param:nginx_proxy_gerrit_server_site_host}
+            mode: secure
+          host:
+            name: ${_param:nginx_proxy_gerrit_server_site_host}
+            port: ${_param:nginx_proxy_gerrit_server_site_port}