diff --git a/pillar/credentials/zr.sls b/pillar/credentials/zr.sls
--- a/pillar/credentials/zr.sls
+++ b/pillar/credentials/zr.sls
@@ -6,6 +6,12 @@
 #   License:        Trivial work, not eligible to copyright
 #   -------------------------------------------------------------
 
+#   -------------------------------------------------------------
+#   Zemke-Rhyne credentials
+#
+#   Map K<id> on DevCentral with hierarchical keys
+#   - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
 zr_credentials:
 
   #
@@ -86,3 +92,24 @@
     phabricator:
       mysql: 134
       sendgrid: 45
+
+#   -------------------------------------------------------------
+#   Zemke-Rhyne clients
+#
+#   This section should list all the Docker engines server
+#   - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+zr_clients:
+ - key: 2
+   allowedConnectionFrom:
+     - 172.27.26.49
+     - dwellers.nasqueron.drake
+     - dwellers.nasqueron.org
+   restrictCommand:
+   comment: Zemke-Rhyne
+
+ - key: 152
+   allowedConnectionFrom:
+     - docker-001.nasqueron.org
+   restrictCommand:
+   comment: Zemke-Rhyne
diff --git a/pillar/paas/docker.sls b/pillar/paas/docker.sls
--- a/pillar/paas/docker.sls
+++ b/pillar/paas/docker.sls
@@ -503,24 +503,3 @@
   - 7777 # File transfer proxy
   - 9090 # Web administration server
   - 9091 # Web administration server with TLS
-
- #   -------------------------------------------------------------
- #   Zemke-Rhyne clients
- #
- #   This section should list all the Docker engines server
- #   - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-zr_clients:
-  - key: 2
-    allowedConnectionFrom:
-      - 172.27.26.49
-      - dwellers.nasqueron.drake
-      - dwellers.nasqueron.org
-    restrictCommand:
-    comment: Zemke-Rhyne
-
-  - key: 152
-    allowedConnectionFrom:
-      - docker-001.nasqueron.org
-    restrictCommand:
-    comment: Zemke-Rhyne
diff --git a/pillar/top.sls b/pillar/top.sls
--- a/pillar/top.sls
+++ b/pillar/top.sls
@@ -43,7 +43,7 @@
 
   ysul:
     - devserver.repos
-    - paas.docker
+    - credentials.zr
     - saas.mediawiki
     - viperserv.bots
     - viperserv.fantoir