diff --git a/ca/config.go b/ca/config.go
index <HASH>..<HASH> 100644
--- a/ca/config.go
+++ b/ca/config.go
@@ -29,13 +29,13 @@ const (
 )
 
 const (
-	rootCN = "cluster-ca"
+	rootCN = "swarm-ca"
 	// ManagerRole represents the Manager node type, and is used for authorization to endpoints
-	ManagerRole = "cluster-manager"
+	ManagerRole = "swarm-manager"
 	// AgentRole represents the Agent node type, and is used for authorization to endpoints
-	AgentRole = "cluster-worker"
+	AgentRole = "swarm-worker"
 	// CARole represents the CA node type, and is used for clients attempting to get new certificates issued
-	CARole = "cluster-ca"
+	CARole = "swarm-ca"
 )
 
 // AgentSecurityConfig is used to configure the security params of the agents
diff --git a/ca/server.go b/ca/server.go
index <HASH>..<HASH> 100644
--- a/ca/server.go
+++ b/ca/server.go
@@ -218,7 +218,7 @@ func (s *Server) evaluateAndSignCert(ctx context.Context, rCertificate *api.Regi
 	// FIXME(aaronl): Right now, this automatically signs any pending certificate. We need to
 	// add more flexible logic on acceptance modes.
 
-	if rCertificate.Role == AgentRole && rCertificate.Status.State != api.IssuanceStatePending {
+	if rCertificate.Status.State != api.IssuanceStatePending {
 		return
 	}
Changing cluster to swarm. For the third time