diff --git a/docker/client/images/cicd.yml b/docker/client/images/cicd.yml
new file mode 100644
index 0000000..cfb713d
--- /dev/null
+++ b/docker/client/images/cicd.yml
@@ -0,0 +1,14 @@
+classes:
+- system.docker.client.images.jenkins_master
+- system.docker.client.images.jenkins_slave
+parameters:
+  docker:
+    client:
+      enabled: true
+      images:
+      - ${_param:docker_image_mysql}
+      - ${_param:docker_image_phpldapadmin}
+      - ${_param:docker_image_openldap}
+      - ${_param:docker_image_gerrit}
+      - ${_param:docker_image_registry}
+      - ${_param:docker_image_visualizer}
\ No newline at end of file
diff --git a/docker/client/images/monitoring.yml b/docker/client/images/monitoring.yml
new file mode 100644
index 0000000..229152d
--- /dev/null
+++ b/docker/client/images/monitoring.yml
@@ -0,0 +1,17 @@
+parameters:
+  docker:
+    client:
+      enabled: true
+      images:
+      - ${_param:docker_image_alerta}
+      - ${_param:docker_image_alertmanager}
+      - ${_param:docker_image_grafana}
+      - ${_param:docker_image_prometheus}
+      - ${_param:docker_image_prometheus_gainsight}
+      - ${_param:docker_image_prometheus_gainsight_elasticsearch}
+      - ${_param:docker_image_prometheus_relay}
+      - ${_param:docker_image_pushgateway}
+      - ${_param:docker_image_remote_agent}
+      - ${_param:docker_image_remote_collector}
+      - ${_param:docker_image_remote_storage_adapter}
+      - ${_param:docker_image_sf_notifier}
\ No newline at end of file
diff --git a/docker/swarm/stack/jenkins/master.yml b/docker/swarm/stack/jenkins/master.yml
index 6af8d3e..384ee9f 100644
--- a/docker/swarm/stack/jenkins/master.yml
+++ b/docker/swarm/stack/jenkins/master.yml
@@ -1,6 +1,5 @@
 classes:
 - system.docker
-- system.docker.client.images.jenkins_master
 parameters:
   _param:
     jenkins_master_extra_opts: ""
diff --git a/docker/swarm/stack/jenkins/slave_base.yml b/docker/swarm/stack/jenkins/slave_base.yml
index 648a572..630dd14 100644
--- a/docker/swarm/stack/jenkins/slave_base.yml
+++ b/docker/swarm/stack/jenkins/slave_base.yml
@@ -1,5 +1,3 @@
-classes:
-- system.docker.client.images.jenkins_slave
 parameters:
   _param:
     jenkins_master_host: ${_param:control_vip_address}