diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index c73e9a7a..c4f41408 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -9,11 +9,11 @@ assignees: ''
 
 ### Expected behavior
 
-_A clear and concise description of what you expected to happen._
+<!--A clear and concise description of what you expected to happen.-->
 
 ### Actual behavior
 
-_A clear and concise description of what actually happens._
+<!--A clear and concise description of what actually happens.-->
 
 ### To Reproduce
 
@@ -23,6 +23,12 @@ Steps to reproduce the behavior:
 1. Enter '...'
 1. Enter '...'
 
+### Version
+<!--Please fill in your version of URBANopt to help us diagnose the issue.-->
+<!--If you are not on the [newest version](https://docs.urbanopt.net/developer_resources/compatibility_matrix.html), please update.-->
+<!--Review the [release notes](https://docs.urbanopt.net/developer_resources/known_issues.html) for help with known issues.-->
+URBANopt: `X.Y.Z`
+
 ### Additional context
 
-_E.g.: Windows, Mac, Linux? Are you behind a firewall? Do you have additional security constraints?_
+<!--Are you behind a firewall? Do you have additional security constraints?-->
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 11fc491e..7de2cf94 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -7,14 +7,14 @@ assignees: ''
 
 ---
 
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+### Is your feature request related to a problem? Please describe
+<!--A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]-->
 
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
+### The solution you'd like
+<!--A clear and concise description of what you want to happen.-->
 
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
+### Alternatives you've considered
+<!--A clear and concise description of any alternative solutions or features you've considered.-->
 
-**Additional context**
-Add any other context or screenshots about the feature request here.
+### Additional context
+<!--Add any other context or screenshots about the feature request here.-->
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 28bf7fa7..fc6831bf 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -8,5 +8,5 @@
 
 - [ ] Unit tests have been added or updated
 - [ ] All ci tests pass (green)
-- [ ] An [issue](https://github.com/urbanopt/urbanopt-cli/issues) has been created (which will be used for the changelog)
+- [ ] This PR has been labeled appropriately (which will be used for the changelog)
 - [ ] This branch is up-to-date with develop
diff --git a/.github/workflows/nightly_ci_build.yml b/.github/workflows/nightly_ci_build.yml
index c6dd6aad..cc20a3ab 100644
--- a/.github/workflows/nightly_ci_build.yml
+++ b/.github/workflows/nightly_ci_build.yml
@@ -13,7 +13,7 @@ env:
   # Favor_Local_Gems enforces develop branch of all Ruby dependencies
   # This is our canary in the coal mine! If any simulation tests fail, comment this and retry.
   # If CI is then successful, we have a breaking change in a dependency somewhere.
-  # FAVOR_LOCAL_GEMS: true
+  FAVOR_LOCAL_GEMS: true
   GEM_DEVELOPER_KEY: ${{ secrets.GEM_DEVELOPER_KEY }}
   UO_NUM_PARALLEL: 4
   # GHA machines have 4 cores. Trying to run more concurrently will slow everything down.
@@ -56,11 +56,10 @@ jobs:
         run: bundle exec rspec -e 'Run and work with a small ${{ matrix.simulation-type }} simulation'
       - name: Upload artifacts
         # Save results for examination - useful for debugging
-        uses: actions/upload-artifact@v3
-        # Using v4 would mean we have to change our path design, and/or the test dir names
+        uses: actions/upload-artifact@v4
         # Only upload if a previous step fails
         if: failure()
         with:
-          name: rspec_results
+          name: rspec_results_${{ matrix.simulation-type }}
           path: artifact.zip
           retention-days: 7 # save for 1 week then delete
diff --git a/Gemfile b/Gemfile
index f0c422bc..2e52f684 100644
--- a/Gemfile
+++ b/Gemfile
@@ -24,7 +24,7 @@ allow_local = ENV['FAVOR_LOCAL_GEMS']
 # gem 'urbanopt-core', github: 'URBANopt/urbanopt-core-gem', branch: 'master'
 
 if allow_local && File.exist?('../urbanopt-scenario-gem')
- gem 'urbanopt-scenario', path: '../urbanopt-scenario-gem'
+  gem 'urbanopt-scenario', path: '../urbanopt-scenario-gem'
 elsif allow_local
   gem 'urbanopt-scenario', github: 'URBANopt/urbanopt-scenario-gem', branch: 'develop'
 end
@@ -36,7 +36,7 @@ elsif allow_local
 end
 
 if allow_local && File.exist?('../urbanopt-reopt-gem')
- gem 'urbanopt-reopt', path: '../urbanopt-reopt-gem'
+  gem 'urbanopt-reopt', path: '../urbanopt-reopt-gem'
 elsif allow_local
   gem 'urbanopt-reopt', github: 'URBANopt/urbanopt-reopt-gem', branch: 'develop'
 end