diff --git a/.init-template.sh b/.init-template.sh
index 81e3ff2..c574719 100755
--- a/.init-template.sh
+++ b/.init-template.sh
@@ -25,7 +25,8 @@ function update_package_json() {
 
 function update_github_env_file() {
   local -r github_org="$1"
-  eval "$SED_COMMAND 's/cncsc/$github_org/g ./github/env.yaml"
+  mv "./github/.template" "./github/$github_org"
+  eval "$SED_COMMAND 's/cncsc/$github_org/g' ./github/$github_org/env.yaml"
 }
 
 function update_remote_state_config() {
@@ -48,8 +49,8 @@ function main() {
     read -r description
   done
 
-  remote_origin="$(git config --get remote.origin.url || true)"
-  github_org="$(dirname "$remote_origin")"
+  repo="$(git config --get remote.origin.url | sed 's/.*://')"
+  github_org="$(dirname "$repo")"
 
   update_package_json "$github_org" "$repository_name" "$description"
   update_github_env_file "$github_org"
@@ -59,6 +60,7 @@ function main() {
 
   echo ""
   echo "Initialization complete. Committing to source control..."
+  pre-commit install
   git add -A
   git commit -m "Initialize repository from template"
   git push -u origin main
diff --git a/.tools/verify-tfc-workspace.sh b/.tools/verify-tfc-workspace.sh
index 60c7de9..f2aa8ec 100755
--- a/.tools/verify-tfc-workspace.sh
+++ b/.tools/verify-tfc-workspace.sh
@@ -65,8 +65,9 @@ function validate_workspace() {
     echo "- Updating workspace execution mode to local..."
     set_execution_mode_local "$tfc_api_token" "$organization" "$workspace"
     echo "- Workspace execution mode updated to to local."
-    echo ""
   fi
+
+  echo ""
 }
 
 function main() {
diff --git a/github/env.hcl b/github/.template/env.hcl
similarity index 100%
rename from github/env.hcl
rename to github/.template/env.hcl
diff --git a/github/env.yaml b/github/.template/env.yaml
similarity index 100%
rename from github/env.yaml
rename to github/.template/env.yaml