diff --git a/SECURITY.md b/SECURITY.md
index 9b0caa9e21..6c95abcc6c 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -13,8 +13,8 @@ There are 2 major components that are responsible for security features:
 When starting a secure EdgeX deployment, the sequence is [see docker-compose-nexus-redis.yml for reference](https://github.com/edgexfoundry/developer-scripts/blob/master/releases/nightly-build/compose-files/docker-compose-nexus-redis.yml))
 
 1. Start [Vault by HashiCorp](https://www.vaultproject.io/)
-1. Start the `edgex-vault-worker` container from the `docker-edgex-security-secretstore-setup-go` image to create the shared secrets needed by the microservices.
-1. Finally, the start the `edgex-proxy` container from the `docker-edgex-security-proxy-setup-go` image once [Kong](https://konghq.com/) is up.
+1. Start the `edgex-secretstore-setup` container from the `docker-edgex-security-secretstore-setup-go` image to create the shared secrets needed by the microservices.
+1. Finally, the start the `edgex-proxy-setup` container from the `docker-edgex-security-proxy-setup-go` image once [Kong](https://konghq.com/) is up.
 
 ## Get Started
 
diff --git a/internal/security/bootstrapper/command/gate/command.go b/internal/security/bootstrapper/command/gate/command.go
index eff231a02b..4879b58dc6 100644
--- a/internal/security/bootstrapper/command/gate/command.go
+++ b/internal/security/bootstrapper/command/gate/command.go
@@ -88,31 +88,31 @@ func (c *cmd) Execute() (statusCode int, err error) {
 		c.config.StageGate.Registry.Host,
 		c.config.StageGate.Registry.ReadyPort,
 		c.loggingClient); err != nil {
-		retErr := fmt.Errorf("found error while waiting for readiness of Consul at %s:%d, err: %v",
+		retErr := fmt.Errorf("found error while waiting for readiness of Registry at %s:%d, err: %v",
 			c.config.StageGate.Registry.Host, c.config.StageGate.Registry.ReadyPort, err)
 		return interfaces.StatusCodeExitWithError, retErr
 	}
-	c.loggingClient.Info("Consul is ready")
+	c.loggingClient.Info("Registry is ready")
 
 	if err := tcp.DialTcp(
 		c.config.StageGate.KongDB.Host,
 		c.config.StageGate.KongDB.ReadyPort,
 		c.loggingClient); err != nil {
-		retErr := fmt.Errorf("found error while waiting for readiness of Postgres at %s:%d, err: %v",
+		retErr := fmt.Errorf("found error while waiting for readiness of KongDB at %s:%d, err: %v",
 			c.config.StageGate.KongDB.Host, c.config.StageGate.KongDB.ReadyPort, err)
 		return interfaces.StatusCodeExitWithError, retErr
 	}
-	c.loggingClient.Info("Postgres is ready")
+	c.loggingClient.Info("KongDB is ready")
 
 	if err := tcp.DialTcp(
 		c.config.StageGate.Database.Host,
 		c.config.StageGate.Database.ReadyPort,
 		c.loggingClient); err != nil {
-		retErr := fmt.Errorf("found error while waiting for readiness of Redis at %s:%d, err: %v",
+		retErr := fmt.Errorf("found error while waiting for readiness of Database at %s:%d, err: %v",
 			c.config.StageGate.Database.Host, c.config.StageGate.Database.ReadyPort, err)
 		return interfaces.StatusCodeExitWithError, retErr
 	}
-	c.loggingClient.Info("Redis is ready")
+	c.loggingClient.Info("Database is ready")
 
 	// Reached ready-to-run phase
 	c.loggingClient.Debugf("ready-to-run phase: attempts to start up the listener on ready-to-run port: %d",