diff --git a/man/anvil-boot-server.8 b/man/anvil-boot-server.8
index 0b314f28..741a9747 100644
--- a/man/anvil-boot-server.8
+++ b/man/anvil-boot-server.8
@@ -19,8 +19,8 @@ Show this man page.
 \fB\-\-log-secure\fR
 When logging, record sensitive data, like passwords.
 .TP
-\-d, \fB\-\-debug\fR
-This tool does not use the main Anvil::Tools modules, so debugging is limited to messaged shown during the run. This enables those debug messages.
+\-v, \-vv, \-vvv
+Set the log level to 1, 2 or 3 respectively. Be aware that level 3 generates a significant amount of log data.
 .SS "Commands:"
 .TP
 \fB\-\-job-uuid\fR <uuid>
diff --git a/man/anvil-change-password.8 b/man/anvil-change-password.8
new file mode 100644
index 00000000..3266d31b
--- /dev/null
+++ b/man/anvil-change-password.8
@@ -0,0 +1,42 @@
+.\" Manpage for the Anvil! server boot program
+.\" Contact mkelly@alteeve.com to report issues, concerns or suggestions.
+.TH anvil-change-password "8" "August 02 2022" "Anvil! Intelligent Availability™ Platform"
+.SH NAME
+anvil-change-password \- Tool used to change / reset the main Anvil! password.
+.SH SYNOPSIS
+.B alteeve-repo-setup 
+\fI\,<command> \/\fR[\fI\,options\/\fR]
+.SH DESCRIPTION
+anvil-change-password \- This is used to change / reset the password on a Striker dashboard. Alternatively, if '--anvil' is used, to change / reset the password on an Anvil! node pair.
+.TP
+Note: This password is used for the shell users, for the postgresql user and, when setting an Anvil! password, for the IPMI BMC user. In the later case, passwords over 16 characters will be truncated. Allowed characters are set by the limits on normal shell passwords.
+.TP
+.SH OPTIONS
+.TP
+\-?, \-h, \fB\-\-help\fR
+Show this man page.
+.TP
+\fB\-\-log-secure\fR
+When logging, record sensitive data, like passwords.
+.TP
+\-v, \-vv, \-vvv
+Set the log level to 1, 2 or 3 respectively. Be aware that level 3 generates a significant amount of log data.
+.SS "Commands:"
+.TP
+\fB\-\-anvil\fR <name|uuid>
+When set, this changes the password on the target Anvil! sub-cluster. This is the Anvil! sub-cluster name (ie: 'an-anvil-01') or the Anvil! UUID. 
+.TP
+When not set, the Striker dashboard this command is run on will have it's passwords updated.
+.TP
+\fB\-\-new-password\fR <secret>
+This is the new password to set. See '\fB\-\-password-file\fR' below for an alternate way to pass in the password. 
+.TP
+If not set, you will be prompted to enter the new password.
+.TP
+\fB\-\-password-file\fR </path/to/file>
+This is an alternative way to pass the new password to this program. If set, the file is read in and the file contents are used. Be sure to use one line only in the file.
+.IP
+.SH AUTHOR
+Written by Madison Kelly, Alteeve staff and the Anvil! project contributors.
+.SH "REPORTING BUGS"
+Report bugs to users@clusterlabs.org
diff --git a/tools/anvil-boot-server b/tools/anvil-boot-server
index 69179256..d1693399 100755
--- a/tools/anvil-boot-server
+++ b/tools/anvil-boot-server
@@ -27,7 +27,7 @@ $| = 1;
 
 my $anvil = Anvil::Tools->new();
 
-$anvil->Get->switches({list => ["job-uuid", "no-wait", "server", "server-uuid", ""], man => $THIS_FILE});
+$anvil->Get->switches({list => ["job-uuid", "no-wait", "server", "server-uuid", "wait"], man => $THIS_FILE});
 $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => $anvil->data->{switches}});
 $anvil->Log->entry({source => $THIS_FILE, line => __LINE__, 'print' => 1, level => 1, secure => 0, key => "log_0115", variables => { program => $THIS_FILE }});
 
diff --git a/tools/anvil-change-password b/tools/anvil-change-password
index 833e623e..cdd574fb 100755
--- a/tools/anvil-change-password
+++ b/tools/anvil-change-password
@@ -40,7 +40,8 @@ if (($< != 0) && ($> != 0))
 	$anvil->nice_exit({exit_code => 1});
 }
 
-$anvil->Get->switches;
+$anvil->Get->switches({list => ["anvil", "new-password", "password-file", "y", "yes"], man => $THIS_FILE});
+$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => $anvil->data->{switches}});
 $anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 3, secure => 0, key => "log_0115", variables => { program => $THIS_FILE }});
 
 # Connect
diff --git a/tools/anvil-daemon b/tools/anvil-daemon
index e6bbb15d..e6a2524c 100755
--- a/tools/anvil-daemon
+++ b/tools/anvil-daemon
@@ -117,9 +117,8 @@ if (not $anvil->data->{sys}{database}{connections})
 }
 
 # Read switches
-$anvil->Get->switches({list => ["?", "help", "h", "refresh-json", "run-once", "main-loop-only", "no-start", "startup-only"], man => $THIS_FILE});
+$anvil->Get->switches({list => ["refresh-json", "run-once", "main-loop-only", "no-start", "startup-only"], man => $THIS_FILE});
 $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => $anvil->data->{switches}});
-
 $anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 2, key => "log_0115", variables => { program => $THIS_FILE }});
 
 if ($anvil->data->{switches}{'refresh-json'})