diff --git a/README.md b/README.md
index b0123b6..2469a78 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,3 @@
 # Divingbell
 
-Documentation can be found [here](https://divingbell.readthedocs.io).
+Documentation can be found [here](https://airship-divingbell.readthedocs.io).
diff --git a/divingbell/templates/bin/_uamlite.sh.tpl b/divingbell/templates/bin/_uamlite.sh.tpl
index 8331364..af7b9f6 100644
--- a/divingbell/templates/bin/_uamlite.sh.tpl
+++ b/divingbell/templates/bin/_uamlite.sh.tpl
@@ -143,7 +143,7 @@ purge_expired_users={{ .Values.conf.uamlite.purge_expired_users | squote }}
     {{- if eq $key "user_crypt_passwd" }}
       {{/* supported crypt types are 2a (blowfish), 1 (md5), 5 (sha-256), and 6 (sha-512) */}}
       {{- if not (or (regexMatch "\\$2a\\$.*\\$.*" $value) (regexMatch "\\$[156]\\$.*\\$.*" $value)) }}
-        {{- fail (print "BAD PASSWORD FOR '" $item.user_name "': The 'user_crypt_passwd' specified for '" $item.user_name "' does not pass regex checks. Ensure that the supplied user password is encoded per divingbell documentation at https://divingbell.readthedocs.io/en/latest/#uamlite") }}
+        {{- fail (print "BAD PASSWORD FOR '" $item.user_name "': The 'user_crypt_passwd' specified for '" $item.user_name "' does not pass regex checks. Ensure that the supplied user password is encoded per divingbell documentation at https://airship-divingbell.readthedocs.io/#uamlite") }}
       {{- end }}
     {{- end }}
     {{ $key }}={{ $value | squote }} \
@@ -155,7 +155,7 @@ purge_expired_users={{ .Values.conf.uamlite.purge_expired_users | squote }}
   {{- end }}
   {{- if hasKey . "user_sshkeys" }}
   {{- if not (eq (first .user_sshkeys) "Unmanaged") }}
-  add_sshkeys {{ range $ssh_key := .user_sshkeys }}{{ if not (or (regexMatch "ssh-dss .*" $ssh_key) (regexMatch "ecdsa-.*" $ssh_key) (regexMatch "ssh-ed25519 .*" $ssh_key) (regexMatch "ssh-rsa .*" $ssh_key)) }}{{ fail (print "BAD SSH KEY FOR '" $item.user_name "': One of the 'user_sshkeys' specified for '" $item.user_name "' does not pass regex checks: '" $ssh_key "'. Ensure that the supplied user SSH keys are supported/formatted per divingbell documentation at https://divingbell.readthedocs.io/en/latest/#uamlite") }}{{ else }}{{ $ssh_key | squote }}{{ end }} {{ end }}
+  add_sshkeys {{ range $ssh_key := .user_sshkeys }}{{ if not (or (regexMatch "ssh-dss .*" $ssh_key) (regexMatch "ecdsa-.*" $ssh_key) (regexMatch "ssh-ed25519 .*" $ssh_key) (regexMatch "ssh-rsa .*" $ssh_key)) }}{{ fail (print "BAD SSH KEY FOR '" $item.user_name "': One of the 'user_sshkeys' specified for '" $item.user_name "' does not pass regex checks: '" $ssh_key "'. Ensure that the supplied user SSH keys are supported/formatted per divingbell documentation at https://airship-divingbell.readthedocs.io/#uamlite") }}{{ else }}{{ $ssh_key | squote }}{{ end }} {{ end }}
 {{- end }}
 {{- else }}
   add_sshkeys
diff --git a/setup.cfg b/setup.cfg
index f0006ee..6912d4a 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,8 +1,10 @@
 [metadata]
-name = divingbell
+name = Divingbell
 description-file = README.md
-author = OpenStack
-home-page =
+author = The Airship Authors
+home-page = https://airship-divingbell.readthedocs.io/
+summary = Lightweight solution for Bare metal configuration management and package manager orchestration
+
 classifier =
     Intended Audience :: Information Technology
     Intended Audience :: System Administrators
diff --git a/tools/helm_tk.sh b/tools/helm_tk.sh
index 1b49098..99ac4c0 100755
--- a/tools/helm_tk.sh
+++ b/tools/helm_tk.sh
@@ -53,7 +53,7 @@ function helm_serve {
 mkdir -p build
 pushd build
 git clone --depth 1 $HTK_REPO || true
-pushd openstack-helm/$HTK_PATH
+pushd ${HTK_REPO##*/}/$HTK_PATH
 
 git pull
 make helm-toolkit