diff --git a/pillar/paas/docker.sls b/pillar/paas/docker.sls
--- a/pillar/paas/docker.sls
+++ b/pillar/paas/docker.sls
@@ -54,9 +54,9 @@
 
     # Continuous deployment jobs
     - jenkins/jenkins
-    - nasqueron/jenkins-slave-node
-    - nasqueron/jenkins-slave-php
-    - nasqueron/jenkins-slave-rust
+    - nasqueron/jenkins-agent-node
+    - nasqueron/jenkins-agent-php
+    - nasqueron/jenkins-agent-rust
     - nasqueron/tommy
 
     # Pixelfed
@@ -241,8 +241,9 @@
         app_port: 42080
         jnlp_port: 55000
 
-    jenkins_slave:
-      # Slaves for CD
+    jenkins_agent:
+      # Agents for CD
+
       apsile: &php_for_cd
         image: php
         realm: cd
@@ -257,6 +258,8 @@
         image: node
         realm: cd
 
+      # Agents for CI
+
       zateki: &php_for_ci
         image: php
         realm: ci
diff --git a/pillar/saas/jenkins.sls b/pillar/saas/jenkins.sls
--- a/pillar/saas/jenkins.sls
+++ b/pillar/saas/jenkins.sls
@@ -12,7 +12,7 @@
 
 jenkins_realms:
   cd:
-    ssh_key: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICiWLxPzS8X6NraVwsK95gFGe1pIuz+K0n7aw81nabcf jenkins-master-equatower-cd
+    ssh_key: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICiWLxPzS8X6NraVwsK95gFGe1pIuz+K0n7aw81nabcf jenkins-controller-equatower-cd
     network: cd
 
   ci:
@@ -22,14 +22,14 @@
 #   -------------------------------------------------------------
 #   Jenkins images
 #
-#   Each slave uses one Jenkins image.
+#   Each agent uses one Jenkins image.
 #
-#   An image can be used by several slaves, so we've more nodes
+#   An image can be used by several agents, so we've more nodes
 #   available for parallel builds.
 #   - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
 jenkins_images:
-  barebone: nasqueron/jenkins-slave-barebone
-  node: nasqueron/jenkins-slave-node
-  php: nasqueron/jenkins-slave-php
-  rust: nasqueron/jenkins-slave-rust
+  barebone: nasqueron/jenkins-agent-barebone
+  node: nasqueron/jenkins-agent-node
+  php: nasqueron/jenkins-agent-php
+  rust: nasqueron/jenkins-agent-rust
diff --git a/roles/paas-docker/containers/jenkins_slave.sls b/roles/paas-docker/containers/jenkins_agent.sls
rename from roles/paas-docker/containers/jenkins_slave.sls
rename to roles/paas-docker/containers/jenkins_agent.sls
--- a/roles/paas-docker/containers/jenkins_slave.sls
+++ b/roles/paas-docker/containers/jenkins_agent.sls
@@ -9,10 +9,10 @@
 {% set has_selinux = salt['grains.get']('selinux:enabled', False) %}
 {% set containers = pillar['docker_containers'][grains['id']] %}
 
-{% for instance, container in containers['jenkins_slave'].items() %}
+{% for instance, container in containers['jenkins_agent'].items() %}
 
 {% set realm = pillar['jenkins_realms'][container['realm']] %}
-{% set home = "/srv/jenkins/" + container['realm'] + "/slaves_homes/" + instance %}
+{% set home = "/srv/jenkins/" + container['realm'] + "/agents_homes/" + instance %}
 {% set image = pillar['jenkins_images'][container['image']] %}
 
 #   -------------------------------------------------------------
@@ -26,12 +26,12 @@
     - makedirs: True
 
 {% if has_selinux %}
-selinux_context_jenkins_slave_{{  instance }}_home:
+selinux_context_jenkins_agent_{{  instance }}_home:
   selinux.fcontext_policy_present:
     - name: {{ home }}
     - sel_type: container_file_t
 
-selinux_context_jenkins_slave_{{  instance }}_home_applied:
+selinux_context_jenkins_agent_{{  instance }}_home_applied:
   selinux.fcontext_policy_applied:
     - name: {{ home }}
 {% endif %}