diff --git a/docker/client/images/cicd.yml b/docker/client/images/cicd.yml
index cfb713d..895bde3 100644
--- a/docker/client/images/cicd.yml
+++ b/docker/client/images/cicd.yml
@@ -7,8 +7,6 @@
       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/ldap.yml b/docker/client/images/ldap.yml
new file mode 100644
index 0000000..f98e9c5
--- /dev/null
+++ b/docker/client/images/ldap.yml
@@ -0,0 +1,7 @@
+parameters:
+  docker:
+    client:
+      enabled: true
+      images:
+      - ${_param:docker_image_openldap}
+      - ${_param:docker_image_phpldapadmin}
\ No newline at end of file
diff --git a/docker/swarm/stack/jenkins/master.yml b/docker/swarm/stack/jenkins/master.yml
index 384ee9f..6af8d3e 100644
--- a/docker/swarm/stack/jenkins/master.yml
+++ b/docker/swarm/stack/jenkins/master.yml
@@ -1,5 +1,6 @@
 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 630dd14..648a572 100644
--- a/docker/swarm/stack/jenkins/slave_base.yml
+++ b/docker/swarm/stack/jenkins/slave_base.yml
@@ -1,3 +1,5 @@
+classes:
+- system.docker.client.images.jenkins_slave
 parameters:
   _param:
     jenkins_master_host: ${_param:control_vip_address}
diff --git a/docker/swarm/stack/ldap.yml b/docker/swarm/stack/ldap.yml
index 14e8b37..fbb74bc 100644
--- a/docker/swarm/stack/ldap.yml
+++ b/docker/swarm/stack/ldap.yml
@@ -1,3 +1,5 @@
+classes:
+- system.docker.client.images.ldap
 parameters:
   docker:
     client: