diff --git a/acs-service-setup/dumps/composite.yaml b/acs-service-setup/dumps/composite.yaml
index db198f6a..ba6b3653 100644
--- a/acs-service-setup/dumps/composite.yaml
+++ b/acs-service-setup/dumps/composite.yaml
@@ -61,13 +61,3 @@ objects:
         # Unimplemented
         #- !u ConfigDB.Perm.ReadMemberships
         #- !u ConfigDB.Perm.ReadSuperclasses
-
----
-service: !u UUIDs.Service.Authentication
-version: 2
-grants:
-# XXX These should be replaced with individual grants.
-  !u ACS.ServiceAccount.CmdEsc:
-    !u ACS.Perm.Composite.CmdEsc: null
-  !u ACS.ServiceAccount.Warehouse:
-    !u ACS.Perm.Composite.Warehouse: null
diff --git a/acs-service-setup/dumps/service-accounts.yaml b/acs-service-setup/dumps/service-accounts.yaml
index 07561c31..050502fb 100644
--- a/acs-service-setup/dumps/service-accounts.yaml
+++ b/acs-service-setup/dumps/service-accounts.yaml
@@ -120,3 +120,9 @@ grants:
       !u UUIDs.App.SparkplugAddress: false
     !u UUIDs.Permission.Auth.ReadACL:
       !u ACS.PermGroup.CmdEsc: true
+    # XXX This should be replaced by a service role
+    !u ACS.Perm.Composite.CmdEsc: null
+
+  !u ACS.ServiceAccount.Warehouse:
+    # XXX This should be replaced by a service role
+    !u ACS.Perm.Composite.Warehouse: null