diff --git a/services/essentials.yaml b/services/essentials.yaml
index e4b26977..3a10238f 100644
--- a/services/essentials.yaml
+++ b/services/essentials.yaml
@@ -72,6 +72,12 @@ spec:
     - groupId: org.jenkins-ci.plugins
       artifactId: jsch
       version: 0.1.54.2
+    - groupId: org.jenkins-ci.plugins
+      artifactId: docker-commons
+      version: '1.9'
+    - groupId: org.jenkins-ci.plugins
+      artifactId: token-macro
+      version: '2.3'
   environments:
     - name: docker-cloud
       plugins:
@@ -200,7 +206,7 @@ status:
       version: 2.2.0
     - groupId: org.jenkins-ci.plugins
       artifactId: docker-commons
-      version: '1.5'
+      version: '1.9'
     - groupId: org.jenkins-ci.plugins
       artifactId: docker-workflow
       version: '1.14'
@@ -344,7 +350,7 @@ status:
       version: '1.14'
     - groupId: org.jenkins-ci.plugins
       artifactId: token-macro
-      version: '2.0'
+      version: '2.3'
     - groupId: org.jenkins-ci.plugins
       artifactId: variant
       version: '1.1'
@@ -384,9 +390,6 @@ status:
   environments:
     - name: docker-cloud
       plugins:
-        - groupId: org.jenkins-ci.plugins
-          artifactId: docker-commons
-          version: '1.9'
         - groupId: org.jenkins-ci.plugins
           artifactId: docker-java-api
           version: 3.0.14
@@ -396,9 +399,6 @@ status:
         - groupId: org.jenkins-ci.plugins
           artifactId: ssh-slaves
           version: '1.22'
-        - groupId: org.jenkins-ci.plugins
-          artifactId: token-macro
-          version: '2.3'
     - name: aws-ec2-cloud
       plugins:
         - groupId: io.jenkins.plugins